* Add options for SDK building. (not enabled yet) and fix liba52 downlaod

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 96dfdd4a89dc27c5cd0e3eebef503b19f58d8123..94dd979a1e3de27b8eb0266666042a1da0c87a1b 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -46,9 +46,20 @@ echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 
 case $HOST in
-    powerpc-apple-darwin8 | ppc-darwin)
+    ppc-darwin)
+# Mac OS X < 10.4
            echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
-           echo "CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2" >> config.mak
+       ;;
+    powerpc-apple-darwin8)
+# Mac OS X 10.4
+# Makefile cross compiling is only supported with gcc-4.0
+# ENVP defines the oldest environment on which the program will be able to run
+# SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
+            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
+#          echo "EXTRA_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
+           echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
+           echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -syslibroot,\${MACOSX_SDK}" >> config.mak
         ;;
     i586-pc-beos)
            echo "EXTRA_LDFLAGS = -lnet" >> config.mak

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 34e2dc076453d15f85ef1b91b1bbcf3fa63fc272..f1fe67ae55bc531549550a5fed22128963256157 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -52,9 +52,9 @@ export PATH = $(PREFIX)/bin:/opt/cross-tools/bin:/usr/bin:/bin
 endif
 endif
 
-export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
-export CFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
-export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
+export CFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
+export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
+export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CFLAGS) $(EXTRA_CPPFLAGS)
 export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
 
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index dfd24fd1d1a7b6ea541c560a381507afc41cf9c5..970a4f8c19a881d6b49739e0f3e6b12a35dd520d 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -46,7 +46,7 @@ FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
 FRIBIDI_VERSION=0.10.4
 FRIBIDI_URL=$(SF)/fribidi/fribidi-$(FRIBIDI_VERSION).tar.gz
 A52DEC_VERSION=0.7.4
-A52DEC_URL=$(SF)/liba52//a52dec-$(A52DEC_VERSION).tar.gz
+A52DEC_URL=http://liba52.sourceforge.net/files/a52dec-$(A52DEC_VERSION).tar.gz
 MPEG2DEC_VERSION=0.4.1-cvs
 MPEG2DEC_CVSROOT=:pserver:anonymous@cvs.libmpeg2.sourceforge.net:/cvsroot/libmpeg2
 MPEG2DEC_SNAPSHOT=$(SF)/libmpeg2/mpeg2dec-snapshot.tar.gz