summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Christoph Willing <chris.willing@linux.com>2020-06-24 13:36:08 +1000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2020-06-28 08:17:02 +0700
commite9c02ed2e04f479f82030920ef1f295fc0e7a48d (patch)
tree7838a36207c4aa00d0c60fa5fa6660a26aad2972
parent26ee419c3cde9c31a98ca0855c1ce3cd336337f9 (diff)
downloadslackbuilds-e9c02ed2e04f479f82030920ef1f295fc0e7a48d.tar.gz
slackbuilds-e9c02ed2e04f479f82030920ef1f295fc0e7a48d.tar.xz
multimedia/ffmpeg4: Updated for version 4.3. New maintainer
Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/ffmpeg4/README9
-rw-r--r--multimedia/ffmpeg4/ffmpeg4.SlackBuild14
-rw-r--r--multimedia/ffmpeg4/ffmpeg4.info12
3 files changed, 20 insertions, 15 deletions
diff --git a/multimedia/ffmpeg4/README b/multimedia/ffmpeg4/README
index 9d9c5e4ed1..76b26f3a96 100644
--- a/multimedia/ffmpeg4/README
+++ b/multimedia/ffmpeg4/README
@@ -16,10 +16,10 @@ It can optionally link to a number of extra libraries that are available
on SBo by setting the relevant env vars, which all default to "no":
CHROMAPRINT=yes # requires chromaprint
+ CUDA=yes # requires cudatoolkit & nv-codec-headers
DECKLINK=yes # requires decklink-sdk
FREI0R=yes # requires frei0r
LADSPA=yes # requires ladspa_sdk
- LIBAOM=yes # requires libaom
LIBBLURAY=yes # requires libbluray
LIBBS2B=yes # requires libbs2b
LIBCELT=yes # requires celt
@@ -42,9 +42,6 @@ on SBo by setting the relevant env vars, which all default to "no":
LIBTESSERACT=yes # requires tesseract
LIBTWOLAME=yes # requires twolame
LIBVIDSTAB=yes # requires vid.stab
- LIBWEBP=yes # requires libwebp
- LIBX264=yes # requires x264
- LIBX265=yes # requires x265
LIBXVID=yes # requires xvidcore
LIBZMQ=yes # requires zeromq
LIBZVBI=yes # requires zvbi
@@ -63,6 +60,7 @@ There are a few other libraries available in Slackware that are also
linked to by default, and you can disable them by changing the default
of "yes" to "no" with the following settings:
+ LIBAOM=no
LIBCACA=no
LIBCDIO=no
LIBFONTCONFIG=no
@@ -77,6 +75,9 @@ of "yes" to "no" with the following settings:
LIBVORBIS=no
LIBVPX=no
LIBWAVPACK=no
+ LIBWEBP=no
+ LIBX264=no
+ LIBX265=no
OPENGL=no
To link to this version of the ffmpeg libraries, you'll need to set
diff --git a/multimedia/ffmpeg4/ffmpeg4.SlackBuild b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
index 565dc68ae9..adbbc6a44a 100644
--- a/multimedia/ffmpeg4/ffmpeg4.SlackBuild
+++ b/multimedia/ffmpeg4/ffmpeg4.SlackBuild
@@ -4,6 +4,8 @@
# Copyright 2018 Andreas Guldstrand
# All rights reserved.
+# Copyright (c) 2020 Christoph Willing Brisbane, Australia
+# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
@@ -24,7 +26,7 @@
PRGNAM=ffmpeg4
SRCNAM=ffmpeg
-VERSION=${VERSION:-4.1}
+VERSION=${VERSION:-4.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,11 +71,12 @@ enable() {
# ENV VAR DEFAULT IF YES IF NO
enable "BINS" "no" "" "--disable-programs --disable-manpages"
enable "CHROMAPRINT" "no" "--enable-chromaprint" ""
+enable "CUDA" "no" "--enable-nonfree --enable-cuda-sdk --enable-libnpp" ""
enable "DECKLINK" "no" "--enable-decklink" ""
enable "FREI0R" "no" "--enable-frei0r" ""
enable "GNUTLS" "no" "--enable-gnutls" ""
enable "LADSPA" "no" "--enable-ladspa" ""
-enable "LIBAOM" "no" "--enable-libaom" ""
+enable "LIBAOM" "yes" "--enable-libaom" ""
enable "LIBBLURAY" "no" "--enable-libbluray" ""
enable "LIBBS2B" "no" "--enable-libbs2b" ""
enable "LIBCACA" "yes" "--enable-libcaca" ""
@@ -110,9 +113,9 @@ enable "LIBVIDSTAB" "no" "--enable-libvidstab" ""
enable "LIBVORBIS" "yes" "--enable-libvorbis" ""
enable "LIBVPX" "yes" "--enable-libvpx" ""
enable "LIBWAVPACK" "yes" "--enable-libwavpack" ""
-enable "LIBWEBP" "no" "--enable-libwebp" ""
-enable "LIBX264" "no" "--enable-libx264" ""
-enable "LIBX265" "no" "--enable-libx265" ""
+enable "LIBWEBP" "yes" "--enable-libwebp" ""
+enable "LIBX264" "yes" "--enable-libx264" ""
+enable "LIBX265" "yes" "--enable-libx265" ""
enable "LIBXVID" "no" "--enable-libxvid" ""
enable "LIBZMQ" "no" "--enable-libzmq" ""
enable "LIBZVBI" "no" "--enable-libzvbi" ""
@@ -158,6 +161,7 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-libass \
$enable_BINS \
$enable_CHROMAPRINT \
+ $enable_CUDA \
$enable_DECKLINK \
$enable_FREI0R \
$enable_GNUTLS \
diff --git a/multimedia/ffmpeg4/ffmpeg4.info b/multimedia/ffmpeg4/ffmpeg4.info
index 50c38934da..1a4d21be71 100644
--- a/multimedia/ffmpeg4/ffmpeg4.info
+++ b/multimedia/ffmpeg4/ffmpeg4.info
@@ -1,10 +1,10 @@
PRGNAM="ffmpeg4"
-VERSION="4.1"
+VERSION="4.3"
HOMEPAGE="https://ffmpeg.org/"
-DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2"
-MD5SUM="8107e8f22a33b27a5e34b38e628eecc6"
+DOWNLOAD="https://ffmpeg.org/releases/ffmpeg-4.3.tar.bz2"
+MD5SUM="ed9b3002fb491d704b548a97e1d00391"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="libass"
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+REQUIRES="aom libass libwebp x264 x265"
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"