From: Derk-Jan Hartman <hartman@videolan.org>
Date: Mon, 11 Dec 2006 16:17:44 +0000 (+0000)
Subject: * forwardport [18332]:
X-Git-Tag: 0.9.0-test0~9021
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8ef2385833c0c327407d61ef28f641c72063ce68;p=vlc

* forwardport [18332]:
  - don't compile pngtest, it's not SDK compatible
  - enable sdk on contrib again
---

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 90c4b2e78f..42faefd6cf 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -72,19 +72,19 @@ case $HOST in
 	    echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
 	    echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
 	    CFLAGS_TUNING=" -mtune=G4"
-	    #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-	    #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+	    EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+	    EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
 	    echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i686-apple-darwin8)
-	    SDK_TARGET=10.3
+	    SDK_TARGET=10.4
 	    echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
 	    echo "HAVE_DARWIN_OS = 1" >> config.mak
 	    echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
-	    echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
+	    echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
 	    CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
-	    #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-	    #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+	    EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+	    EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
 	    echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i586-pc-beos)
diff --git a/extras/contrib/src/Patches/libpng-osx.patch b/extras/contrib/src/Patches/libpng-osx.patch
index 8b9f4548a9..e4a973d8ca 100644
--- a/extras/contrib/src/Patches/libpng-osx.patch
+++ b/extras/contrib/src/Patches/libpng-osx.patch
@@ -1,6 +1,6 @@
 diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
 --- libpng-1.2.12/scripts/makefile.darwin	2006-06-27 22:22:40.000000000 +0200
-+++ libpng/scripts/makefile.darwin	2006-07-27 12:07:18.000000000 +0200
++++ libpng/scripts/makefile.darwin	2006-12-08 18:15:36.000000000 +0100
 @@ -7,14 +7,14 @@
  # For conditions of distribution and use, see copyright notice in png.h
  
@@ -32,6 +32,15 @@ diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
  
  INCPATH=$(prefix)/include
  LIBPATH=$(exec_prefix)/lib
+@@ -72,7 +72,7 @@
+ .c.pic.o:
+ 	$(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
+ 
+-all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
++all: libpng.a $(LIBSO) libpng.pc libpng-config
+ 
+ libpng.a: $(OBJS)
+ 	$(AR_RC) $@ $(OBJS)
 @@ -178,7 +178,7 @@
  	chmod 755 $(DB)/$(LIBNAME)-config
  	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)