up to 4.2

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6dfd8987bbbec3297a2ed0ee8bb41cb6131b4d6c..05b182285ddf6825c3ee2c304e687fd3a5c7ec23 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,6 +1,5 @@
 # TODO:
 # - libndi_newtek[nonfree, BR: Processing.NDI.Lib.h - probably https://www.newtek.com/ndi/sdk/]
-# - libcodec2 [-lcodec2 codec2/codec2.h]
 # - libdavs2 [pkgconfig(davs2) >= 1.5.115 davs2.h]
 # - libklvanc [-lklvanc libklvanc/vanc.h]
 # - libtensorflow [-ltensorflow tensorflow/c/c_api.h]
@@ -19,6 +18,7 @@
 %bcond_with    nonfree         # unblock non free options of package (currently: cuda_sdk, decklib, fdk_aac, libndi_newtek, npp, openssl, libressl/libtls)
 %bcond_without bs2b            # BS2B audio filter support
 %bcond_without caca            # textual display using libcaca
+%bcond_without codec2          # codec2 support using libcodec2
 %bcond_without chromaprint     # audio fingerprinting with chromaprint
 %bcond_with    cudasdk         # NVIDIA CUDA code using SDK [BR: cuda.h, non-free]
 %bcond_with    decklink        # Blackmagic DeskLink output support (requires nonfree)
@@ -91,8 +91,8 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       4.1.3
-Release:       3.1
+Version:       4.2
+Release:       1
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # GPL: frei0r libcdio libdavs2 rubberband vidstab x264 x265 xavs xavs2 xvid
 # v3 (allows *GPLv3 or Apache-licensed libs): gmp lensfun opencore-amr vmaf vo-*enc rkmpp
@@ -100,7 +100,7 @@ Release:    3.1
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: dcc20dd2682ea01c678b7b8324339d43
+# Source0-md5: fb33a9110251873002869664686b2a3f
 Patch0:                %{name}-omx-libnames.patch
 URL:           http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK >= 10.9.5}
@@ -115,6 +115,7 @@ BuildRequires:      alsa-lib-devel
 BuildRequires: aom-devel >= 1.0.0
 BuildRequires: bzip2-devel
 BuildRequires: celt-devel >= 0.11.0
+%{?with_codec2:BuildRequires:  codec2-devel}
 %{?with_fdk_aac:BuildRequires: fdk-aac-devel}
 %{?with_flite:BuildRequires:   flite-devel >= 1.4}
 BuildRequires: fontconfig-devel
@@ -146,7 +147,7 @@ BuildRequires:      libdc1394-devel >= 2
 BuildRequires: libgsm-devel
 BuildRequires: libiec61883-devel
 BuildRequires: libmodplug-devel
-%{?with_libmysofa:BuildRequires:       libmysofa-devel}
+%{?with_libmysofa:BuildRequires:       libmysofa-devel >= 0.7}
 %{?with_openmpt:BuildRequires: libopenmpt-devel >= 0.2.6557}
 BuildRequires: libraw1394-devel >= 2
 %{?with_librsvg:BuildRequires: librsvg-devel >= 2}
@@ -181,7 +182,7 @@ BuildRequires:      nasm
 %endif
 %endif
 %{?with_ffnvcodec:BuildRequires:       nv-codec-headers >= 8.1.24.2}
-# which package?
+# amrnb,amrwb
 BuildRequires: opencore-amr-devel
 %{?with_opencv:BuildRequires:  opencv-devel >= 2}
 %{?with_openh264:BuildRequires:        openh264-devel >= 1.3}
@@ -263,6 +264,7 @@ Requires:   celt >= 0.11.0
 Requires:      gnutls-libs >= 3.0.20
 %endif
 %{?with_kvazaar:Requires:      kvazaar-libs >= 0.8.1}
+%{?with_libmysofa:Requires:    libmysofa >= 0.7}
 %{?with_openmpt:Requires: libopenmpt >= 0.2.6557}
 Requires:      libtheora >= 1.0-0.beta3
 %if %{with va}
@@ -322,6 +324,7 @@ Requires:   alsa-lib-devel
 Requires:      aom-devel >= 1.0.0
 Requires:      bzip2-devel
 Requires:      celt-devel >= 0.11.0
+%{?with_codec2:Requires:       codec2-devel}
 %{?with_fdk_aac:Requires:      fdk-aac-devel}
 %{?with_flite:Requires:        flite-devel >= 1.4}
 Requires:      fontconfig-devel
@@ -346,7 +349,7 @@ Requires:   libdc1394-devel >= 2
 Requires:      libgsm-devel
 Requires:      libiec61883-devel
 Requires:      libmodplug-devel
-%{?with_libmysofa:Requires:    libmysofa-devel}
+%{?with_libmysofa:Requires:    libmysofa-devel >= 0.7}
 %{?with_openmpt:Requires: libopenmpt-devel >= 0.2.6557}
 Requires:      libraw1394-devel >= 2
 %{?with_librsvg:Requires:      librsvg-devel >= 2}
@@ -553,6 +556,7 @@ EOF
        %{?with_caca:--enable-libcaca} \
        --enable-libcelt \
        --enable-libcdio \
+       %{?with_codec2:--enable-libcodec2} \
        --enable-libdc1394 \
        %{?with_libdrm:--enable-libdrm} \
        %{?with_flite:--enable-libflite} \