From 84b852016b06067426bfaada5b3b8aeeb85d4ce2 Mon Sep 17 00:00:00 2001 From: konablend Date: Sat, 2 Nov 2013 23:48:48 +0000 Subject: fix a52dec and mpeg2dec duplicate symbols w/ OSX 10.9 SDK - disable AC_C_ALWAYS_INLINE for a52dec (patch activates on darwin only) - disable AC_C_ALWAYS_INLINE for mpeg2dec (patch activates on darwin only) - enable mpeg2dec autoreconf (darwin only) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5872 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/mpeg2dec/P01-darwin-configure-inline.patch | 12 ++++++++++++ contrib/mpeg2dec/module.defs | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 contrib/mpeg2dec/P01-darwin-configure-inline.patch (limited to 'contrib/mpeg2dec') diff --git a/contrib/mpeg2dec/P01-darwin-configure-inline.patch b/contrib/mpeg2dec/P01-darwin-configure-inline.patch new file mode 100644 index 000000000..d244f1416 --- /dev/null +++ b/contrib/mpeg2dec/P01-darwin-configure-inline.patch @@ -0,0 +1,12 @@ +diff --git mpeg2dec/configure.ac mpeg2dec/configure.ac +index 9f4831e..fd4196f 100644 +--- mpeg2dec/configure.ac ++++ mpeg2dec/configure.ac +@@ -142,7 +142,6 @@ AC_CHECK_GENERATE_INTTYPES([include]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +-AC_C_ALWAYS_INLINE + AC_C_RESTRICT + AC_C_BUILTIN_EXPECT + AC_C_BIGENDIAN diff --git a/contrib/mpeg2dec/module.defs b/contrib/mpeg2dec/module.defs index 42697b316..9a53134cb 100644 --- a/contrib/mpeg2dec/module.defs +++ b/contrib/mpeg2dec/module.defs @@ -4,4 +4,9 @@ $(eval $(call import.CONTRIB.defs,MPEG2DEC)) MPEG2DEC.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz MPEG2DEC.EXTRACT.tarbase = mpeg2dec +ifeq (darwin,$(BUILD.system)) + # darwin configure patch needs autoreconf + MPEG2DEC.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv; +endif + MPEG2DEC.CONFIGURE.extra = --disable-sdl --without-x -- cgit v1.2.3