From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Mon, 13 Apr 2009 17:36:43 +0000 (+0200)
Subject: contribs: fix libcaca compilation on OSX/PPC
X-Git-Tag: 1.0.0-pre2~77
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0cae7b1727bdde5c7ab37594dc6e094fbc4036ed;p=vlc

contribs: fix libcaca compilation on OSX/PPC
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a5c38cb175..5caf082590 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1349,9 +1349,6 @@ ifdef HAVE_DARWIN_OS
 	#remove me at next libcaca upgrade
 	patch -p0 < Patches/caca_driver_cocoa.diff
 	patch -p0 < Patches/caca_macosx.diff
-ifndef HAVE_DARWIN_OS_ON_INTEL
-	patch -p0 < Patches/caca-osx-ppc.patch
-endif
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
diff --git a/extras/contrib/src/Patches/caca-osx-ppc.patch b/extras/contrib/src/Patches/caca-osx-ppc.patch
deleted file mode 100644
index 138a890bf8..0000000000
--- a/extras/contrib/src/Patches/caca-osx-ppc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libcaca/configure.orig	2008-01-27 20:10:40.000000000 +0100
-+++ libcaca/configure	2008-01-27 20:12:15.000000000 +0100
-@@ -23285,22 +23285,16 @@
-   if test "${ac_cv_my_have_cocoa}" = "yes"; then
-     case x${target} in
-     xpowerpc*darwin*)
--      # 10.3 needed to link with X11
--      MACOSX_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
--      GCC_VERSION=3.3
-       ARCH="-arch ppc"
--      MACOSX_SDK_CFLAGS="-nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include"
--      MACOSX_SDK_CXXFLAGS="-nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward"
--      MACOSX_SDK_LDFLAGS="-L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib"
-       ;;
-     x*86*darwin*)
--      MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
--      GCC_VERSION=4.0
-       ARCH="-arch i386"
--      MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
-       ;;
-     esac
-+    MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-+    GCC_VERSION=4.0
-+    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
-+    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
-     CC=gcc-${GCC_VERSION}
-     CXX=g++-${GCC_VERSION}
-     MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
diff --git a/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
index 77ef8d4825..e28acd09c1 100644
--- a/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
+++ b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
@@ -1,5 +1,5 @@
---- libcaca/configure	2007-11-29 11:36:50.000000000 +0100
-+++ libcaca/configure	2009-01-04 00:06:45.000000000 +0100
+--- libcaca-0.99.beta13b/configure	2007-11-29 11:36:50.000000000 +0100
++++ libcaca/configure	2009-04-13 19:21:25.000000000 +0200
 @@ -23283,26 +23283,9 @@
  done
  
@@ -24,7 +24,7 @@
 -    esac
 -    CC=gcc-${GCC_VERSION}
 -    CXX=g++-${GCC_VERSION}
-+    MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
++    MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
 +    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
 +    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
      MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"