git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch

   1 --- libcaca-0.99.beta13b/configure      2007-11-29 11:36:50.000000000 +0100
   2 +++ libcaca/configure   2009-04-13 19:21:25.000000000 +0200
   3 @@ -23283,26 +23283,9 @@
   4  done
   5
   6    if test "${ac_cv_my_have_cocoa}" = "yes"; then
   7 -    case x${target} in
   8 -    xpowerpc*darwin*)
   9 -      # 10.3 needed to link with X11
  10 -      MACOSX_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
  11 -      GCC_VERSION=3.3
  12 -      ARCH="-arch ppc"
  13 -      MACOSX_SDK_CFLAGS="-nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include"
  14 -      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"
  15 -      MACOSX_SDK_LDFLAGS="-L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib"
  16 -      ;;
  17 -    x*86*darwin*)
  18 -      MACOSX_SDK=/Developer/SDKs/MacOSX10.4u.sdk
  19 -      GCC_VERSION=4.0
  20 -      ARCH="-arch i386"
  21 -      MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
  22 -      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
  23 -      ;;
  24 -    esac
  25 -    CC=gcc-${GCC_VERSION}
  26 -    CXX=g++-${GCC_VERSION}
  27 +    MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
  28 +    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
  29 +    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
  30      MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
  31      CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
  32      CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"