From 7a37048b8fa30e0ebb7d6a67a91fb79d73e6ab4b Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 11 Mar 2021 11:02:02 +0300
Subject: [PATCH] external libs: minor update to libflac
---
external/libflac/configure | 10 ++--------
external/libflac/configure.ac | 6 ------
external/libflac/m4/libtool.m4 | 6 +++---
external/libflac/src/libFLAC/bitreader.c | 2 +-
external/libflac/src/libFLAC/lpc.c | 6 +++---
external/libflac/src/libFLAC/stream_encoder_framing.c | 1 -
6 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/external/libflac/configure b/external/libflac/configure
index 99c6bd2..e60e1c6 100755
--- a/external/libflac/configure
+++ b/external/libflac/configure
@@ -10096,7 +10096,7 @@ _LT_EOF
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
enable_shared_with_static_runtimes=yes
file_list_spec='@'
;;
@@ -10951,7 +10951,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
enable_shared_with_static_runtimes=yes
file_list_spec='@'
;;
@@ -14950,12 +14950,6 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
-
- case "$host" in
- x86_64-*-darwin*) CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
- LDFLAGS="$LDFLAGS -mmacosx-version-min=10.5" ;;
- esac
-
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wextra" >&5
diff --git a/external/libflac/configure.ac b/external/libflac/configure.ac
index 0562b0c..3724a5a 100644
--- a/external/libflac/configure.ac
+++ b/external/libflac/configure.ac
@@ -288,12 +288,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
XIPH_ADD_CFLAGS([-fgnu89-inline])
fi
-
- case "$host" in
- x86_64-*-darwin*) CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
- LDFLAGS="$LDFLAGS -mmacosx-version-min=10.5" ;;
- esac
-
fi
XIPH_ADD_CFLAGS([-Wextra])
diff --git a/external/libflac/m4/libtool.m4 b/external/libflac/m4/libtool.m4
index 43c6218..e83b19c 100644
--- a/external/libflac/m4/libtool.m4
+++ b/external/libflac/m4/libtool.m4
@@ -5166,7 +5166,7 @@ _LT_EOF
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
@@ -5872,7 +5872,7 @@ _LT_EOF
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
@@ -6742,7 +6742,7 @@ if test yes != "$_lt_caught_CXX_error"; then
cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
emximp -o $lib $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='@'
;;
diff --git a/external/libflac/src/libFLAC/bitreader.c b/external/libflac/src/libFLAC/bitreader.c
index fd19c90..75e1a10 100644
--- a/external/libflac/src/libFLAC/bitreader.c
+++ b/external/libflac/src/libFLAC/bitreader.c
@@ -36,8 +36,8 @@
#include <stdlib.h>
#include <string.h>
-#include "private/bitmath.h"
#include "private/bitreader.h"
+#include "private/bitmath.h"
#include "private/crc.h"
#include "private/macros.h"
#include "FLAC/assert.h"
diff --git a/external/libflac/src/libFLAC/lpc.c b/external/libflac/src/libFLAC/lpc.c
index bc2fcdf..1a0131d 100644
--- a/external/libflac/src/libFLAC/lpc.c
+++ b/external/libflac/src/libFLAC/lpc.c
@@ -34,6 +34,9 @@
# include <config.h>
#endif
+#if defined DEBUG || defined FLAC__OVERFLOW_DETECT || defined FLAC__OVERFLOW_DETECT_VERBOSE
+#include <stdio.h>
+#endif
#include <math.h>
#include "FLAC/assert.h"
@@ -42,9 +45,6 @@
#include "private/bitmath.h"
#include "private/lpc.h"
#include "private/macros.h"
-#if defined DEBUG || defined FLAC__OVERFLOW_DETECT || defined FLAC__OVERFLOW_DETECT_VERBOSE
-#include <stdio.h>
-#endif
/* OPT: #undef'ing this may improve the speed on some architectures */
#define FLAC__LPC_UNROLLED_FILTER_LOOPS
diff --git a/external/libflac/src/libFLAC/stream_encoder_framing.c b/external/libflac/src/libFLAC/stream_encoder_framing.c
index fdf9580..fe46cfd 100644
--- a/external/libflac/src/libFLAC/stream_encoder_framing.c
+++ b/external/libflac/src/libFLAC/stream_encoder_framing.c
@@ -552,5 +552,4 @@ FLAC__bool add_residual_partitioned_rice_(FLAC__BitWriter *bw, const FLAC__int32
return true;
}
}
-
#endif /* FLAC_INCLUDE_ENCODER */