Made it build on x86_64

1 files changed, 26 insertions, 7 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 644c13c4..d332be4d 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -138,6 +138,9 @@
 #               broken build of the dca and fluidsynth modules.
 # 0.9.8a-2:   04/dec/2008 by Eric Hameleers <alien@slackware.com>
 #             * Updated ffmpeg/x264 snapshots, and re-adding firewire support
+# 0.9.8a-3:   28/dec/2008 by Eric Hameleers <alien@slackware.com>
+#             * Updated ffmpeg/x264 snapshots, made it build on x86_64 with the
+#               help of Attila Craciun.
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -162,7 +165,7 @@
 PRGNAM=vlc
 PRGNAM2=mozplugin
 ARCH=${ARCH:-"i486"}
-BUILD=${BUILD:-"2"}
+BUILD=${BUILD:-"3"}
 TAG=${TAG:-"alien"}
 
 # SRCVER and VERSION values may be modified later!
@@ -188,7 +191,7 @@ case "$ARCH" in
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
-             SLKLDFLAGS="-L/usr/lib64 -fPIC"; LIBDIRSUFFIX="64"
+             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
   athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
@@ -283,8 +286,8 @@ FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=20080731
 #FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705)
-FFMPEG=r16043 # recommended version for 0.9.2 is r15261 (20080908)
-              # but I use 16043 (20081210)
+FFMPEG=r16364 # recommended version for 0.9.2 is r15261 (20080908)
+              # but I use 16364 (20081228)
 FLUID=1.0.8
 GGI=2.2.2
 GII=1.0.2
@@ -306,7 +309,7 @@ UPNP=1.6.6
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
-X264=20081210-2245      # Needs yasm installed
+X264=20081201-2245      # Needs yasm installed
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -990,6 +993,14 @@ cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG}
 #    2>&1 | tee $OUTPUT/patch-${PRGNAM}_ffmpeg.log
 #)
 
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHOPTS="--disable-mmx \
+            --disable-mmx2 \
+            --host-cflags=\"-fPIC\""
+else
+  ARCHOPTS=""
+fi
+
 # Stamp the version into the source:
 [ -f version.sh ] && sed -i -e "s/UNKNOWN/$FFMPEG/" version.sh
 
@@ -1014,6 +1025,7 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
             --disable-shared \
             --enable-static \
             --enable-memalign-hack \
+            $ARCHOPTS \
             --logfile=$OUTPUT/ffmpeg.conf.log \
             --extra-cflags="-I${VLCDEPSDIR}/usr/include -DRUNTIME_CPUDETECT" \
             --extra-ldflags="-L${VLCDEPSDIR}/usr/lib" \
@@ -1035,6 +1047,9 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log
 make install-libs install-headers \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ffmpeg.log
 
+# Need this to link vlc successfully on x86_64:
+strip $VLCDEPSDIR/usr/lib/libswscale.a
+
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/ffmpeg/
 cp COPYING* CREDITS Changelog MAINTAINERS README \
@@ -1234,14 +1249,14 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
-            --without-x \
-            --disable-sdl \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_libmpeg2.log
+            #--without-x \
+            #--disable-sdl \
 make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libmpeg2.log
 # Install libmpeg2 into a temp location so vlc can pickup the library
 make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_mbpeg2.log
@@ -1642,6 +1657,8 @@ echo -e "\n**\n**\n"
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Or else the vlc build wil fail:
+cp schroedinger.pc $VLCDEPSDIR/usr/lib/pkgconfig/schroedinger.pc
+cp schroedinger.pc $VLCDEPSDIR/usr/lib/pkgconfig/schroedinger-1.0.pc
 ( cd $VLCDEPSDIR/usr/include
   ln -sf schroedinger-1.0/schroedinger 
 )
@@ -1824,6 +1841,8 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
 # Install x264 into a temp location so vlc can pickup the library
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
+# Need this to link vlc successfully on x86_64:
+strip $VLCDEPSDIR/usr/lib/libx264.a
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/x264/
 cp AUTHORS COPYING \