diff --git a/multimedia/video/ffmpeg/actions.py b/multimedia/video/ffmpeg/actions.py
index baf030734b..e62f4b315b 100644
--- a/multimedia/video/ffmpeg/actions.py
+++ b/multimedia/video/ffmpeg/actions.py
@@ -10,49 +10,93 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
def setup():
- shelltools.system("./configure --prefix=/usr \
+ shelltools.system("./configure --prefix=/usr \
--mandir=/usr/share/man \
--disable-debug \
--disable-static \
--disable-stripping \
+ --enable-version3 \
+ --enable-nonfree \
--enable-avfilter \
--enable-avresample \
- --enable-fontconfig \
- --enable-gnutls \
+ --enable-frei0r \
--enable-gpl \
+ --enable-ladspa \
+ --enable-libaom \
+ --enable-libaribb24 \
--enable-libass \
--enable-libbluray \
+ --enable-libbs2b \
+ --enable-libcelt \
+ --enable-libcdio \
+ --enable-libcodec2 \
+ --enable-libdav1d \
+ --enable-libdavs2 \
+ --enable-libdc1394 \
+ --enable-libfdk-aac \
+ --enable-libflite \
+ --enable-libfontconfig \
--enable-libfreetype \
+ --enable-libfribidi \
+ --enable-libgme \
--enable-libgsm \
+ --enable-libiec61883 \
+ --enable-libilbc \
+ --enable-libjack \
+ --enable-libkvazaar \
+ --enable-liblensfun \
--enable-libmodplug \
--enable-libmp3lame \
--enable-libopencore_amrnb \
--enable-libopencore_amrwb \
--enable-libopenjpeg \
+ --enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
+ --enable-librsvg \
+ --enable-librubberband \
--enable-librtmp \
+ --enable-libshine \
+ --enable-libsnappy \
+ --enable-libsoxr \
--enable-libspeex \
--enable-libtheora \
+ --enable-libtwolame \
+ --enable-libvidstab \
--enable-libv4l2 \
+ --enable-libvo-amrwbenc \
--enable-libvorbis \
--enable-libvpx \
+ --enable-libwavpack \
+ --enable-libwebp \
--enable-libx264 \
--enable-libx265 \
+ --enable-libxavs \
+ --enable-libxavs2 \
+ --enable-libxcb \
--enable-libxvid \
+ --enable-libxml2 \
+ --enable-libzmq \
+ --enable-libzimg \
--enable-pic \
--enable-postproc \
--enable-runtime-cpudetect \
--enable-shared \
--enable-swresample \
--enable-vdpau \
- --enable-version3 \
- --enable-libdc1394 \
- --enable-libcelt \
- --enable-frei0r \
- --enable-libcdio \
- --enable-libvo-amrwbenc \
- --enable-nonfree")
+ --enable-openal \
+ --enable-opencl \
+ --enable-openssl \
+ --enable-libdrm \
+ --enable-libmfx \
+ --enable-nvdec \
+ --enable-nvenc \
+ --enable-vaapi \
+ --enable-vdpau \
+ --enable-omx \
+ --extra-ldflags='-lasound -lm' \
+ --cc='clang -fuse-ld=lld -rtlib=compiler-rt' \
+ --cxx='clang++ -fuse-ld=lld -rtlib=compiler-rt'")
def build():
autotools.make()
diff --git a/multimedia/video/ffmpeg/files/libflite-flags.patch b/multimedia/video/ffmpeg/files/libflite-flags.patch
new file mode 100644
index 0000000000..e6ce722749
--- /dev/null
+++ b/multimedia/video/ffmpeg/files/libflite-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.orig 2020-01-18 19:46:04.694206468 +0300
++++ b/configure 2020-01-18 19:46:21.610206846 +0300
+@@ -6203,7 +6203,7 @@
+ enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
+ { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
+ warn "using libfdk without pkg-config"; } }
+-flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
++flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite -lasound -lm"
+ enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
+ enabled fontconfig && enable libfontconfig
+ enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
diff --git a/multimedia/video/ffmpeg/pspec.xml b/multimedia/video/ffmpeg/pspec.xml
index b120ee7bbc..0e08f8ce44 100644
--- a/multimedia/video/ffmpeg/pspec.xml
+++ b/multimedia/video/ffmpeg/pspec.xml
@@ -15,23 +15,56 @@
app:console
A command-line tool to record, convert and stream audio and video
FFmpeg is a complete solution to record, convert and stream audio and video.
- https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.gz
+ https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2
freetype-devel
- faac-devel
+ fontconfig-devel
+
lame-devel
+ cairo-devel
+ xz-devel
x264-devel
- x265-devel
+ x265-devel
+ xavs-devel
+ xavs2-devel
+ ffnvcodec
+ libbs2b-devel
+ libavc1394-devel
+ libraw1394-devel
+
+ libdrm-devel
+ libmfx-devel
+ dav1d-devel
+ davs2-devel
+ aom-devel
libva-devel
libsdl2-devel
libvpx-devel
libass-devel
libopus-devel
+ libilbc-devel
+ codec2-devel
+ libfdk-aac-devel
+ libgme-devel
+ lensfun-devel
+ libiec61883-devel
+ kvazaar-devel
+ libopenmpt-devel
+ librsvg-devel
+ rubberband-devel
+ shine-devel
+ flite-devel
+ libsoxr-devel
+ snappy-devel
+ vid.stab-devel
+ libxcb-devel
+ libzimg-devel
+ openal-devel
alsa-lib-devel
libvdpau-devel
libtheora-devel
libvorbis-devel
- gnutls-devel
+
celt-devel
gsm-devel
libbluray-devel
@@ -42,23 +75,37 @@
openjpeg2-devel
frei0r-plugins-devel
rtmpdump-devel
- schroedinger-devel
+
speex-devel
yasm-devel
libv4l-devel
pkgconfig
libvo-amrwbenc-devel
- libvo-aacenc-devel
+
xvid-devel
libdc1394-devel
- libnut-devel
+
libcdio-paranoia-devel
libXv-devel
- libidn-devel
+ wavpack-devel
+ webp-devel
+ ladspa-sdk-devel
+ libaribb24-devel
+ jack-audio-connection-kit-devel
+ twolame-devel
+ fribidi-devel
+ libxml2-devel
+ opencl-icd-devel
+ openssl-devel
+ libomxil-bellagio-devel
+ zeromq-devel
+ llvm-clang
+ lld
+
-
+ libflite-flags.patch
@@ -67,7 +114,7 @@
gsm
celt
- faac
+
lame
x264
x265
@@ -77,9 +124,9 @@
speex
libva
libXv
- gnutls
+
libX11
- libnut
+
libsdl2
libv4l
libvpx
@@ -91,6 +138,43 @@
freetype
libvdpau
openjpeg2
+ xz
+ cairo
+ glib2
+ xavs
+ xavs2
+ libbs2b
+ libavc1394
+ libraw1394
+
+ libdrm
+ libmfx
+ dav1d
+ davs2
+ aom
+ libva
+ libsdl2
+ libvpx
+ libass
+ libopus
+ libilbc
+ codec2
+ libfdk-aac
+ libgme
+ lensfun
+ libiec61883
+ kvazaar
+ libopenmpt
+ librsvg
+ rubberband
+ shine
+ flite
+ libsoxr
+ snappy
+ vid.stab
+ libxcb
+ libzimg
+ openal
rtmpdump
libbluray
libdc1394
@@ -100,10 +184,22 @@
libmodplug
libvo-aacenc
opencore-amr
- schroedinger
+
libvo-amrwbenc
pulseaudio-libs
- libcdio-paranoia
+ libcdio-paranoia
+ wavpack
+ webp
+ ladspa-sdk
+ libaribb24
+ jack-audio-connection-kit
+ twolame
+ fribidi
+ libxml2
+ opencl-icd
+ openssl
+ libomxil-bellagio
+ zeromq
/etc
@@ -129,6 +225,13 @@
+
+ 2020-01-14
+ 4.2.2
+ Version bump.
+ Idris Kalp
+ idriskalp@gmail.com
+
2019-10-14
4.2.1