diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-05-30 15:41:52 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-05-30 15:41:52 +0000 |
| commit | c8e4bd59891714ea90d07b6160b14762abb1b09a (patch) | |
| tree | b7822918d2f4321b38f26ae13215039d607c8fd5 | |
| parent | 151b29c19fd5232d380eea97c5cd97b238dc418e (diff) | |
| download | asb-c8e4bd59891714ea90d07b6160b14762abb1b09a.tar.gz asb-c8e4bd59891714ea90d07b6160b14762abb1b09a.tar.xz | |
Update libebml and matroska so we can do away with two patches.
Add two patches to ffmpeg's libavcodec.
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index 43727e31..e7743a58 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -651,7 +651,7 @@ DVBPSI=1.3.2 DVDNAV=6.0.0 DVDREAD=6.0.1 DVDCSS=1.4.2 -EBML=1.3.6 +EBML=1.3.8 FAAC=1.28 FFMPEG=eaff5fc # ffmpeg3 git snapshot 06 dec 2017 FLUID=1.1.6 @@ -665,7 +665,7 @@ LAME=3.100 LIBVA=2.0.0 LIVE=2016.11.28 LUA=5.1.5 -MATROSKA=1.4.9 +MATROSKA=1.5.1 MDNS=0.0.10 MPCDEC=r481 MPEG2DEC=0.5.1 @@ -1635,6 +1635,12 @@ cat $SRCDIR/patches/ffmpeg_mkv-overshoot.patch | patch -p1 --verbose \ # Apply an upstreamed patch: cat $SRCDIR/patches/ffmpeg_fix-memset-size.patch | patch -p1 --verbose \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log +# Set the alternate transfer function early in HEVC: +cat $SRCDIR/patches/ffmpeg_avcodec_hevcdec_sei_params.patch | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log +# Set the alternate transfer function early in H264: +cat $SRCDIR/patches/ffmpeg_avcodec_h264_slice_sei_params.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" @@ -1862,13 +1868,13 @@ touch $OUTPUT/patch-${PRGNAM}_ebml.log # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log #cat $SRCDIR/patches/ebml_infinite-start.patch | patch -p1 --verbose \ # 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log -if [ $(gcc -dumpversion |cut -d'.' -f1) -ge 7 ]; then - cat $SRCDIR/patches/ebml_gcc7.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log -else - cat $SRCDIR/patches/ebml_limits.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log -fi +#if [ $(gcc -dumpversion |cut -d'.' -f1) -ge 7 ]; then +# cat $SRCDIR/patches/ebml_gcc7.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log +#else +# cat $SRCDIR/patches/ebml_limits.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log +#fi export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden" @@ -1901,14 +1907,14 @@ 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 +## 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" |