Updated for 1.0.5

1 files changed, 130 insertions, 157 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 8890c555..a1112e88 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -202,8 +202,9 @@
 #             * Make the dc1394 plugin work by patching VLC to use the new API.
 # 1.0.4-1:    11/dec/2009 by Eric Hameleers <alien@slackware.com>
 #             * New release. The ffmpeg/x264 snapshots were updated.
-# 1.0.X-X:    XX/XXX/2010 by Eric Hameleers <alien@slackware.com>
-#             * New release. Fix compilation with gcc-4.4.2.
+# 1.0.5-1:    28/jan/2010 by Eric Hameleers <alien@slackware.com>
+#             * New release. Fix compilation with gcc-4.4.2. Update snapshots
+#               for live555 and x264.
 # 
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -233,7 +234,7 @@ TAG=${TAG:-"alien"}
 # SRCVER and VERSION values may be modified later!
 # 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:-"1.0.4"}
+SRCVER=${SRCVER:-"1.0.5"}
 # Other acceptible formats:
 #SRCVER=${SRCVER:-"20090114"}
 #SRCVER=${SRCVER:-"HEAD"}
@@ -376,7 +377,7 @@ V4L=0.6.1
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         # about 'function hidden'
-X264=20091210-2245      # Needs yasm installed
+X264=20100127-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):
@@ -803,10 +804,7 @@ if [ "$STATIC_FFMPEG" != "YES" ]; then
   echo "** Not building static FFMPEG plus dependencies..."
   echo "**"
   USE[1]="NO" # ffmpeg
-  USE[2]="NO" # amrnb wrapper
-  USE[3]="NO" # amrnb
-  USE[4]="NO" # amrwb wrapper
-  USE[5]="NO" # amrwb
+  USE[2]="NO" # opencore-amr
   USE[6]="NO" # lame
   USE[8]="NO" # faac
   USE[35]="NO" # theora
@@ -896,19 +894,18 @@ fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-examples \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_theora.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_theora.log
 # Install theora into a temp location so ffmpeg can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_theora.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_theora.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libtheora/
 cp AUTHORS CHANGES COPYING LICENSE README \
@@ -927,18 +924,17 @@ cd $TMP/tmp-$PRGNAM/lame-${LAME}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_lame.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_lame.log
 # Install lame into a temp location so ffmpeg can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_lame.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_lame.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/lame/
 cp API COPYING ChangeLog* DEFINES HACKING LICENSE README* STYLEGUIDE TODO \
@@ -958,19 +954,18 @@ cd $TMP/tmp-$PRGNAM/faac-$FAAC
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --with-mp4v2 \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_faac.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_faac.log
 # Install faac into a temp location so ffmpeg can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_faac.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_faac.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/faac/
 cp AUTHORS COPYING ChangeLog NEWS README TODO \
@@ -990,18 +985,15 @@ LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
+  --prefix=$VLCDEPSDIR/usr \
+  --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   --disable-shared \
   --program-prefix= \
   --program-suffix= \
   --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_amr.log
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amr.log
-make install DESTDIR=$VLCDEPSDIR PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_amr.log
 # Add DOCS to the vlcdeps to have it added to ffmpeg package later:          
 mkdir -p $VLCDEPSDIR/doc/amr
@@ -1162,8 +1154,8 @@ cd $TMP/tmp-$PRGNAM/faad2-$FAAD2
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --without-xmms \
             --enable-static \
             --disable-shared \
@@ -1193,8 +1185,8 @@ cd $TMP/tmp-$PRGNAM/a52dec-${A52}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1310,8 +1302,8 @@ LDFLAGS="$SLKLDFLAGS" \
             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_libmpeg2.log
             #--without-x \
@@ -1340,8 +1332,8 @@ LDFLAGS="$SLKLDFLAGS" \
             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_mpcdec.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_mpcdec.log
@@ -1370,8 +1362,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
              --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
              --enable-static \
              --disable-shared \
-             --program-prefix="" \
-             --program-suffix="" \
+             --program-prefix= \
+             --program-suffix= \
              --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdnav.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
@@ -1398,12 +1390,12 @@ cd $TMP/tmp-$PRGNAM/libdvdcss-$DVDCSS
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --enable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdcss.log
             # Shared library needed so that libdvdread can query the library
@@ -1411,8 +1403,7 @@ LDFLAGS="$SLKLDFLAGS" \
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdcss.log
 # Install libdvdcss into a temp location so libdvdread can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvdcss.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvdcss.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libdvdcss/
 cp AUTHORS COPYING ChangeLog NEWS README \
@@ -1451,8 +1442,8 @@ LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             ${DO_CSS} \
             --build=$ARCH-slackware-linux \
   2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_dvdread.log
@@ -1477,19 +1468,18 @@ cd $TMP/tmp-$PRGNAM/libcddb-$CDDB
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 LDFLAGS="$SLKLDFLAGS -I$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_cddb.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cddb.log
 # Install libcddb into a temp location so cdio and vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cddb.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cddb.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libcddb/
 cp ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
@@ -1524,16 +1514,14 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
             --enable-rock \
             --disable-cddb \
             $DO_VCD \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_cdio.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cdio.log
 # Install libcdio into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-#make install DESTDIR=$VLCDEPSDIR \
-make install \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cdio.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cdio.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libcdio/
 cp ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README* THANKS TODO \
@@ -1552,19 +1540,18 @@ CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_vcd.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vcd.log
 # Install libvcd into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vcd.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vcd.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/vcdimager/
 cp AUTHORS BUGS COPYING ChangeLog* FAQ HACKING NEWS README THANKS TODO \
@@ -1590,20 +1577,19 @@ fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_twolame.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_twolame.log
 ## Install twolame into a temp location so vlc can pickup the library
 #echo -e "\n**\n**\n"
-#make install DESTDIR=$VLCDEPSDIR \
-#  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_twolame.log
+#make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_twolame.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/twolame/
 cp AUTHORS COPYING ChangeLog README TODO \
@@ -1621,20 +1607,19 @@ cd $TMP/tmp-$PRGNAM/libopendaap-$DAAP
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_daap.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_daap.log
 # Install libdaap into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_daap.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_daap.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libopendaap/
 cp AUTHORS COPYING ChangeLog NEWS README \
@@ -1661,16 +1646,15 @@ LDFLAGS="$SLKLDFLAGS" \
             --disable-webserver \
             --disable-samples \
             --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_upnp.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_upnp.log
 # Install libupnp into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
 # The 'make install' will install into $VLCDEPSDIR :
-make install \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_upnp.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_upnp.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libupnp/
 cp AUTHORS COPYING ChangeLog LICENSE NEWS README THANKS TODO \
@@ -1695,8 +1679,8 @@ LDFLAGS="$SLKLDFLAGS" \
             --enable-static \
             --disable-shared \
             --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_oil.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_oil.log
@@ -1732,8 +1716,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --disable-shared \
             --with-thread=none \
             --disable-gstreamer \
@@ -1745,8 +1729,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 make  2>&1 | tee $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Install schroedinger into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Or else the vlc build wil fail:
 cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger.pc
 cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger-1.0.pc
@@ -1770,19 +1753,18 @@ cd $TMP/tmp-$PRGNAM/speex-$SPEEX
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_speex.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log
 # Install speex into a temp location so libshout and vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speex.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speex.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/speex/
 cp AUTHORS COPYING ChangeLog NEWS README* TODO \
@@ -1801,20 +1783,19 @@ CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-speex \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_shout.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_shout.log
 # Install libshout into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_shout.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_shout.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libshout/
 cp COPYING NEWS README \
@@ -1834,12 +1815,12 @@ cd $TMP/tmp-$PRGNAM/goom${GOOM}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_goom.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_goom.log
@@ -1867,19 +1848,17 @@ CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
-            --sysconfdir=$VLCDEPSDIR/etc \
             --enable-static \
             --disable-shared \
 	    --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ggi.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ggi.log
 # Install gii into a temp location so libggi can pickup the library
 echo -e "\n**\n**\n"
-make install \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libgii/
 cp ChangeLog* FAQ NEWS README \
@@ -1890,22 +1869,20 @@ cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libggi-$GGI
 CFLAGS="$SLKCFLAGS" \
 CPPFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --sysconfdir=/etc \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
 	    --disable-debug \
             --with-gii=$VLCDEPSDIR/usr \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_ggi.log
 make -j${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 # Install ggi into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libggi/
 cp ChangeLog* FAQ NEWS README \
@@ -1959,20 +1936,19 @@ cd $TMP/tmp-$PRGNAM/libdv-${DV}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --disable-gtk \
             --disable-xv \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dv.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dv.log
 # Install dv into a temp location so vlc can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dv.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dv.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libdv/
 cp AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO \
@@ -1990,20 +1966,19 @@ cd $TMP/tmp-$PRGNAM/libdvbpsi5-${DVBPSI}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
             --enable-release \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvbpsi.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvbpsi.log
 # Install dvbpsi into a temp location so vlc can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvbpsi.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvbpsi.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libdvbpsi/
 cp AUTHORS COPYING ChangeLog NEWS README \
@@ -2021,19 +1996,18 @@ cd $TMP/tmp-$PRGNAM/libdca-${DCA}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-debug \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_dca.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dca.log
 # Install dca into a temp location so vlc can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dca.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dca.log
 # Fix a broken symlink:
 ( cd $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}
   if [ -L libdts.a ] ; then
@@ -2073,8 +2047,8 @@ LDFLAGS="$SLKLDFLAGS" \
             --mandir=/usr/man \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_raw1394.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_raw1394.log
@@ -2099,8 +2073,8 @@ LIBRAW1394_LIBS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} -lraw1394" \
             --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
-            --program-prefix="" \
-            --program-suffix="" \
+            --program-prefix= \
+            --program-suffix= \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_avc1394.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
@@ -2169,8 +2143,8 @@ cd $TMP/tmp-$PRGNAM/libass-$ASS
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --program-prefix= \
@@ -2180,8 +2154,7 @@ LDFLAGS="$SLKLDFLAGS" \
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ass.log
 # Install libass into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ass.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ass.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libass/
 cp COPYING Changelog $VLCDEPSDIR/doc/libass/  || true
@@ -2199,8 +2172,8 @@ cd $TMP/tmp-$PRGNAM/fluidsynth-$FLUID
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --without-readline \
@@ -2212,8 +2185,7 @@ LDFLAGS="$SLKLDFLAGS" \
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fluid.log
 # Install fluid into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fluid.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fluid.log
 # Fix a missing link dependency (resolves 'unknown symbols' runtime):
 sed -i -e "/^Libs:/s/$/ -lasound/" $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/fluidsynth.pc
 # Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2269,8 +2241,8 @@ CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 CXXFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
 LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
+./configure --prefix=$VLCDEPSDIR/usr \
+            --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
             --enable-static \
             --disable-shared \
             --disable-doc \
@@ -2280,8 +2252,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_tiger.log
 make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_tiger.log
 # Install tiger into a temp location so vlc can pickup the library
-make install DESTDIR=$VLCDEPSDIR \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_tiger.log
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_tiger.log
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libtiger/
 cp AUTHORS COPYING README THANKS \
@@ -2331,7 +2302,7 @@ export CPPFLAGS="$SLKCFLAGS"
 export LDFLAGS="$SLKLDFLAGS"
 make -j${NUMJOBS} LINKTYPE=static PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log
 # Strip the static lib to prevent linking errors in 64-bit,
-# and fix the pkg-cconfig file (to fix unresolved symbols in the plugin)
+# and fix the pkg-config file (to fix unresolved symbols in the plugin)
 find . -name "*.a" | xargs strip --strip-unneeded
 sed -i "/^Libs: /s/ -lv4l2/ -lv4l2 -lv4lconvert/" libv4l2/libv4l2.pc
 # Install libv4l into a temp directory so that vlc can pick it up later:
@@ -2420,9 +2391,11 @@ if [ "$VERSION" = "1.0.3" ]; then
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 fi
 
-# Patch the dc1394 plugin to use the new libdc1394 2.x API:
-cat $SRCDIR/vlc-1.0.3_ieee1394.diff | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Patch the dc1394 plugin (vlc 1.0.x) to use the new libdc1394 2.x API:
+if [ "$(echo $VERSION |cut -d. -f1-2)" = "1.0" ]; then
+ cat $SRCDIR/vlc-1.0.3_ieee1394.diff | patch -p1 --verbose \
+   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
 
 # Preparations for building a separate vlc mozilla plugin :
 if [ "$MOZPLUGIN" == "YES" ]; then
@@ -2493,8 +2466,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-pvr \
             --enable-dc1394 \
             --enable-dv \
-            --with-dv-raw1394-tree=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
-            --with-dv-avc1394-tree=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
             --enable-dvbpsi \
             --enable-dvdnav \
             --with-dvdnav-config-path=$VLCDEPSDIR/usr/bin \
@@ -2574,6 +2545,8 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             #--disable-musicbrainz \
             #--disable-arts \
             #--enable-esd \
+            #--with-dv-raw1394-tree=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
+            #--with-dv-avc1394-tree=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
 
             # Now finds the required libraries without manual tweaking:
             #AVCODEC_LIBS="-lavcodec -lbz2 -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lswscale -lavutil -lvorbis -lm -logg" \