Update to 2.0.6

1 files changed, 30 insertions, 12 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 17815077..c38dfcb6 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -347,6 +347,8 @@
 # 2.0.5-2     02/feb/2013  by Eric Hameleers <alien@slackware.com>
 #             * Apply patch for VideoLAN-SA-1302 (critical vulnerability in
 #               the ASF demuxer).
+# 2.0.6-1     08/apr/2013  by Eric Hameleers <alien@slackware.com>
+#             * New release.
 #
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -370,7 +372,7 @@
 
 PRGNAM=vlc
 PRGNAM2=npapi-vlc
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-"alien"}
 
 PKGTYPE=${PKGTYPE:-"txz"}
@@ -394,7 +396,7 @@ SLACKVER=$(cat /etc/slackware-version| cut -d' ' -f2)
 #VERSION=${VERSION:-"@1.1.0-bugfix#20120217"}
 #VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-2.0.git#20120217"}
 
-VERSION=${VERSION:-"2.0.5"}
+VERSION=${VERSION:-"2.0.6"}
 
 # At some point, the 1.2 development branched off the master tree:
 #DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
@@ -506,14 +508,14 @@ DV=1.0.0
 DVBPSI=0.2.2
 DVDNAV=4.2.0
 DVDREAD=4.2.0
-DVDCSS=1.2.12
+DVDCSS=1.2.13
 EBML=1.2.2
 FAAC=1.28
 FAAD2=2.7
 #FFMPEG=1.0
-FFMPEG=82db8ee  # git snapshot 20121029
+FFMPEG=23eed00  # git snapshot 20130308
 FLUID=1.1.5
-FRIBIDI=0.19.4
+FRIBIDI=0.19.5
 GGI=2.2.2
 GII=1.0.2
 GOOM=2k4-0
@@ -521,12 +523,12 @@ GSM=1.0.13
 KATE=0.4.1
 LAME=3.99.5
 LIBVA="0.32.0-1+sds2"
-LIVE=2012.09.13
+LIVE=2012.12.18
 LUA=5.1.5
 MATROSKA=1.3.0
 MPCDEC=r475
 MPEG2DEC=0.5.1
-NPAPI=2.0.0
+NPAPI=20130408    #tag:2.0.6
 OPUS=1.0.1
 ORC=0.4.16
 PROJECTM=2.0.1
@@ -541,11 +543,11 @@ SWSCALE=""       # Set SWSCALE="" to checkout a version of ffmpeg's swscale
 THEORA=1.1.1
 TIGER=0.3.4
 TWOLAME=0.3.13
-UPNP=1.6.16
+UPNP=1.6.18
 V4L=0.8.8
 VCD=0.7.23
 VPX=v1.1.0
-X264=20121028-2245
+X264=20130407-2245
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -895,7 +897,8 @@ USE[46]="YES"
 
 # The browser plugin source has been separated from VLC:
 SOURCE[47]="$SRCDIR/npapi-vlc-${NPAPI}.tar.xz"
-SRCURL[47]="http://download.videolan.org/pub/videolan/vlc/${NPAPI}/npapi-vlc-${NPAPI}.tar.xz"
+#SRCURL[47]="http://download.videolan.org/pub/videolan/vlc/${NPAPI}/npapi-vlc-${NPAPI}.tar.xz"
+SRCURL[47]=""
 SRCPAT[47]="NO"
 USE[47]="YES"
 
@@ -1064,6 +1067,16 @@ src_checkout() {
        && tar --exclude .git -${TARCOMP}cf ${2} npapi-vlc-${NPAPI}
      rm -rf npapi-vlc-${NPAPI}
      ;;
+  47) # We clone the git of npapi-vlc at a certain date:
+     mkdir npapi-vlc-${NPAPI} \
+       && cd npapi-vlc-${NPAPI} \
+       && git clone git://git.videolan.org/npapi-vlc.git . \
+       && git checkout $(git rev-list -n 1 --before="`date -d $NPAPI`" master) \
+       && chown -R root:root . \
+       && cd .. \
+       && tar --exclude .git -${TARCOMP}cf ${2} npapi-vlc-${NPAPI}
+     rm -rf npapi-vlc-${NPAPI}
+     ;;
   48) # We clone the git of libbluray at a certain date:
      mkdir libbluray-${BLURAY} \
        && cd libbluray-${BLURAY} \
@@ -1488,7 +1501,7 @@ cat $SRCDIR/ffmpeg_swfdec.patch | patch -p1 --verbose \
 if [ "$ARCH" = "x86_64" ]; then
   ARCHOPTS="--arch=x86_64 --enable-pic"
 elif [ "$ARCH" = "armv7hl" ]; then
-  ARCHOPTS="--enable-pic"
+  ARCHOPTS="--arch=arm --enable-pic --disable-runtime-cpudetect --cpu=cortex-a8 --enable-neon"
 else
   ARCHOPTS=""
 fi
@@ -1539,7 +1552,7 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --enable-vaapi \
   --disable-vdpau \
   $ARCHOPTS \
-  --extra-cflags="-I${VLCDEPSDIR}/usr/include -DRUNTIME_CPUDETECT" \
+  --extra-cflags="-I${VLCDEPSDIR}/usr/include" \
   --extra-ldflags="-L${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX} -ldl" \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
 
@@ -2247,6 +2260,10 @@ else
   ARCHOPTS=""
 fi
 cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
+
+cat $SRCDIR/schroedinger_notests.patch | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}_schroedinger.log
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -2254,6 +2271,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure \
   --prefix=$VLCDEPSDIR/usr \
   --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+  --disable-gtk-doc \
   --disable-shared \
   --with-thread=none \
   --program-prefix= \