revert 7218dda2c91f.

libsdl-org · Nov 12, 2019 · f9b5f52 · f9b5f52
1 parent 2e8945f
commit f9b5f52
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 5 deletions.
diff --git a/VisualC/external/lib/x64/libFLAC-8.dll b/VisualC/external/lib/x64/libFLAC-8.dll
diff --git a/VisualC/external/lib/x86/libFLAC-8.dll b/VisualC/external/lib/x86/libFLAC-8.dll
diff --git a/Xcode/Frameworks/FLAC.framework/Versions/A/FLAC b/Xcode/Frameworks/FLAC.framework/Versions/A/FLAC
diff --git a/external/libflac/dylibversion.patch b/external/libflac/dylibversion.patch
@@ -0,0 +1,24 @@
+report 11.0 dylib minversion (as in libflac-1.2.1) instead of 12.
+
+--- libflac/ltmain.sh~
++++ libflac/ltmain.sh
+@@ -8882,15 +8882,15 @@
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  func_arith $current + 1
+ 	  minor_current=$func_arith_result
+-	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  xlcverstring="$wl-compatibility_version 11.0 $wl-current_version $wl$minor_current.$revision"
++	  verstring="-compatibility_version 11.0 -current_version $minor_current.$revision"
+           # On Darwin other compilers
+           case $CC in
+               nagfor*)
+-                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
++                  verstring="$wl-compatibility_version 11.0 $wl-current_version $wl$minor_current.$revision"
+                   ;;
+               *)
+-                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++                  verstring="-compatibility_version 11.0 -current_version $minor_current.$revision"
+                   ;;
+           esac
+ 	  ;;
diff --git a/external/libflac/ltmain.sh b/external/libflac/ltmain.sh
@@ -8882,15 +8882,15 @@ func_mode_link ()
 	  # Darwin ld doesn't like 0 for these options...
 	  func_arith $current + 1
 	  minor_current=$func_arith_result
-	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  xlcverstring="$wl-compatibility_version 11.0 $wl-current_version $wl$minor_current.$revision"
+	  verstring="-compatibility_version 11.0 -current_version $minor_current.$revision"
           # On Darwin other compilers
           case $CC in
               nagfor*)
-                  verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+                  verstring="$wl-compatibility_version 11.0 $wl-current_version $wl$minor_current.$revision"
                   ;;
               *)
-                  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+                  verstring="-compatibility_version 11.0 -current_version $minor_current.$revision"
                   ;;
           esac
 	  ;;

diff --git a/external/libflac/src/libFLAC/bitreader.c b/external/libflac/src/libFLAC/bitreader.c
@@ -428,7 +428,7 @@ FLAC__bool FLAC__bitreader_read_raw_int32(FLAC__BitReader *br, FLAC__int32 *val,
 		return false;
 	/* sign-extend *val assuming it is currently bits wide. */
 	/* From: https://graphics.stanford.edu/~seander/bithacks.html#FixedSignExtend */
-	mask = bits >= 33 ? 0 : 1u << (bits - 1);
+	mask = 1u << (bits - 1);
 	*val = (uval ^ mask) - mask;
 	return true;
 }