diff options
author | Tony Theodore <tonyt@logyst.com> | 2013-09-07 15:14:55 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2013-09-07 15:14:55 (GMT) |
commit | 196781622f2646c0058d1f8a6311c6dd2c3b2ef0 (patch) | |
tree | cbdb30fe83a4ea04a2ac9924fb79bb8f0af1ac8d /src | |
parent | 385a4f20e399bdfe5164e0c83b935e6162640df2 (diff) | |
download | mxe-196781622f2646c0058d1f8a6311c6dd2c3b2ef0.zip mxe-196781622f2646c0058d1f8a6311c6dd2c3b2ef0.tar.gz mxe-196781622f2646c0058d1f8a6311c6dd2c3b2ef0.tar.bz2 |
package opusfile: remove patches after update
Diffstat (limited to 'src')
-rw-r--r-- | src/opusfile-1-fseeko64.patch | 66 | ||||
-rw-r--r-- | src/opusfile-2-lrint-lib.patch | 64 |
2 files changed, 0 insertions, 130 deletions
diff --git a/src/opusfile-1-fseeko64.patch b/src/opusfile-1-fseeko64.patch deleted file mode 100644 index 1df58b7..0000000 --- a/src/opusfile-1-fseeko64.patch +++ /dev/null @@ -1,66 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://git.xiph.org/?p=opusfile.git;a=patch;h=d75915786f465892f5eadcd93444f51a32b9ad1c - -From d75915786f465892f5eadcd93444f51a32b9ad1c Mon Sep 17 00:00:00 2001 -From: Timothy B. Terriberry <tterribe@xiph.org> -Date: Tue, 8 Jan 2013 05:04:41 -0800 -Subject: [PATCH] Use fseeko64/ftello64 for mingw32. - -It turns out i686-pc-mingw32 does define these functions, and they - are always available (unlike _fseeki64/_ftelli64). -This means we can build and link without requiring - i686-w64-mingw32. -The resulting binary still doesn't run in wine for me, but that may - be a personal problem. ---- - src/stream.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -diff --git a/src/stream.c b/src/stream.c -index caa82f1..1c7266b 100644 ---- a/src/stream.c -+++ b/src/stream.c -@@ -56,7 +56,18 @@ static int op_fread(void *_stream,unsigned char *_ptr,int _buf_size){ - static int op_fseek(void *_stream,opus_int64 _offset,int _whence){ - #if defined(_MSC_VER) - return _fseeki64((FILE *)_stream,_offset,_whence); -+#elif defined(__MINGW32__) -+ /*i686-pc-mingw32 does not have fseeko() and requires -+ __MSVCRT_VERSION__>=0x800 for _fseeki64(), which screws up linking with -+ other libraries (that don't use MSVCRT80 from MSVC 2005 by default). -+ i686-w64-mingw32 does have fseeko() and respects _FILE_OFFSET_BITS, but I -+ don't know how to detect that at compile time. -+ We don't need to use fopen64(), as this just dispatches to fopen() in -+ mingw32.*/ -+ return fseeko64((FILE *)_stream,(off64_t)_offset,_whence); - #else -+ /*This function actually conforms to the SUSv2 and POSIX.1-2001, so we prefer -+ it except in the two special-cases above.*/ - return fseeko((FILE *)_stream,(off_t)_offset,_whence); - #endif - } -@@ -64,7 +75,18 @@ static int op_fseek(void *_stream,opus_int64 _offset,int _whence){ - static opus_int64 op_ftell(void *_stream){ - #if defined(_MSC_VER) - return _ftelli64((FILE *)_stream); -+#elif defined(__MINGW32__) -+ /*i686-pc-mingw32 does not have ftello() and requires -+ __MSVCRT_VERSION__>=0x800 for _ftelli64(), which screws up linking with -+ other libraries (that don't use MSVCRT80 from MSVC 2005 by default). -+ i686-w64-mingw32 does have ftello() and respects _FILE_OFFSET_BITS, but I -+ don't know how to detect that at compile time. -+ We don't need to use fopen64(), as this just dispatches to fopen() in -+ mingw32.*/ -+ return ftello64((FILE *)_stream); - #else -+ /*This function actually conforms to the SUSv2 and POSIX.1-2001, so we prefer -+ it except in the two special-cases above.*/ - return ftello((FILE *)_stream); - #endif - } --- -1.7.2.5 - diff --git a/src/opusfile-2-lrint-lib.patch b/src/opusfile-2-lrint-lib.patch deleted file mode 100644 index ec848d2..0000000 --- a/src/opusfile-2-lrint-lib.patch +++ /dev/null @@ -1,64 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://lists.xiph.org/pipermail/opus/2013-March/001972.html - -From 6ab2eb850c467e9eaca1c67d37b3e49521a04460 Mon Sep 17 00:00:00 2001 -From: Ulrich Klauer <ulrich@chirlu.de> -Date: Sun, 10 Mar 2013 04:02:49 +0100 -Subject: [PATCH] Handle AC_SEARCH_LIBS special result value - -AC_SEARCH_LIBS will give a result of "none required" if the relevant -function is available without any special libraries. (This is the case -for lrintf on MinGW.) Make sure this special value isn't put verbatim -into the pkg-config files, as it would cause the linker to search for -files named "none" and "required", and fail. ---- - configure.ac | 6 +++++- - opusfile-uninstalled.pc.in | 2 +- - opusfile.pc.in | 2 +- - 3 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8b1a3b3..d82d53f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,11 @@ AS_IF([test "x$enable_fixed_point" = "xyes"], - ]) - ] - ) --AC_SUBST(ac_cv_search_lrintf) -+lrintf_lib=" $ac_cv_search_lrintf" -+AS_IF([test "x$ac_cv_search_lrintf" = "xnone required"], -+ [lrintf_lib=""] -+) -+AC_SUBST(lrintf_lib) - - CC_ATTRIBUTE_VISIBILITY([default], [ - CC_FLAG_VISIBILITY([CFLAGS="${CFLAGS} -fvisibility=hidden"]) -diff --git a/opusfile-uninstalled.pc.in b/opusfile-uninstalled.pc.in -index b63a23c..7f555d6 100644 ---- a/opusfile-uninstalled.pc.in -+++ b/opusfile-uninstalled.pc.in -@@ -10,5 +10,5 @@ Description: Opus playback library (not installed) - Version: @VERSION@ - Requires: ogg >= 1.3 opus >= 1.0.1 @openssl@ - Conflicts: --Libs: ${libdir}/libopusfile.la @ac_cv_search_lrintf@ -+Libs: ${libdir}/libopusfile.la@lrintf_lib@ - Cflags: -I${includedir} -diff --git a/opusfile.pc.in b/opusfile.pc.in -index 0a77f0c..c96d6a8 100644 ---- a/opusfile.pc.in -+++ b/opusfile.pc.in -@@ -11,5 +11,5 @@ Version: @VERSION@ - Requires: ogg >= 1.3 opus >= 1.0.1 @openssl@ - Conflicts: - Libs: -L${libdir} -lopusfile --Libs.private: @ac_cv_search_lrintf@ -+Libs.private:@lrintf_lib@ - Cflags: -I${includedir}/opus --- -1.7.10.4 - |