DTS audio fixed is the main event here

1 files changed, 31 insertions, 15 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 77e19f6e..9e3f1ec6 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -141,8 +141,9 @@
 # 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.
-# 20090114-1: 14/jan/2009 by Eric Hameleers <alien@slackware.com>
-#             * Updated ffmpeg/x264 snapshots, fix default font for x86_64
+# 20090114-1: 22/jan/2009 by Eric Hameleers <alien@slackware.com>
+#             * Updated vlc/ffmpeg/x264 snapshots, fix default font for x86_64,
+#               fix DTS audio decoding on x86_64
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -174,6 +175,7 @@ TAG=${TAG:-"alien"}
 # If SRCVER is set to "HEAD" then you get a git snapshot, else we look
 # for the tarball in vlc's releases directory.
 #SRCVER=${SRCVER:-"0.9.8a"}
+#SRCVER=${SRCVER:-"20090114"}
 SRCVER=${SRCVER:-"HEAD"}
 VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
 
@@ -288,8 +290,8 @@ FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=20080731
 #FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705)
-FFMPEG=r16595 # recommended version for 0.9.2 is r15261 (20080908)
-              # but I use 16595 (20090114)
+FFMPEG=r16707 # recommended version for 0.9.2 is r15261 (20080908)
+              # but I use 16707 (20090121)
 FLUID=1.0.8
 GGI=2.2.2
 GII=1.0.2
@@ -2011,6 +2013,9 @@ echo -e "**\n**"
 
 cd $TMP/tmp-$PRGNAM/libdc1394-${DC1394}
 
+# Skip building the examples - those cause errors:
+cat $SRCDIR/libdc1394-noexamples.patch | patch -p1 2>&1 | tee $OUTPUT/patch-${PRGNAM}_dc1394.log
+
 # Make sure that the static libraw1394 is found in the vlcdeps:
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
@@ -2145,9 +2150,10 @@ cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 \
 cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Re-enable embedded video. With qt.4.4.3 this works reliably:
-cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Now works without patching:
+## Re-enable embedded video. With qt.4.4.3 this should work reliably:
+#cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Preparations for building a separate vlc mozilla plugin :
 if [ "$MOZPLUGIN" == "YES" ]; then
@@ -2179,10 +2185,15 @@ else
   DO_FFMPEG_LIBS_PAT=""
 fi
 
-# VLC 0.9.6 needs to regenerate libtool (known bug)
-if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
-  rm -f m4/{lt,lib}*.m4; autoreconf -svif
-fi
+## VLC 0.9.6 needs to regenerate libtool (known bug)
+#if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
+#  rm -f m4/{lt,lib}*.m4; autoreconf -svif
+#fi
+
+# vlc checks eventfd availability in glibc rather awkwardly. Our glibc 2.7
+# implements the function but does not export it in a header. Still vlc thinks
+# it can make use of it. NOTE: with glibc 2.8 it will work... have to wait...
+sed -i -e 's/^#ifdef HAVE_EVENTFD/#ifdef HAVE_SYS_EVENTFD_H/' src/misc/objects.c
 
 sh bootstrap
 
@@ -2206,8 +2217,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-release \
             --enable-optimize-memory=no \
             --enable-qt4 \
-            --disable-arts \
-            --enable-esd \
 	    --disable-gnomevfs \
             --enable-pvr \
             --enable-dc1394 \
@@ -2245,8 +2254,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
-            --enable-dca \
-            --with-dca-tree=$TMP/tmp-$PRGNAM/libdca-$DCA \
             --enable-faad \
             --with-faad-tree=$TMP/tmp-$PRGNAM/faad2 \
             --enable-twolame \
@@ -2266,6 +2273,10 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             AVCODEC_CFLAGS="" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
+            # Enabled by default:
+            #--enable-dca \
+            #--with-dca-tree=$TMP/tmp-$PRGNAM/libdca-$DCA \
+
             # Libdvdnav is now the default (which uses libdvdread in turn)
             #--enable-dvdread \
             #--with-dvdread-tree=$TMP/tmp-$PRGNAM/libdvdread-$DVDREAD \
@@ -2285,6 +2296,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             #--with-ffmpeg-tree=$TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} \
             #--enable-daap \
             #--disable-musicbrainz \
+            #--disable-arts \
+            #--enable-esd \
 
 # At some time, I needed to remove access_mmap from vlc-config because that
 # caused my vlc to die after only a few seconds of playtime...
@@ -2292,6 +2305,9 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
 # if you did not strip access_mmap from vlc-config:
 #sed -i -e "s/access_mmap//" vlc-config
 
+# Force dtstofloat32 (back) in:
+sed -i -e "s/dtstospdif /dtstofloat32 dtstospdif /" vlc-config
+
 # Now, we are ready for the compile:
 make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log