vlc2: rebuilt due to libidn2/openssl update in -current

1 files changed, 31 insertions, 11 deletions

diff --git a/vlc2/build/vlc2.SlackBuild b/vlc2/build/vlc2.SlackBuild
index f8524198..b5ef1bba 100755
--- a/vlc2/build/vlc2.SlackBuild
+++ b/vlc2/build/vlc2.SlackBuild
@@ -444,6 +444,9 @@
 #                     in combination with hardware-assisted decoding.
 # 2.2.8-3     02/jan/2018  by Eric Hameleers <alien@slackware.com>
 #             * Fix hardware decoding in ffmpeg3 variant.
+# 2.2.8-4     30/may/2018  by Eric Hameleers <alien@slackware.com>
+#             * Rebuilt due to libidn2/openssl update in -current.
+#               Also updated internal libraries: asdcp, dca, dvbpsi, x265.
 #
 # Run 'sh vlc.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -468,7 +471,7 @@
 PRGNAM=vlc2
 SRCNAM=vlc
 PRGNAM2=npapi-vlc
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 NPBUILD=${NPBUILD:-1}
 TAG=${TAG:-"alien"}
 
@@ -613,7 +616,7 @@ A52=0.7.4
 AACENC=0.1.2
 AMRWBENC=0.1.3
 AMR=0.1.3
-ASDCPLIB=1.12.58
+ASDCPLIB=2.7.19
 ASS=0.13.6
 AVC1394=0.5.4
 BLURAY=1.0.1
@@ -621,9 +624,9 @@ CDDB=1.3.2
 CDIO=0.90
 DAAP=0.4.0
 DC1394=2.2.1
-DCA=0.0.5
+DCA=0.0.6
 DV=1.0.0
-DVBPSI=1.3.1
+DVBPSI=1.3.2
 DVDNAV=5.0.3
 DVDREAD=5.0.3
 DVDCSS=1.4.0
@@ -662,7 +665,7 @@ VDPAU=1.1.1
 VPX=1.6.1
 X262=20171128
 X264=20171128-2245
-X265=2.5
+X265=2.7
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -1324,7 +1327,7 @@ if [ "$P1" != "--oldbuild" ]; then
       if $(file ${SOURCE[$i]} | grep -iq ": zip"); then
         unzip ${SOURCE[$i]}
       else
-        tar -xvf ${SOURCE[$i]}
+        tar -xf ${SOURCE[$i]}
       fi
     fi
   done
@@ -2585,6 +2588,13 @@ make_shout()
 {
 echo -e "**\n**  libshout  ...\n**"
 cd $TMP/tmp-$PRGNAM/libshout-$SHOUT
+
+# Compensate for openssl-1.1:
+if pkg-config --atleast-version=1.1 openssl ; then
+  cat $SRCDIR/patches/libshout_openssl11.patch | patch -p1 --verbose \
+    2>&1 | tee $OUTPUT/patch-${PRGNAM}_shout.log
+fi
+
 CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 CPPFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
@@ -2940,6 +2950,9 @@ make_dca()
 {
 echo -e "**\n**  dca ...\n**"
 cd $TMP/tmp-$PRGNAM/libdca-${DCA}
+
+pkg_static "libdca/libdca.pc.in"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -3577,12 +3590,10 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure \
   --prefix=$VLCDEPSDIR/usr \
   --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+  --disable-doxygen-doc \
   --disable-examples \
-  --disable-debug \
   --disable-shared \
   --enable-static \
-  --enable-bdjava \
-  --disable-doxygen-doc \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -3605,7 +3616,15 @@ make_asdcplib()
 echo -e "**\n**  asdcplib ...\n**"
 cd $TMP/tmp-$PRGNAM/asdcplib-${ASDCPLIB}
 
-[ ! -x configure ] && sh bootstrap
+# Apply patches:
+touch $OUTPUT/patch-${PRGNAM}_asdcplib.log
+cat $SRCDIR/patches/asdcplib_nettle.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_asdcplib.log
+
+# The patch touches configure.ac:
+#[ ! -x configure ] && sh bootstrap
+autoreconf -vif \
+  2>&1 | tee $OUTPUT/reconf-${PRGNAM}_asdcplib.log
 
 CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
 CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS -std=gnu++98" \
@@ -3617,6 +3636,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --disable-shared \
   --enable-freedist \
   --enable-static \
+  --with-nettle \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -4218,7 +4238,7 @@ if echo "$*" | grep -qw -- --unwrapvlcdeps ; then
   [ ! -f $DEPSFILE ] && DEPSFILE="$SRCDIR/$PRGNAM-vlcdeps-${SLACKVER}-$ARCH.tar.bz2"
   cd $TMP/tmp-$PRGNAM
   echo "Extracting tarball with pre-compiled binary library code..."
-  tar -xvf $DEPSFILE
+  tar -xf $DEPSFILE
   find . -name "*.la" -o -name "*.pc" | xargs sed -i -e "s#/vlcdepsdir#$TMP/tmp-$PRGNAM#g"
   cd -