mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-08-23 15:23:44 +02:00
Downgrade FLAC in libretro builds to 1.4.3
Some of the Android builds broke in the 1.5.0 update.
This commit is contained in:
parent
41557aba6e
commit
b339eea1a7
4 changed files with 8 additions and 7 deletions
|
@ -1,5 +1,5 @@
|
|||
[wrap-git]
|
||||
url = https://github.com/xiph/flac
|
||||
revision = 1.5.0
|
||||
revision = 1.4.3
|
||||
depth = 1
|
||||
diff_files = flac-buildtype.patch, flac-deps.patch, flac-emscripten-endian.patch, flac-int32.patch
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,8 +1,8 @@
|
||||
cmake_minimum_required(VERSION 3.12...3.31)
|
||||
@@ -4,9 +4,9 @@
|
||||
# 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}))
|
||||
- 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,7 +2,7 @@
|
|||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -142,7 +142,10 @@ check_c_source_compiles("
|
||||
@@ -137,7 +137,10 @@ check_c_source_compiles("
|
||||
}"
|
||||
HAVE_LANGINFO_CODESET)
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
--- a/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) {
|
||||
partitioned_rice_contents->raw_bits[partition] = 0;
|
||||
u = (partition == 0) ? partition_samples - predictor_order : partition_samples;
|
||||
|
@ -12,7 +12,7 @@
|
|||
if(decoder->protected_->state == FLAC__STREAM_DECODER_READ_FRAME) {
|
||||
/* no error was set, read_callback_ didn't set it, so
|
||||
* 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{
|
||||
for(u = (partition == 0)? predictor_order : 0; u < partition_samples; u++, sample++) {
|
||||
|
|
Loading…
Add table
Reference in a new issue