summaryrefslogtreecommitdiff
path: root/source/l/ffmpeg
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-04-12 20:07:12 +0000
committerEric Hameleers <alien@slackware.com>2021-04-13 08:59:54 +0200
commit749d9833893fd9563593f4da69895ee19a13eb62 (patch)
tree0b82865950aacdd98a7df744b6c9507026c11310 /source/l/ffmpeg
parent0b6c0a0531b1ebd83557f88a8280c2c398ecb247 (diff)
downloadcurrent-749d9833893fd9563593f4da69895ee19a13eb62.tar.gz
Mon Apr 12 20:07:12 UTC 202120210412200712
I'm going to go ahead and call this a beta even though there's still no fix for the illegal instruction issue with 32-bit mariadb. But there should be soon (thanks ponce!) No build regressions noted with the official gcc-10.3 release. Please report any new (or old) issues on the LQ Slackware forum. Enjoy! :-) a/kernel-generic-5.10.29-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.29-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.29-x86_64-1.txz: Upgraded. d/gcc-10.3.0-x86_64-1.txz: Upgraded. d/gcc-brig-10.3.0-x86_64-1.txz: Upgraded. d/gcc-g++-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gdc-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gnat-10.3.0-x86_64-1.txz: Upgraded. d/gcc-go-10.3.0-x86_64-1.txz: Upgraded. d/gcc-objc-10.3.0-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.29-x86-1.txz: Upgraded. d/libtool-2.4.6-x86_64-17.txz: Rebuilt. Recompiled to update embedded GCC version number. d/meson-0.57.2-x86_64-1.txz: Upgraded. d/vala-0.52.2-x86_64-1.txz: Upgraded. k/kernel-source-5.10.29-noarch-1.txz: Upgraded. CC_VERSION_TEXT "gcc (GCC) 10.2.0" -> "gcc (GCC) 10.3.0" GCC_VERSION 100200 -> 100300 INTEL_IDXD m -> n kde/attica-5.81.0-x86_64-1.txz: Upgraded. kde/baloo-5.81.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.81.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.81.0-noarch-1.txz: Upgraded. kde/extra-cmake-modules-5.81.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.81.0-x86_64-1.txz: Upgraded. kde/kactivities-5.81.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.81.0-x86_64-1.txz: Upgraded. kde/kapidox-5.81.0-x86_64-1.txz: Upgraded. kde/karchive-5.81.0-x86_64-1.txz: Upgraded. kde/kauth-5.81.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.81.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.81.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.81.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.81.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.81.0-x86_64-1.txz: Upgraded. kde/kconfig-5.81.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.81.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kcrash-5.81.0-x86_64-1.txz: Upgraded. kde/kdav-5.81.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.81.0-x86_64-1.txz: Upgraded. kde/kded-5.81.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.81.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.81.0-x86_64-1.txz: Upgraded. kde/kdesu-5.81.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.81.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.81.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.81.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.81.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.81.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.81.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kholidays-5.81.0-x86_64-1.txz: Upgraded. kde/khtml-5.81.0-x86_64-1.txz: Upgraded. kde/ki18n-5.81.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.81.0-x86_64-1.txz: Upgraded. kde/kidletime-5.81.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.81.0-x86_64-1.txz: Upgraded. kde/kinit-5.81.0-x86_64-1.txz: Upgraded. kde/kio-5.81.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.81.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.81.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.81.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kjs-5.81.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.81.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.81.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.81.0-x86_64-1.txz: Upgraded. kde/knotifications-5.81.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.81.0-x86_64-1.txz: Upgraded. kde/kpackage-5.81.0-x86_64-1.txz: Upgraded. kde/kparts-5.81.0-x86_64-1.txz: Upgraded. kde/kpeople-5.81.0-x86_64-1.txz: Upgraded. kde/kplotting-5.81.0-x86_64-1.txz: Upgraded. kde/kpty-5.81.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.81.0-x86_64-1.txz: Upgraded. kde/kross-5.81.0-x86_64-1.txz: Upgraded. kde/krunner-5.81.0-x86_64-1.txz: Upgraded. kde/kservice-5.81.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.81.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.81.0-x86_64-1.txz: Upgraded. kde/kwallet-5.81.0-x86_64-1.txz: Upgraded. kde/kwayland-5.81.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.81.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.81.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.81.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.81.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.81.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.81.0-noarch-1.txz: Upgraded. kde/plasma-framework-5.81.0-x86_64-1.txz: Upgraded. kde/plasma-wayland-protocols-1.2.1-x86_64-1.txz: Upgraded. kde/prison-5.81.0-x86_64-1.txz: Upgraded. kde/purpose-5.81.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.81.0-x86_64-1.txz: Upgraded. kde/solid-5.81.0-x86_64-1.txz: Upgraded. kde/sonnet-5.81.0-x86_64-1.txz: Upgraded. kde/syndication-5.81.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.81.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.81.0-x86_64-1.txz: Upgraded. l/ffmpeg-4.4-x86_64-1.txz: Upgraded. Thanks to Heinz Wiesinger. l/fuse3-3.10.3-x86_64-1.txz: Upgraded. l/mlt-6.26.0-x86_64-1.txz: Upgraded. n/dnsmasq-2.85-x86_64-1.txz: Upgraded. Use random source ports where possible if source addresses/interfaces in use. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3448 (* Security fix *) n/irssi-1.2.3-x86_64-1.txz: Upgraded. This update fixes bugs and security issues. See the NEWS file for details. (* Security fix *) n/postfix-3.5.10-x86_64-1.txz: Upgraded. xap/xsnow-3.3.0-x86_64-1.txz: Upgraded. Just in time for tonight's snowstorm here in Minnesota. ;-) xfce/exo-4.16.2-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.16.1-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/linux-5.11.x/kernel-generic-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-headers-5.11.13-x86-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-huge-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-modules-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-source-5.11.13-noarch-1.txz: Upgraded. -INTEL_IDXD_SVM y CC_VERSION_TEXT "gcc (GCC) 10.2.0" -> "gcc (GCC) 10.3.0" GCC_VERSION 100200 -> 100300 INTEL_IDXD m -> n usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/ffmpeg')
-rwxr-xr-xsource/l/ffmpeg/ffmpeg.SlackBuild53
1 files changed, 40 insertions, 13 deletions
diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild
index 6ede2d33..f4a443e4 100755
--- a/source/l/ffmpeg/ffmpeg.SlackBuild
+++ b/source/l/ffmpeg/ffmpeg.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ffmpeg
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -79,11 +79,12 @@ fi
# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes
# syntax, so we have to do it the complicated way :/
# Additional optional (autodetected) dependencies are:
-# - jack-audio-connection-kit
+# - bzip2
# - libva
# - libvdpau
# - libX11
# - libxcb
+# - nvdec/nvenc
# - sdl2
# - xz
# - zlib
@@ -91,21 +92,16 @@ fi
libx264="" ; [ "${X264:-no}" != "no" ] && libx264="--enable-libx264"
libcelt="" ; [ "${CELT:-no}" != "no" ] && libcelt="--enable-libcelt"
libdc1394="" ; [ "${DC1394:-no}" != "no" ] && libdc1394="--enable-libdc1394"
-libfrei0r="" ; [ "${FREI0R:-no}" != "no" ] && libfrei0r="--enable-frei0r"
libgsm="" ; [ "${GSM:-no}" != "no" ] && libgsm="--enable-libgsm"
librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp"
-libspeex="" ; [ "${SPEEX:-yes}" != "no" ] && libspeex="--enable-libspeex"
libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid"
libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass"
-libopenal="" ; [ "${OPENAL:-no}" != "no" ] && libopenal="--enable-openal"
libiec61883=""; [ "${IEC61883:-no}" != "no" ] && libiec61883="--enable-libiec61883"
libilbc="" ; [ "${ILBC:-no}" != "no" ] && libilbc="--enable-libilbc"
libmodplug="" ; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmodplug"
-libopus="" ; [ "${OPUS:-yes}" != "no" ] && libopus="--enable-libopus"
libtwolame="" ; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame"
ladspa="" ; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa"
libflite="" ; [ "${FLITE:-no}" != "no" ] && libflite="--enable-libflite"
-libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvidstab"
libx265="" ; [ "${X265:-no}" != "no" ] && libx265="--enable-libx265"
libzvbi="" ; [ "${ZVBI:-no}" != "no" ] && libzvbi="--enable-libzvbi"
libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv"
@@ -113,11 +109,19 @@ libgme="" ; [ "${GME:-no}" != "no" ] && libgme="--enable-libgme"
libsnappy="" ; [ "${SNAPPY:-no}" != "no" ] && libsnappy="--enable-libsnappy"
libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
libbs2b="" ; [ "${BS2B:-no}" != "no" ] && libbs2b="--enable-libbs2b"
-libebur128="" ; [ "${EBUR128:-no}" != "no" ] && libebur128="--enable-libebur128"
rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ] && rubberband="--enable-librubberband"
tesseract="" ; [ "${TESSERACT:-no}" != "no" ] && tesseract="--enable-libtesseract"
-netcdf="" ; [ "${NETCDF:-no}" != "no" ] && netcdf="--enable-netcdf"
+libjack="" ; [ "${JACK:-no}" != "no" ] && libjack="--enable-libjack"
+libaom="" ; [ "${AOM:-no}" != "no" ] && libaom="--enable-libaom"
+lv2="" ; [ "${LV2:-no}" != "no" ] && lv2="--enable-lv2"
+libdav1d="" ; [ "${DAV1D:-no}" != "no" ] && libdav1d="--enable-libdav1d"
+rabbitmq="" ; [ "${RABBITMQ:-no}" != "no" ] && rabbitmq="--enable-librabbitmq"
+libcodec2="" ; [ "${CODEC2:-no}" != "no" ] && libcodec2="--enable-libcodec2"
+libsoxr="" ; [ "${SOXR:-no}" != "no" ] && libsoxr="--enable-libsoxr"
+libsrt="" ; [ "${SRT:-no}" != "no" ] && libsrt="--enable-libsrt"
+libzimg="" ; [ "${ZIMG:-no}" != "no" ] && libsrt="--enable-libzimg"
chromaprint="" ; [ "${CHROMAPRINT:-no}" != "no" ] && chromaprint="--enable-chromaprint"
+vapoursynth="" ; [ "${VAPOURSYNTH:-no}" != "no" ] && vapoursynth="--enable-vapoursynth"
opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
@@ -127,6 +131,9 @@ ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \
decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \
{ decklink="--enable-decklink" ; \
SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
+vulkan="" ; [ "${VULKAN:-no}" != "no" ] && librsvg="--enable-vulkan"
+libglslang="" ; [ "${GLSLANG:-no}" != "no" ] && libglslang="--enable-libglslang"
+liblensfun="" ; [ "${LENSFUN:-no}" != "no" ] && liblensfun="--enable-liblensfun"
# Default enabled features:
fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ] && fontconfig="--enable-libfontconfig"
@@ -148,7 +155,14 @@ opengl="" ; [ "${OPENGL:-yes}" != "no" ] && opengl="--enable-opengl"
openjpeg="" ; [ "${JP2:-yes}" != "no" ] && openjpeg="--enable-libopenjpeg"
pulse="" ; [ "${PULSEAUDIO:-yes}" != "no" ] && pulse="--enable-libpulse"
samba="" ; [ "${SAMBA:-yes}" != "no" ] && samba="--enable-libsmbclient"
-wavpack="" ; [ "${WAVPACK:-yes}" != "no" ] && wavpack="--enable-libwavpack"
+libfrei0r="" ; [ "${FREI0R:-yes}" != "no" ] && libfrei0r="--enable-frei0r"
+libspeex="" ; [ "${SPEEX:-yes}" != "no" ] && libspeex="--enable-libspeex"
+libopenal="" ; [ "${OPENAL:-yes}" != "no" ] && libopenal="--enable-openal"
+libopus="" ; [ "${OPUS:-yes}" != "no" ] && libopus="--enable-libopus"
+libvidstab="" ; [ "${VIDSTAB:-yes}" != "no" ] && libvidstab="--enable-libvidstab"
+libxml2="" ; [ "${LIBXML2:-yes}" != "no" ] && libxml2="--enable-libxml2"
+librsvg="" ; [ "${LIBRSVG:-yes}" != "no" ] && librsvg="--enable-librsvg"
+libdrm="" ; [ "${LIBDRM:-yes}" != "no" ] && libdrm="--enable-libdrm"
# No default patent encumbered features:
aac="" ; [ "${AAC:-no}" = "no" ] && aac="--disable-encoder=aac"
@@ -203,7 +217,6 @@ CXXFLAGS="$SLKCFLAGS" \
$libcdio \
$libcelt \
$libdc1394 \
- $libebur128 \
$libflite \
$libfrei0r \
$libgme \
@@ -231,7 +244,6 @@ CXXFLAGS="$SLKCFLAGS" \
$libzmq \
$libzvbi \
$mp3lame \
- $netcdf \
$opencl \
$opencore_amr \
$opengl \
@@ -241,7 +253,22 @@ CXXFLAGS="$SLKCFLAGS" \
$samba \
$ssl \
$tesseract \
- $wavpack || exit 1
+ $liblensfun \
+ $libxml2 \
+ $librsvg \
+ $vulkan \
+ $libjack \
+ $libglslang \
+ $libdrm \
+ $libaom \
+ $lv2 \
+ $libdav1d \
+ $rabbitmq \
+ $libcodec2 \
+ $libsoxr \
+ $libsrt \
+ $libzimg \
+ $vapoursynth || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1