A lot of sources are updated

1 files changed, 16 insertions, 21 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 5f66f26a..8ba1e52a 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -281,9 +281,9 @@ fi
 A52=0.7.4
 AMRNB=7.0.0.2
 AMRWB=7.0.0.3
-ASS=0.9.5
+ASS=0.9.6
 AVC1394=0.5.3
-CDDB=1.3.0
+CDDB=1.3.2
 CDIO=0.81
 DAAP=0.4.0
 DC1394=1.2.2
@@ -296,12 +296,12 @@ DVDREAD=4.1.3
 #DVDREAD=r1148  # 20080907
 DVDCSS=1.2.10
 EBML=0.7.8
-FAAC=1.26
-FAAD2=2.6.1
+FAAC=1.28
+FAAD2=2.7
 #FFMPEG=20080731
 #FFMPEG=r18029   # 20090318
 FFMPEG=0.5
-FLUID=1.0.8
+FLUID=1.0.9
 GGI=2.2.2
 GII=1.0.2
 GOOM=2k4-0
@@ -323,7 +323,7 @@ VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
 #X264=20090113-2245      # Needs yasm installed
-X264=20090416-2245      # Needs yasm installed
+X264=20090419-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):
@@ -892,8 +892,8 @@ cd -
 make_faac()
 {
 echo -e "**\n**  faac ...\n**"
-cd $TMP/tmp-$PRGNAM/faac
-sh bootstrap
+cd $TMP/tmp-$PRGNAM/faac-$FAAC
+#sh bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -1127,8 +1127,8 @@ cd -
 make_faad2()
 {
 echo -e "**\n**  faad2 ...\n**"
-cd $TMP/tmp-$PRGNAM/faad2
-autoreconf -vif
+cd $TMP/tmp-$PRGNAM/faad2-$FAAD2
+#autoreconf -vif
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -1666,6 +1666,8 @@ make_schroedinger()
 {
 echo -e "**\n**  schroedinger ...\n**"
 cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
+cat $SRCDIR/schroedinger-1.0.6-fixes.patch  | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch_${PRGNAM}_schroedinger.log
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -2073,11 +2075,6 @@ make_ass()
 {
 echo -e "**\n**  ass  ...\n**"
 cd $TMP/tmp-$PRGNAM/libass-$ASS
-# Apply fixes from the contribs:
-patch -p1 < $SRCDIR/libass_mplayer_updates.patch 2>&1 \
-  | tee $OUTPUT/patch-${PRGNAM}_ass.log
-patch -p0 < $SRCDIR//libass-h-char-fix.patch 2>&1 \
-  | tee -a $OUTPUT/patch-${PRGNAM}_ass.log
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -2182,10 +2179,8 @@ cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \
 #  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Make vlc link against a static libx264 (fixed in 1.0.0-git)
-if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" ]; then
-  cat $SRCDIR/vlc_x264_static.diff | patch -p1 \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-fi
+cat $SRCDIR/vlc_x264_static.diff | patch -p1 \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Allow the use of a recent x264 on vlc-0.9.x (fixed in 1.0.0-git)
 if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ];
@@ -2306,7 +2301,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
             --enable-faad \
-            --with-faad-tree=$TMP/tmp-$PRGNAM/faad2 \
+            --with-faad-tree=$TMP/tmp-$PRGNAM/faad2-$FAAD2 \
             --enable-twolame \
             --with-twolame-tree=$TMP/tmp-$PRGNAM/twolame-$TWOLAME \
             --enable-ogg \
@@ -2594,7 +2589,7 @@ if echo "$*" | grep -qw -- --wrapvlcdeps ; then
     live \
     speex-$SPEEX \
     a52dec-$A52 \
-    faad2 \
+    faad2-$FAAD2 \
     twolame-$TWOLAME \
     libraw1394-${RAW1394} \
     libavc1394-${AVC1394} \