From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Mon, 9 Aug 2010 15:48:47 +0000 (+0200)
Subject: contribs: updated OS X patch for libcaca
X-Git-Tag: 1.2.0-pre1~5515
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=26c05d8b00f6674cc8f8adbaf12ffc3a2e4e38e2;p=vlc

contribs: updated OS X patch for libcaca
---

diff --git a/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
index e28acd09c1..586672f0f2 100644
--- a/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
+++ b/extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch
@@ -1,32 +1,39 @@
---- 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 @@
+--- libcaca/configure.orig	2010-02-08 14:46:58.000000000 +0100
++++ libcaca/configure	2010-08-09 17:46:59.000000000 +0200
+@@ -16785,33 +16785,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"
+-      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
+-      GCC_VERSION="${GCC_VERSION:-3.3}"
+-      ARCH="${ARCH:--arch ppc}"
+-      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
+-      MACOSX_SDK_CXXFLAGS="${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="${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_64*darwin*)
+-      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.5.sdk}"
+-      GCC_VERSION="${GCC_VERSION:-4.0}"
+-      ARCH="${ARCH:--arch i386}"
+-      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
+-      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
 -      ;;
 -    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}"
+-      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
+-      GCC_VERSION="${GCC_VERSION:-4.0}"
+-      ARCH="${ARCH:--arch i386}"
+-      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
+-      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
 -      ;;
 -    esac
--    CC=gcc-${GCC_VERSION}
--    CXX=g++-${GCC_VERSION}
+-    CC="${CC:-gcc-${GCC_VERSION}}"
+-    CXX="${CXX:-g++-${GCC_VERSION}}"
 +    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"
+     MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Library/Frameworks}"
      CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
      CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"