From 848131c9dd871fdd51f4a28b35e3cc414aa3d733 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 28 Mar 2021 19:51:56 +0000 Subject: ffmpeg: update to 4.3.2 --- ffmpeg/build/ffmpeg.SlackBuild | 68 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-) (limited to 'ffmpeg') diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 1002ae3b..1ca9f5c5 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # $Id$ -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -189,6 +189,9 @@ # * Updated. Added AV1 decoding through libdav1d. # Updated internal libraries for libdc1394, fdkaac, fribidi, # libgsm, libva, sdl2, v4l, vdpau and x265. +# 4.3.2-1: 28/mar/2021 by Eric Hameleers +# * Updated. Added internal gme library (game music emulation), and +# refreshed internal ass, dav1d, mfx, va, sdl2 and vpx libraries. # # Run 'sh ffmpeg.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -198,7 +201,7 @@ PRGNAM=ffmpeg -VERSION=${VERSION:-4.3.1} +VERSION=${VERSION:-4.3.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} TAG=${TAG:-"alien"} @@ -256,6 +259,7 @@ DOCS_DAV1D="COPYING NEWS *.md doc/PATENTS" DOCS_DC1394="AUTHORS COPYING ChangeLog INSTALL NEWS README" DOCS_FDKAAC="ChangeLog NOTICE" DOCS_FRIBIDI="AUTHORS COPYING ChangeLog NEWS README THANKS TODO" +DOCS_GME="changes.txt design.txt gme.txt license*.txt readme.txt" DOCS_GSM="COPYRIGHT ChangeLog* INSTALL MACHINES MANIFEST README" DOCS_LAME="API COPYING ChangeLog HACKING LICENSE README STYLEGUIDE TODO USAGE" DOCS_LIBVA="COPYING" @@ -275,25 +279,26 @@ DOCS_X265="COPYING readme.rst" # Support libraries: AMRWBENC=0.1.3 AMR=0.1.3 -ASS=0.14.0 +ASS=0.15.0 AVC1394=0.5.4 -DAV1D=0.7.1 +DAV1D=0.8.2 DC1394=2.2.6 FDKAAC=2.0.1 -MFX=1.25 FRIBIDI=1.0.10 +GME=0.6.3 GSM=1.0.17 LAME=3.100 -LIBVA=2.8.0 +LIBVA=2.10.0 LIBZVBI=0.2.35 +MFX=1.34 OPUS=1.3.1 RAW1394=2.0.5 RTMP=2.3 -SDL2=2.0.12 +SDL2=2.0.14 SPEEX=1.2.0 V4L=1.20.0 VDPAU=1.4 -VPX=1.8.2 +VPX=1.10.0 X264=20191217-2245 X265=3.4 @@ -415,7 +420,7 @@ SRCPAT[12]="NO" # Library supporting VAAPI (GPU-accelerated video playback interface) SOURCE[13]="$SRCDIR/sources/libva-${LIBVA}.tar.bz2" -SRCURL[13]="https://github.com/01org/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2" +SRCURL[13]="https://github.com/intel/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2" SRCPAT[13]="NO" # AMR-WB encoder libraries used to encode 3GPP audio @@ -468,6 +473,11 @@ SOURCE[23]="$SRCDIR/sources/dav1d-${DAV1D}.tar.xz" SRCURL[23]="http://download.videolan.org/pub/videolan/dav1d/${DAV1D}/dav1d-${DAV1D}.tar.xz" SRCPAT[23]="NO" +# Game Music Emulator: +SOURCE[24]="$SRCDIR/sources/game-music-emu-${GME}.tar.xz" +SRCURL[24]="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-${GME}.tar.xz" +SRCPAT[24]="NO" + # Use the src_checkout() function if no downloadable tarball exists. # This function checks out sources from SVN/CVS and creates a tarball of them. @@ -1580,6 +1590,7 @@ cp $DOCS_LIBZVBI $FFMPEGDEPSDIR/doc/zvbi/ || true cd - } + # ----------------------------------------------------------------------------- # Compile dav1d libraries # ----------------------------------------------------------------------------- @@ -1609,6 +1620,42 @@ cp $DOCS_DAV1D \ cd - } + +# ----------------------------------------------------------------------------- +# Compile game music emulator +# ----------------------------------------------------------------------------- + +make_gme() +{ +echo -e "**\n** gme ...\n**" +cd $TMP/tmp-$PRGNAM/game-music-emu-${GME} + +mkdir build-gme +cd build-gme + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=$FFMPEGDEPSDIR/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DENABLE_SHARED=OFF \ + 2>&1 | tee $OUTPUT/configure-${PRGNAM}_gme.log + make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_gme.log + # Install gme into a temp location so ffmpeg can pickup the library + make install 2>&1 | tee -a $OUTPUT/install-${PRGNAM}_gme.log +cd - 1>/dev/null + +# Add DOCS to the ffmpegdeps to have it added to ffmpeg package later: +mkdir -p $FFMPEGDEPSDIR/doc/gme/ +cp $DOCS_DAV1D \ + $FFMPEGDEPSDIR/doc/gme/ || true +cd - +} + + # ----------------------------------------------------------------------------- # Compile ffmpeg with additional support for - # LAME (MP3), XVID, AAC (MP4), FAAD2 , SPEEX, X264, GSM @@ -1672,6 +1719,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \ --enable-libdav1d \ --enable-libdc1394 \ --enable-libfribidi \ + --enable-libgme \ --enable-libgsm \ --enable-libmfx \ --enable-libopencore-amrnb \ @@ -1734,6 +1782,7 @@ fi make_lame make_amr make_amrwbenc +make_gme make_1394 make_v4l make_opus @@ -1784,6 +1833,7 @@ for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do -e 's/-lx264//g' -e 's/-lx265//g' -e 's/-lvpx//g' -e 's/-lmfx//g' \ -e 's/-lzvbi//g' \ -e 's/-ldav1d//g' \ + -e 's/-lgme//g' \ -e "s#-L/tmp/build/tmp-ffmpeg/ffmpegdeps/usr/lib${LIBDIRSUFFIX}##" \ $PCFILE done -- cgit v1.2.3