diff options
author | Tony Theodore <tonyt@logyst.com> | 2013-11-24 04:26:10 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2013-11-24 04:26:10 (GMT) |
commit | 52f1585d4495c8793aa3efe52ce99550b9bbc268 (patch) | |
tree | 9f5208a81aa0bef6f216f406594c324759fd2a55 | |
parent | f491562090614da1883b89a1201851495b6b6a52 (diff) | |
parent | 609d96fb8d411eee481691303e1344101086c52a (diff) | |
download | mxe-52f1585d4495c8793aa3efe52ce99550b9bbc268.zip mxe-52f1585d4495c8793aa3efe52ce99550b9bbc268.tar.gz mxe-52f1585d4495c8793aa3efe52ce99550b9bbc268.tar.bz2 |
Merge pull request #277 from TimothyGu/emerg
Enable libnut/ffmpeg compilation on i686-pc-mingw32 again
-rw-r--r-- | src/ffmpeg.mk | 2 | ||||
-rw-r--r-- | src/libnut-1-ftello.patch | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 8b90d69..5839499 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -54,5 +54,3 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef - -$(PKG)_BUILD_i686-pc-mingw32 = $(subst --enable-libnut,--disable-libnut,$($(PKG)_BUILD)) diff --git a/src/libnut-1-ftello.patch b/src/libnut-1-ftello.patch new file mode 100644 index 0000000..e6e8afd --- /dev/null +++ b/src/libnut-1-ftello.patch @@ -0,0 +1,12 @@ +diff -Naur libnut-r681.orig/libnut/priv.h libnut-r681/libnut/priv.h +--- libnut-r681.orig/libnut/priv.h 2013-11-09 09:31:47.000000000 -0800 ++++ libnut-r681/libnut/priv.h 2013-11-23 16:56:13.085645547 -0800 +@@ -45,7 +45,7 @@ + #define ABS(a) ((a) > 0 ? (a) : -(a)) + + #if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +-#define ftello(a) ((off_t)(_ftelli64(a))) ++#define ftello(a) ((off_t)(ftello64(a))) + #endif + + typedef struct { |