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

diff --git a/contrib/a52dec/P00-darwin-configure-inline.patch b/contrib/a52dec/P00-darwin-configure-inline.patch
new file mode 100644 (file)
index 0000000..4774ec4
--- /dev/null
+++ b/contrib/a52dec/P00-darwin-configure-inline.patch
@@ -0,0 +1,12 @@
+diff --git a52dec/configure.in a52dec/configure.in
+index 71fd92b..46e1d3d 100644
+--- a52dec/configure.in
++++ a52dec/configure.in
+@@ -85,7 +85,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_TYPE_SIZE_T
+ AC_C_BIGENDIAN

diff --git a/contrib/mpeg2dec/P01-darwin-configure-inline.patch b/contrib/mpeg2dec/P01-darwin-configure-inline.patch
new file mode 100644 (file)
index 0000000..d244f14
--- /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 42697b316a5445c16e3a75cf1cc5d76f4021cb16..9a53134cb95a1b3e78ba6897c793ac0b9494fc4a 100644 (file)
--- 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

diff --git a/macosx/xcconfig/base/os.osx109.xcconfig b/macosx/xcconfig/base/os.osx109.xcconfig
new file mode 100644 (file)
index 0000000..f702daa
--- /dev/null
+++ b/macosx/xcconfig/base/os.osx109.xcconfig
@@ -0,0 +1,2 @@
+SDKROOT = macosx10.9
+MACOSX_DEPLOYMENT_TARGET = 10.9

diff --git a/macosx/xcconfig/osx109.i386.xcconfig b/macosx/xcconfig/osx109.i386.xcconfig
new file mode 100644 (file)
index 0000000..995d659
--- /dev/null
+++ b/macosx/xcconfig/osx109.i386.xcconfig
@@ -0,0 +1,3 @@
+#include "base/os.osx109.xcconfig"
+#include "base/arch.i386.xcconfig"
+EXTERNAL_XCCONFIG = osx109.i386

diff --git a/macosx/xcconfig/osx109.x86_64.xcconfig b/macosx/xcconfig/osx109.x86_64.xcconfig
new file mode 100644 (file)
index 0000000..21069e2
--- /dev/null
+++ b/macosx/xcconfig/osx109.x86_64.xcconfig
@@ -0,0 +1,3 @@
+#include "base/os.osx109.xcconfig"
+#include "base/arch.x86_64.xcconfig"
+EXTERNAL_XCCONFIG = osx109.x86_64