From f0966f2dcc728adc9e6d039ff975d41abf7fea06 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 14 Nov 2013 19:14:16 -0800 Subject: [PATCH 1/2] Revert "package ffmpeg: disable libnut on i686-pc-mingw32" This reverts commit fc46813219e8d925d3ab54a1d40190d8b805487a. Some how I forgot to do this during #258. Signed-off-by: Timothy Gu --- src/ffmpeg.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 8b90d693..5839499f 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)) From 609d96fb8d411eee481691303e1344101086c52a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 23 Nov 2013 17:00:26 -0800 Subject: [PATCH 2/2] libnut: fix ftello() again Signed-off-by: Timothy Gu --- src/libnut-1-ftello.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/libnut-1-ftello.patch diff --git a/src/libnut-1-ftello.patch b/src/libnut-1-ftello.patch new file mode 100644 index 00000000..e6e8afd9 --- /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 {