libcaca: configure script patch & hack to let us use the SDK and the GCC version...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8c78eb12abcb9f1c3650204a89e12d7065b43bb1..86b25d7c96e9a4081ffc6d7a836aa01350019d2b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,13 +1,13 @@
 #***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 - 2008 the VideoLAN team
+# Copyright (C) 2003 - 2009 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
 #          Eric Petit <titer@m0k.org>
-#          Felix Paul Kühne <fkuehne@videolan.org>
+#          Felix Paul Kühne <fkuehne at videolan dot org>
 #          Christophe Mutricy <xtophe AT xtelevision.com>
 #          Gildas Bazin <gbazin at videolan dot org>
 #          Damien Fouilleul <damienf at videolan dot org>
@@ -1341,6 +1341,8 @@ ifdef HAVE_DARWIN_OS
 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
 
 .caca: libcaca

diff --git a/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
new file mode 100644 (file)
index 0000000..77ef8d4
--- /dev/null
+++ b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
@@ -0,0 +1,32 @@
+--- libcaca/configure  2007-11-29 11:36:50.000000000 +0100
++++ libcaca/configure  2009-01-04 00:06:45.000000000 +0100
+@@ -23283,26 +23283,9 @@
+ done
+ 
+   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
+-    CC=gcc-${GCC_VERSION}
+-    CXX=g++-${GCC_VERSION}
++    MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
++    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
++    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
+     MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
+     CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
+     CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"