vlc: updated to 3.0.0.rc6 (20180119 snapshot)

1 files changed, 23 insertions, 22 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 5abdc0e4..d8986c6e 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -513,10 +513,11 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
 # -----------------------------------------------------------------------------
 
 VLCBRANCH=${VLCBRANCH:-"3.0"}
-VLCMINOR=${VLCMINOR:-"0"}
+VLCMINOR=${VLCMINOR:-"0.rc6"}
 DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-${VLCBRANCH}.git"}
-#VERSION=${VERSION:-"${VLCBRANCH}.${VLCMINOR}"}
-VERSION=${VERSION:-"20180106"}
+VERSION=${VERSION:-"20180119"}
+#PKGVERSION=${VERSION}
+PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
 
 DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
 
@@ -618,8 +619,8 @@ DSM=0.2.8
 DV=1.0.0
 DVBPSI=1.3.1
 DVDNAV=5.0.3
-DVDREAD=5.0.3
-DVDCSS=1.4.0
+DVDREAD=6.0.0
+DVDCSS=1.4.1
 EBML=1.3.5
 FAAC=1.28
 FFMPEG=eaff5fc # ffmpeg3 git snapshot 06 dec 2017
@@ -638,7 +639,7 @@ MATROSKA=1.4.8
 MDNS=0.0.8
 MPCDEC=r481
 MPEG2DEC=0.5.1
-NPAPI=20180106
+NPAPI=20180119
 OPUS=1.2.1
 PROJECTM=2.0.1
 QT4=4.8.7
@@ -655,8 +656,8 @@ TWOLAME=0.3.13
 UPNP=1.6.19
 VDPAU=1.1.1
 VPX=1.6.1
-X262=20180105
-X264=20180105-2245
+X262=20180119
+X264=20180118-2245
 X265=2.5
 
 # Where do we look for sources?
@@ -3673,7 +3674,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --docdir=/usr/doc/vlc-$VERSION \
+  --docdir=/usr/doc/vlc-$PKGVERSION \
   --localstatedir=/var \
   --without-contrib \
   --disable-rpath \
@@ -3863,7 +3864,7 @@ fi
 
 # Create an empty plugin cache configuration file, so that
 # it will be deleted too in the event of a 'removepkg':
-touch $PKG/usr/lib${LIBDIRSUFFIX}/vlc/plugins.dat
+touch $PKG/usr/lib${LIBDIRSUFFIX}/vlc/plugins/plugins.dat
 
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
@@ -3891,7 +3892,7 @@ chroot . <<EOCR 2>/dev/null
 cd /usr/lib${LIBDIRSUFFIX}/vlc
 find . -name "plugins*.dat" -exec rm -f {} \;
 echo "Generating VLC plugins cache data..."
-DISPLAY="" ./vlc-cache-gen .
+DISPLAY="" ./vlc-cache-gen /usr/lib${LIBDIRSUFFIX}/vlc/plugins
 EOCR
 
 EOINS
@@ -3918,17 +3919,17 @@ find $PKG/usr/lib${LIBDIRSUFFIX} -name "*.la" -o -name "*.pc" \
   | xargs sed -i -e "s#$VLCDEPSDIR##g"
 
 # Add package documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/vlc/* $PKG/usr/doc/$PRGNAM-$VERSION || true
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION
+mv $PKG/usr/share/doc/vlc/* $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
 rm -rf $PKG/usr/share/doc
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
 # Add all the supporting packages' documentation too:
-cp -a $VLCDEPSDIR/doc/* $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $VLCDEPSDIR/doc/* $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
 # Add the SlackBuild as well as all patches we used to create the package:
-cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp -a $SRCDIR/patches $PKG/usr/doc/$PRGNAM-$VERSION/
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild
+cp -a $SRCDIR/patches $PKG/usr/doc/$PRGNAM-$PKGVERSION/
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/*
+chown -R root:root $PKG/usr/doc/$PRGNAM-$PKGVERSION/*
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
@@ -3952,13 +3953,13 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-$(echo $VERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-$(echo $PKGVERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-$(echo $VERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE} > ${PRGNAM}-$(echo $VERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE}.md5
+md5sum ${PRGNAM}-$(echo $PKGVERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE} > ${PRGNAM}-$(echo $PKGVERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.${PKGTYPE}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-$(echo $VERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-$(echo $PKGVERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.txt
 if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-$(echo $VERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.dep
+  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-$(echo $PKGVERSION |tr '-' '.')-${ARCH}-${BUILD}${TAG}.dep
 fi
 
 }