contribs: Use GCC 4.2 instead of LLVM-GCC 4.2 to compile the 32bit contribs on...

contribs: Use GCC 4.2 instead of LLVM-GCC 4.2 to compile the 32bit contribs on Darwin like we already do for the 64bit ones

LLVM introduced to many runtime bugs for now. Updated bin package for x86_64 is already available, PPC and i386 will follow within the hour.

extras/contrib/Makefile

@@ -44,7 +44,7 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=9
+CONTRIBREV=10
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
 	$(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@
 

extras/contrib/bootstrap

@@ -134,8 +134,8 @@ case $HOST in
         CFLAGS_TUNING=" -arch ppc -mtune=G4"
         EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET} -Wl,-syslibroot,\${MACOSX_SDK}"
-        CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
-        CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
+        CC="/Developer/usr/bin/gcc-4.2"
+        CXX="/Developer/usr/bin/g++-4.2"
         LD="ld -arch ppc -syslibroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
@@ -162,8 +162,8 @@ case $HOST in
         CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386"
         EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-        CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
-        CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
+        CC="/Developer/usr/bin/gcc-4.2"
+        CXX="/Developer/usr/bin/g++-4.2"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
         if test -e /Developer/SDKs; then
@@ -352,8 +352,8 @@ if test $HAVE_DARWIN_9; then
     set +x
     echo
     echo "*****************************************************************"
-    echo "* We are using both the llvm-gcc-4.2 and the gcc-4.2 compilers  *"
-    echo "* on OS X, so compilation will fail if these are not installed. *"
+    echo "* We are using GCC-4.2 on OS X, so compilation WILL FAIL if it  *"
+    echo "* is NOT installed. *"
     echo "*****************************************************************"
 fi
 
@@ -362,10 +362,8 @@ if test $HAVE_DARWIN_10; then
     echo
     echo "*****************************************************************"
     echo "* You are running Darwin 10.                                    *"
-    echo "* For testing purposes, VLC will be compiled in 64bit mode.     *"
-    echo "* While doing so, for the time being, the 10.5 SDK is used.     *"
-    echo "* Note that in contrast to our Darwin 9 builds, we are not      *"
-    echo "* using the llvm compiler, but GCC 4.2.                         *"
+    echo "* For testing purposes, VLC will be compiled in 64bit mode      *"
+    echo "* using the 10.5 SDK for backward-compatibility.                *"
     echo "*****************************************************************"
     set -x
 fi

extras/contrib/src/Makefile

@@ -152,19 +152,11 @@ FFMPEGCONF += --arch=$(ARCH)
 FFMPEGCONF += --disable-libfaac
 ifdef HAVE_DARWIN_10
 FFMPEGCONF += --cpu=core2
+X264CONF+=--host=x86_64-apple-darwin10
 endif
 ifdef HAVE_DARWIN_OS_ON_INTEL
 FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
-ifndef HAVE_DARWIN_10
-NONLLVMCC+= CC="/Developer/usr/bin/gcc-4.2"
-NONLLVMCC+= CXX="/Developer/usr/bin/g++-4.2"
-else
-X264CONF+=--host=x86_64-apple-darwin10
-NONLLVMCC+= $(HOSTCC)
-endif
-else
-NONLLVMCC+= $(HOSTCC)
 endif
 
 ifdef HAVE_AMR
@@ -1343,7 +1335,7 @@ endif
 
 .goom2k4: goom
 ifdef HAVE_DARWIN_OS
-	(cd $<; $(NONLLVMCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 else
 	(cd $< && rm -f configure; aclocal -I m4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
 endif
@@ -1446,10 +1438,10 @@ ifdef HAVE_WIN32
 else
 ifdef HAVE_DARWIN_OS_ON_INTEL
   .x264: x264 .yasm
-	(cd $<; $(NONLLVMCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
   .x264: x264
-	(cd $<; $(NONLLVMCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 endif
 endif
 	touch $@