mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-24 07:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Downgrade FLAC in libretro builds to 1.4.3

Browse source 
Some of the Android builds broke in the 1.5.0 update.
This commit is contained in:
刘皓 2025-06-04 11:38:25 -04:00
parent 41557aba6e
commit b339eea1a7
No known key found for this signature in database
GPG key ID: 7901753DB465B711
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/flac.wrap
View file

@ -1,5 +1,5 @@
[wrap-git] [wrap-git]
url = https://github.com/xiph/flac url = https://github.com/xiph/flac
revision = 1.5.0 revision = 1.4.3
depth = 1 depth = 1
diff_files = flac-buildtype.patch, flac-deps.patch, flac-emscripten-endian.patch, flac-int32.patch diff_files = flac-buildtype.patch, flac-deps.patch, flac-emscripten-endian.patch, flac-int32.patch

7
subprojects/packagefiles/flac-buildtype.patch
View file

@ -2,8 +2,9 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,8 +1,8 @@ @@ -4,9 +4,9 @@
cmake_minimum_required(VERSION 3.12...3.31) # 3.9 is needed in 'doc' because of doxygen_add_docs()
cmake_minimum_required(VERSION 3.5)
-if(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES OR DEFINED ENV{CFLAGS} OR DEFINED ENV{CXXFLAGS})) -if(NOT (CMAKE_BUILD_TYPE OR CMAKE_CONFIGURATION_TYPES OR DEFINED ENV{CFLAGS} OR DEFINED ENV{CXXFLAGS}))
- set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo") - set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo")
@ -12,5 +13,5 @@
+ +
+ +
project(FLAC VERSION 1.5.0) # HOMEPAGE_URL "https://www.xiph.org/flac/") project(FLAC VERSION 1.4.3) # HOMEPAGE_URL "https://www.xiph.org/flac/")

2
subprojects/packagefiles/flac-emscripten-endian.patch
View file

@ -2,7 +2,7 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -142,7 +142,10 @@ check_c_source_compiles(" @@ -137,7 +137,10 @@ check_c_source_compiles("
}" }"
HAVE_LANGINFO_CODESET) HAVE_LANGINFO_CODESET)

4
subprojects/packagefiles/flac-int32.patch
View file

@ -3,7 +3,7 @@
--- a/src/libFLAC/stream_decoder.c --- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c
@@ -3323,7 +3323,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, uint32_ @@ -2973,7 +2973,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, uint32_
if(rice_parameter < pesc) { if(rice_parameter < pesc) {
partitioned_rice_contents->raw_bits[partition] = 0; partitioned_rice_contents->raw_bits[partition] = 0;
u = (partition == 0) ? partition_samples - predictor_order : partition_samples; u = (partition == 0) ? partition_samples - predictor_order : partition_samples;
@ -12,7 +12,7 @@
if(decoder->protected_->state == FLAC__STREAM_DECODER_READ_FRAME) { if(decoder->protected_->state == FLAC__STREAM_DECODER_READ_FRAME) {
/* no error was set, read_callback_ didn't set it, so /* no error was set, read_callback_ didn't set it, so
* invalid rice symbol was found */ * invalid rice symbol was found */
@@ -3346,7 +3346,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, uint32_ @@ -2996,7 +2996,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, uint32_
} }
else{ else{
for(u = (partition == 0)? predictor_order : 0; u < partition_samples; u++, sample++) { for(u = (partition == 0)? predictor_order : 0; u < partition_samples; u++, sample++) {