Update to 2.0.7, new attempt to fix static linking of libdvdcss.a

1 files changed, 39 insertions, 42 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 1448bf65..198f0c3a 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -353,6 +353,10 @@
 # 2.0.6-2     12/apr/2013  by Eric Hameleers <alien@slackware.com>
 #             * Fix the broken uPnP service discovery module which caused
 #               audio stuttering in some videos.
+# 2.0.7-1     28/may/2013  by Eric Hameleers <alien@slackware.com>
+#             * New release. Build fixes for ARM, new snapshots for libdvdread
+#               and libdvdnav (now maintained by VideoLAN) and a new attempt at
+#               static linking of DVDCSS.
 #
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -376,7 +380,7 @@
 
 PRGNAM=vlc
 PRGNAM2=npapi-vlc
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-"alien"}
 
 PKGTYPE=${PKGTYPE:-"txz"}
@@ -400,7 +404,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.6"}
+VERSION=${VERSION:-"2.0.7"}
 
 # At some point, the 1.2 development branched off the master tree:
 #DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
@@ -510,8 +514,8 @@ DC1394=2.1.2
 DCA=0.0.5
 DV=1.0.0
 DVBPSI=0.2.2
-DVDNAV=4.2.0
-DVDREAD=4.2.0
+DVDNAV=20130528
+DVDREAD=20130528
 DVDCSS=1.2.13
 EBML=1.2.2
 FAAC=1.28
@@ -700,14 +704,14 @@ USE[13]="YES"
 
 # DVD support:
 SOURCE[14]="$SRCDIR/libdvdnav-$DVDNAV.tar.bz2"
-SRCURL[14]="http://dvdnav.mplayerhq.hu/releases/libdvdnav-${DVDNAV}.tar.bz2"
-#SRCURL[14]=""
+#SRCURL[14]="http://dvdnav.mplayerhq.hu/releases/libdvdnav-${DVDNAV}.tar.bz2"
+SRCURL[14]=""
 SRCPAT[14]="NO"
 USE[14]="YES"
 
 SOURCE[15]="$SRCDIR/libdvdread-${DVDREAD}.tar.bz2"
-SRCURL[15]="http://dvdnav.mplayerhq.hu/releases/libdvdread-${DVDREAD}.tar.bz2"
-#SRCURL[15]=""
+#SRCURL[15]="http://dvdnav.mplayerhq.hu/releases/libdvdread-${DVDREAD}.tar.bz2"
+SRCURL[15]=""
 SRCPAT[15]="NO"
 USE[15]="YES"
 
@@ -1005,34 +1009,25 @@ src_checkout() {
      unset SVNURL
      ;;
  14) # libdvdnav-$DVDNAV
-     local SVNURL=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-     if [ "$(echo ${DVDNAV}|cut -c1)" == 'r' ]; then # revision instead of date
-       REV=$(echo ${DVDNAV} | cut -c2-)
-     else
-       REV="{${DVDNAV}}"
-     fi
+     # We clone the git of libdvdnav at a certain date:
      mkdir libdvdnav-${DVDNAV} \
-       && cd libdvdnav-${DVDNAV} \
-       && svn checkout --revision $REV $SVNURL . \
-       && chown -R root:root . \
-       && cd .. \
-       && tar --exclude .svn -${TARCOMP}cf ${2} libdvdnav-${DVDNAV}
-     rm -rf libdvdnav-${DVDNAV}
-     unset SVNURL
+      && cd libdvdnav-${DVDNAV} \
+      && git clone git://git.videolan.org/libdvdnav/ . \
+      && git checkout $(git rev-list -n 1 --before="`date -d $DVDNAV`" master) \
+      && chown -R root:root . \
+      && cd .. \
+      && tar --exclude .git -${TARCOMP}cf ${2} libdvdnav-${DVDNAV}
+     rm -rf libdvdnav-${DVDREAD}
      ;;
  15) # libdvdread-$DVDREAD
-     if [ "$(echo ${DVDREAD}|cut -c1)" == 'r' ]; then # revision instead of date
-       REV=$(echo ${DVDREAD} | cut -c2-)
-     else
-       REV="{${DVDREAD}}"
-     fi
+     # We clone the git of libdvdread at a certain date:
      mkdir libdvdread-${DVDREAD} \
-       && cd libdvdread-${DVDREAD} \
-       && svn checkout --revision $REV svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread . \
-       && find . -type d -name '.svn' -depth | xargs rm -rf \
-       && chown -R root:root . \
-       && cd .. \
-       && tar -${TARCOMP}cf ${2} libdvdread-${DVDREAD}
+      && cd libdvdread-${DVDREAD} \
+      && git clone git://git.videolan.org/libdvdread/ . \
+      && git checkout $(git rev-list -n 1 --before="`date -d $DVDREAD`" master)\
+      && chown -R root:root . \
+      && cd .. \
+      && tar --exclude .git -${TARCOMP}cf ${2} libdvdread-${DVDREAD}
      rm -rf libdvdread-${DVDREAD}
      ;;
  19) # libmpcdec-$MPCDEC
@@ -1899,20 +1894,19 @@ make_dvdnav()
 echo -e "**\n**  libdvdnav  ...\n**"
 cd $TMP/tmp-$PRGNAM/libdvdnav-$DVDNAV
 
-## Patch to fix aspect ratio in some DVD menus, incorporated into 4.2.0:
-#cat $SRCDIR/libdvdnav-resolution.patch | patch -p0 --verbose \
-#  2>&1 | tee $OUTPUT/patch-${PRGNAM}_dvdnav.log
+autoreconf -vif
 
 CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
 PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$VLCDEPSDIR/usr/bin:$PATH" \
-./autogen.sh \
+./configure \
   --prefix=$VLCDEPSDIR/usr \
   --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   --enable-static \
   --disable-shared \
+  --disable-examples \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -1921,10 +1915,10 @@ make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
 # Install libdvdnav into a temp location so vlc can pickup the library
 make install m4datadir=$VLCDEPSDIR/usr/share/aclocal \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvdnav.log
-# Make a symlink which vlc-20080730 needs:
-( cd $VLCDEPSDIR/usr/include
-  ln -s dvdread libdvdread
-)
+## Make a symlink which vlc-20080730 needs:
+#( cd $VLCDEPSDIR/usr/include
+#  ln -s dvdread libdvdread
+#)
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/libdvdnav/
 cp AUTHORS COPYING ChangeLog NEWS README TODO \
@@ -1947,6 +1941,7 @@ LDFLAGS="$SLKLDFLAGS" \
   --prefix=$VLCDEPSDIR/usr \
   --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   --disable-doc \
+  --disable-shared \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -1977,13 +1972,15 @@ if [ "${USE_PATENTS}" == "YES" ]; then
   # If we allow patented software, we also link libdvdcss statically into
   # libdvdread. Otherwise, you can just install libdvdcss additionally
   # and the dvdread library will find and load dvdcss support at runtime.
-  cat $SRCDIR/dvdread-css-static.patch | patch -p1 --verbose \
-    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_dvdread.log
   DO_CSS="--enable-libdvdcss"
 else
   DO_CSS=""
 fi
 
+sed -i -e "s#CSS_LIBS=-ldvdcss#CSS_LIBS=$VLCDEPSDIR/usr/lib$LIBDIRSUFFIX/libdvdcss.a -static#" \
+  configure.ac
+  #-e 's#AC_CHECK_LIB(dvdcss,#AC_CHECK_LIB(,#' \
+
 ./autogen.sh noconfig \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdread.log