From c276dac5859a6325c674167cbc44f93c93da1af4 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Sun, 19 Jan 2020 11:52:29 +0300
Subject: [PATCH] ffmpeg 4.2.2

---
 multimedia/video/ffmpeg/actions.py            |  64 +++++++--
 .../video/ffmpeg/files/libflite-flags.patch   |  11 ++
 multimedia/video/ffmpeg/pspec.xml             | 131 ++++++++++++++++--
 3 files changed, 182 insertions(+), 24 deletions(-)
 create mode 100644 multimedia/video/ffmpeg/files/libflite-flags.patch

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 @@
         <IsA>app:console</IsA>
         <Summary>A command-line tool to record, convert and stream audio and video</Summary>
         <Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
-        <Archive sha1sum="11dcd94a62d6aa62d069dc0dc4af28b72c556044" type="targz">https://ffmpeg.org/releases/ffmpeg-4.2.1.tar.gz</Archive>
+        <Archive sha1sum="77c9724bde4c6e3ef21ab954c0572ac45e61c3e5" type="tarbz2">https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>freetype-devel</Dependency>
-            <Dependency>faac-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+<!--             <Dependency>faac-devel</Dependency> -->
             <Dependency>lame-devel</Dependency>
+            <Dependency>cairo-devel</Dependency>
+            <Dependency>xz-devel</Dependency>
             <Dependency>x264-devel</Dependency>
-            <Dependency>x265-devel</Dependency>
+            <Dependency>x265-devel</Dependency>			
+            <Dependency>xavs-devel</Dependency>
+            <Dependency>xavs2-devel</Dependency>
+            <Dependency>ffnvcodec</Dependency>
+            <Dependency>libbs2b-devel</Dependency>
+            <Dependency>libavc1394-devel</Dependency>
+            <Dependency>libraw1394-devel</Dependency>
+<!-- 			<Dependency>libcrystalhd-devel</Dependency> -->
+            <Dependency>libdrm-devel</Dependency>
+            <Dependency>libmfx-devel</Dependency>
+            <Dependency>dav1d-devel</Dependency>
+            <Dependency>davs2-devel</Dependency>
+            <Dependency>aom-devel</Dependency>
             <Dependency>libva-devel</Dependency>
             <Dependency>libsdl2-devel</Dependency>
             <Dependency>libvpx-devel</Dependency>
             <Dependency>libass-devel</Dependency>
             <Dependency>libopus-devel</Dependency>
+            <Dependency>libilbc-devel</Dependency>
+            <Dependency>codec2-devel</Dependency>
+            <Dependency>libfdk-aac-devel</Dependency>
+            <Dependency>libgme-devel</Dependency>
+            <Dependency>lensfun-devel</Dependency>
+            <Dependency>libiec61883-devel</Dependency>
+            <Dependency>kvazaar-devel</Dependency>
+            <Dependency>libopenmpt-devel</Dependency>
+            <Dependency>librsvg-devel</Dependency>
+            <Dependency>rubberband-devel</Dependency>
+            <Dependency>shine-devel</Dependency>
+            <Dependency>flite-devel</Dependency>
+            <Dependency>libsoxr-devel</Dependency>
+            <Dependency>snappy-devel</Dependency>
+            <Dependency>vid.stab-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>libzimg-devel</Dependency>
+            <Dependency>openal-devel</Dependency>
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>libvdpau-devel</Dependency>
             <Dependency>libtheora-devel</Dependency>
             <Dependency>libvorbis-devel</Dependency>
-            <Dependency>gnutls-devel</Dependency>
+<!--             <Dependency>gnutls-devel</Dependency> -->
             <Dependency>celt-devel</Dependency>
             <Dependency>gsm-devel</Dependency>
             <Dependency>libbluray-devel</Dependency>
@@ -42,23 +75,37 @@
             <Dependency>openjpeg2-devel</Dependency>
             <Dependency>frei0r-plugins-devel</Dependency>
             <Dependency>rtmpdump-devel</Dependency>
-            <Dependency>schroedinger-devel</Dependency>
+<!--             <Dependency>schroedinger-devel</Dependency> -->
             <Dependency>speex-devel</Dependency>
             <Dependency>yasm-devel</Dependency>
             <Dependency>libv4l-devel</Dependency>
             <Dependency>pkgconfig</Dependency>
             <Dependency>libvo-amrwbenc-devel</Dependency>
-            <Dependency>libvo-aacenc-devel</Dependency>
+<!--             <Dependency>libvo-aacenc-devel</Dependency> -->
             <Dependency>xvid-devel</Dependency>
             <Dependency>libdc1394-devel</Dependency>
-            <Dependency>libnut-devel</Dependency>
+<!--             <Dependency>libnut-devel</Dependency> -->
             <Dependency>libcdio-paranoia-devel</Dependency>
             <Dependency>libXv-devel</Dependency>
-            <Dependency>libidn-devel</Dependency>
+            <Dependency>wavpack-devel</Dependency>
+            <Dependency>webp-devel</Dependency>
+            <Dependency>ladspa-sdk-devel</Dependency>
+            <Dependency>libaribb24-devel</Dependency>			
+            <Dependency>jack-audio-connection-kit-devel</Dependency>
+            <Dependency>twolame-devel</Dependency>
+            <Dependency>fribidi-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+             <Dependency>opencl-icd-devel</Dependency>
+            <Dependency>openssl-devel</Dependency>
+            <Dependency>libomxil-bellagio-devel</Dependency>
+            <Dependency>zeromq-devel</Dependency>
+            <Dependency>llvm-clang</Dependency>
+            <Dependency>lld</Dependency>
+<!--             <Dependency>libidn-devel</Dependency> -->
         </BuildDependencies>
         <Patches>
 <!--             <Patch>chromium.patch</Patch> -->
-<!--             <Patch>fs56089.patch</Patch> -->
+            <Patch level="1">libflite-flags.patch</Patch>
         </Patches>
     </Source>
 
@@ -67,7 +114,7 @@
         <RuntimeDependencies>
             <Dependency>gsm</Dependency>
             <Dependency>celt</Dependency>
-            <Dependency>faac</Dependency>
+<!--             <Dependency>faac</Dependency> -->
             <Dependency>lame</Dependency>
             <Dependency>x264</Dependency>
             <Dependency>x265</Dependency>
@@ -77,9 +124,9 @@
             <Dependency>speex</Dependency>
             <Dependency>libva</Dependency>
             <Dependency>libXv</Dependency>
-            <Dependency>gnutls</Dependency>
+<!--             <Dependency>gnutls</Dependency> -->
             <Dependency>libX11</Dependency>
-            <Dependency>libnut</Dependency>
+<!--             <Dependency>libnut</Dependency> -->
             <Dependency>libsdl2</Dependency>
             <Dependency>libv4l</Dependency>
             <Dependency>libvpx</Dependency>
@@ -91,6 +138,43 @@
             <Dependency>freetype</Dependency>
             <Dependency>libvdpau</Dependency>
             <Dependency>openjpeg2</Dependency>
+            <Dependency>xz</Dependency>
+            <Dependency>cairo</Dependency>
+            <Dependency>glib2</Dependency>
+            <Dependency>xavs</Dependency>
+            <Dependency>xavs2</Dependency>
+            <Dependency>libbs2b</Dependency>
+            <Dependency>libavc1394</Dependency>
+            <Dependency>libraw1394</Dependency>
+<!-- 			<Dependency>libcrystalhd</Dependency> -->
+            <Dependency>libdrm</Dependency>
+            <Dependency>libmfx</Dependency>
+            <Dependency>dav1d</Dependency>
+            <Dependency>davs2</Dependency>
+            <Dependency>aom</Dependency>
+            <Dependency>libva</Dependency>
+            <Dependency>libsdl2</Dependency>
+            <Dependency>libvpx</Dependency>
+            <Dependency>libass</Dependency>
+            <Dependency>libopus</Dependency>
+            <Dependency>libilbc</Dependency>
+            <Dependency>codec2</Dependency>
+            <Dependency>libfdk-aac</Dependency>
+            <Dependency>libgme</Dependency>
+            <Dependency>lensfun</Dependency>
+            <Dependency>libiec61883</Dependency>
+            <Dependency>kvazaar</Dependency>
+            <Dependency>libopenmpt</Dependency>
+            <Dependency>librsvg</Dependency>
+            <Dependency>rubberband</Dependency>
+            <Dependency>shine</Dependency>
+            <Dependency>flite</Dependency>
+            <Dependency>libsoxr</Dependency>
+            <Dependency>snappy</Dependency>
+            <Dependency>vid.stab</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>libzimg</Dependency>
+            <Dependency>openal</Dependency>
             <Dependency>rtmpdump</Dependency>
             <Dependency>libbluray</Dependency>
             <Dependency>libdc1394</Dependency>
@@ -100,10 +184,22 @@
             <Dependency>libmodplug</Dependency>
             <Dependency>libvo-aacenc</Dependency>
             <Dependency>opencore-amr</Dependency>
-            <Dependency>schroedinger</Dependency>
+<!--             <Dependency>schroedinger</Dependency> -->
             <Dependency>libvo-amrwbenc</Dependency>
             <Dependency>pulseaudio-libs</Dependency>
-            <Dependency>libcdio-paranoia</Dependency>
+            <Dependency>libcdio-paranoia</Dependency>			
+            <Dependency>wavpack</Dependency>
+            <Dependency>webp</Dependency>
+            <Dependency>ladspa-sdk</Dependency>
+            <Dependency>libaribb24</Dependency>
+            <Dependency>jack-audio-connection-kit</Dependency>
+            <Dependency>twolame</Dependency>
+            <Dependency>fribidi</Dependency>
+            <Dependency>libxml2</Dependency>
+            <Dependency>opencl-icd</Dependency>
+            <Dependency>openssl</Dependency>
+            <Dependency>libomxil-bellagio</Dependency>			
+            <Dependency>zeromq</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -129,6 +225,13 @@
 
 
     <History>
+        <Update release="16">
+            <Date>2020-01-14</Date>
+            <Version>4.2.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="15">
             <Date>2019-10-14</Date>
             <Version>4.2.1</Version>