summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-05-27 13:33:27 +0000
committer Eric Hameleers <alien@slackware.com>2019-05-27 13:33:27 +0000
commit40a7bab38db37b5c4b65cf607832fe0c2873f440 (patch)
treef49d4cb3f240bae0ec04f68d028745ab63dea1dc
parent1c94b9022695f517f8a39e52a29530c708a10d96 (diff)
downloadasb-40a7bab38db37b5c4b65cf607832fe0c2873f440.tar.gz
asb-40a7bab38db37b5c4b65cf607832fe0c2873f440.tar.xz
vlc: update the internal dependencies in preparation for vlc-3.0.7
-rwxr-xr-xvlc/build/vlc.SlackBuild78
1 files changed, 57 insertions, 21 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index e836b17d..43727e31 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -27,7 +27,7 @@
# For: vlc
# Descr: multimedia player for various audio and video formats
# URL: http://www.videolan.org/vlc/
-# Buildneeds: apache-ant, java8, meson, ninja
+# Buildneeds: apache-ant, java8, meson, ninja, python3
# Needs: OpenAL, SDL_sound, libxkbcommon, qt5
# (slackware 14.2: also libinput, libwacom)
# libdvdcss for playing encrypted DVDs
@@ -476,6 +476,8 @@
# * Update.
# 3.0.6-1 12/jan/2019 by Eric Hameleers <alien@slackware.com>
# * Update. Added the dav1d (AV1 video) decoder.
+# 3.0.7-1 25/may/2019 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -531,9 +533,9 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
# -----------------------------------------------------------------------------
VLCBRANCH=${VLCBRANCH:-"3.0"}
-VLCMINOR=${VLCMINOR:-"6"}
+VLCMINOR=${VLCMINOR:-"7"}
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-${VLCBRANCH}.git"}
-VERSION=${VERSION:-"3.0.6"}
+VERSION=${VERSION:-"3.0.7"}
PKGVERSION=${VERSION}
#PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
@@ -637,17 +639,17 @@ AMR=0.1.3
ASDCPLIB=2.7.19
ASS=0.14.0
AVC1394=0.5.4
-BLURAY=1.0.2
+BLURAY=1.1.1
CDDB=1.3.2
CDIO=0.90
-DAV1D=0.1.0
+DAV1D=0.3.1
DC1394=2.2.1
DCA=0.0.6
DSM=0.3.0
DV=1.0.0
DVBPSI=1.3.2
DVDNAV=6.0.0
-DVDREAD=6.0.0
+DVDREAD=6.0.1
DVDCSS=1.4.2
EBML=1.3.6
FAAC=1.28
@@ -709,10 +711,10 @@ if ! which ant 1>/dev/null 2>/dev/null ; then
sleep 10
fi
-# Building dav1d plugin requires meson/ninja:
-if ! which meson 1>/dev/null 2>/dev/null ; then
- echo "+++ MESON and/or NINJA not present - the build will abort on compiling dav1d encoder! +++"
- echo "+++ Press Ctrl-C within 10 seconds, install 'meson' and 'ninja' and try again. +++"
+# Building dav1d plugin requires meson/ninja/python3:
+if ( ! which meson || ! which ninja || ! which python3 ) 1>/dev/null 2>/dev/null ; then
+ echo "+++ MESON, NINJA and/or PYTHON3 not present - the build will abort on compiling dav1d encoder! +++"
+ echo "+++ Press Ctrl-C within 10 seconds, install 'meson', 'ninja' and 'python3' and try again. +++"
sleep 10
fi
@@ -1627,6 +1629,12 @@ cat $SRCDIR/patches/ffmpeg_dxva_vc1_crash.patch | patch -p1 --verbose \
# Fix SAR not set early enough when starting the decoder:
cat $SRCDIR/patches/ffmpeg_h264_early_SAR.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+# Don't use EBML elements in Matroska that are bigger than their parents:
+cat $SRCDIR/patches/ffmpeg_mkv-overshoot.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+# Apply an upstreamed patch:
+cat $SRCDIR/patches/ffmpeg_fix-memset-size.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
if pkg-config --exists libopenjp2 1>/dev/null 2>/dev/null ; then
USE_OPENJPEG="--enable-libopenjpeg"
@@ -1892,6 +1900,16 @@ make_matroska()
echo -e "**\n** matroska ...\n**"
OLDDIR=$(pwd)
cd $TMP/tmp-$PRGNAM/libmatroska-$MATROSKA
+
+# Apply patches:
+touch $OUTPUT/patch-${PRGNAM}_matroska.log
+# Fix writing on NULL memory:
+cat $SRCDIR/patches/matroska_dont-write-to-null-memory.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_matroska.log
+# Do not use invalid lace sizes:
+cat $SRCDIR/patches/matroska_invalid-lace-sizes.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_matroska.log
+
export CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
export CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
export LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS"
@@ -2953,11 +2971,6 @@ make_fribidi()
{
echo -e "**\n** fribidi ...\n**"
cd $TMP/tmp-$PRGNAM/fribidi-$FRIBIDI
-if [ "$ARCH" = "x86_64" -o "$ARCH" = "armv7hl" ]; then
- ARCHOPTS="--with-pic"
-else
- ARCHOPTS=""
-fi
# Apply patches:
touch $OUTPUT/patch-${PRGNAM}_fribidi.log
@@ -2979,25 +2992,32 @@ sed \
# And since we patched the configure.ac and Makefile.am we have to bootstrap:
#touch configure && ./bootstrap --write-configure \
+mkdir m4
+cp -ia /usr/share/libtool/build-aux/config.{guess,sub} .
autoreconf -vif \
2>&1 | tee $OUTPUT/bootstrap-${PRGNAM}_fribidi.log
+echo -e "\n**\n**\n"
+#unset CFLAGS
+#unset LDFLAGS
+unset PKG_CONFIG_PATH
+LDFLAGS="${SLKLDFLAGS}" \
+CFLAGS="${SLKCFLAGS}" \
./configure \
--prefix=$VLCDEPSDIR/usr \
--libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
--enable-static \
--disable-shared \
- $ARCHOPTS \
+ --with-pic \
--build=$TARGET \
- CFLAGS="${SLKCFLAGS}" \
- LDFLAGS="${SLKLDFLAGS}" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_fribidi.log
+echo -e "\n**\n**\n"
# I found no way around this: I need to do a "make -i" and ignore the errors,
# Then do a "make" again which will then build the remaining stuff correctly:
( echo "** Fribidy 'make -i' part 1 **"
make -i
echo "** Fribidy 'make' part 2 **"
- make
+ touch config.status ; make
) 2>&1 | tee $OUTPUT/make-${PRGNAM}_fribidi.log
# Install fribidi into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
@@ -3423,6 +3443,9 @@ make_dav1d()
echo -e "**\n** dav1d ...\n**"
cd $TMP/tmp-$PRGNAM/dav1d-${DAV1D}
+# Make it compile on 14.2:
+sed -i meson.build -e 's/2.13.02/2.13.01/'
+
meson build \
--prefix $VLCDEPSDIR/usr \
--default-library static \
@@ -3515,10 +3538,19 @@ make_bluray()
echo -e "**\n** bluray ...\n**"
cd $TMP/tmp-$PRGNAM/libbluray-${BLURAY}
+# Apply patches:
+touch $OUTPUT/patch-${PRGNAM}_bluray.log
+# Add bdjo header:
+cat $SRCDIR/patches/bluray_bdjo-data-header.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_bluray.log
+
+# Fix 64bit library path:
sed -i -e "s|/usr/lib/libbluray|/usr/lib${LIBDIRSUFFIX}/libbluray|" \
src/libbluray/bdj/bdj.c
-[ ! -x configure ] && sh bootstrap
+# Make it stop whining about automake-1.16 on Slackware 14.2:
+autoreconf -vif \
+ 2>&1 | tee $OUTPUT/bootstrap-${PRGNAM}_bluray.log
CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
@@ -3529,8 +3561,12 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
--disable-doxygen-doc \
--disable-examples \
+ --disable-silent-rules \
--disable-shared \
--enable-static \
+ --with-libxml2 \
+ --enable-udf \
+ --enable-bdjava \
--program-prefix= \
--program-suffix= \
--build=$TARGET \
@@ -4533,11 +4569,11 @@ else
make_dsm
make_microdns
make_live555
- make_fribidi
make_taglib
make_asdcplib
make_ass
make_fluid
+ make_fribidi
make_1394
make_kate
make_tiger