Bootstrap (riscv64)

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

enable_decoders

@@ -194,6 +194,8 @@ jv
 kgv1
 kmvc
 lagarith
+libaribb24 # aribb24
+libaribcaption # libaribcaption
 libaom # libaom
 libaom_av1 # libaom
 libcodec2 # codec2

ffmpeg.spec

@@ -3,7 +3,7 @@
 %bcond all_codecs 0
 
 # Break dependency cycles by disabling certain optional dependencies.
-%bcond bootstrap 0
+%bcond bootstrap 1
 
 # If you want to do a build with the upstream source tarball, then set the
 # pkg_suffix to %%nil. We can't handle this with a conditional, as srpm
@@ -32,12 +32,16 @@
 %endif
 
 %if 0%{?rhel}
-# Disable dependencies not offered in RHEL/EPEL
-%bcond omxil 0
+# Disable dependencies not available or wanted on RHEL/EPEL
+%bcond chromaprint 0
 %else
+# Break chromaprint dependency cycle (Fedora-only):
+#   ffmpeg (libavcodec-free) → chromaprint → ffmpeg
+%bcond chromaprint %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
+%endif
 
-# Disable some features because RHEL 9 packages are too old
 %if 0%{?rhel} && 0%{?rhel} <= 9
+# Disable some features because RHEL 9 packages are too old
 %bcond flite 0
 %bcond lcms2 0
 %bcond placebo 0
@@ -47,19 +51,6 @@
 %bcond placebo 1
 %endif
 
-%bcond omxil 1
-
-%endif
-
-# Break chromaprint dependency cycle (Fedora-only):
-#   ffmpeg (libavcodec-free) → chromaprint → ffmpeg
-%if %{with bootstrap}
-%bcond chromaprint 0
-%else
-%bcond chromaprint 1
-%endif
-
-
 %if %{with all_codecs}
 %bcond evc 1
 %bcond rtmp 1
@@ -91,7 +82,7 @@ Name:           ffmpeg
 %global pkg_name %{name}%{?pkg_suffix}
 
 Version:        7.0.2
-Release:        1%{?dist}
+Release:        7.0.riscv64%{?dist}
 Summary:        A complete solution to record, convert and stream audio and video
 License:        GPL-3.0-or-later
 URL:            https://ffmpeg.org/
@@ -153,6 +144,7 @@ BuildRequires:  nasm
 BuildRequires:  perl(Pod::Man)
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(aom)
+BuildRequires:  pkgconfig(aribb24) >= 1.0.3
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(caca)
 BuildRequires:  pkgconfig(codec2)
@@ -173,6 +165,7 @@ BuildRequires:  pkgconfig(jack)
 %if %{with lcms2}
 BuildRequires:  pkgconfig(lcms2) >= 2.13
 %endif
+BuildRequires:  pkgconfig(libaribcaption) >= 1.1.1
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libbs2b)
@@ -184,9 +177,6 @@ BuildRequires:  pkgconfig(libchromaprint)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libjxl) >= 0.7.0
 BuildRequires:  pkgconfig(libmodplug)
-%if %{with omxil}
-BuildRequires:  pkgconfig(libomxil-bellagio)
-%endif
 BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(libopenmpt)
 %if %{with placebo}
@@ -216,7 +206,6 @@ BuildRequires:  pkgconfig(openh264)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(rav1e)
 BuildRequires:  pkgconfig(rubberband)
-BuildRequires:  pkgconfig(schroedinger-1.0)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(shaderc) >= 2019.1
 BuildRequires:  pkgconfig(smbclient)
@@ -595,6 +584,8 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
     --enable-vulkan \
     --disable-cuda-sdk \
     --enable-libaom \
+    --enable-libaribb24 \
+    --enable-libaribcaption \
     --enable-libass \
     --enable-libbluray \
     --enable-libbs2b \
@@ -626,6 +617,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/
     --enable-libmodplug \
     --enable-libmp3lame \
     --enable-libmysofa \
+    --enable-libopenh264 \
     --enable-libopenjpeg \
     --enable-libopenmpt \
     --enable-libopus \
@@ -866,6 +858,30 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples
 %{_mandir}/man3/libswscale.3*
 
 %changelog
+* Mon Oct 28 2024 David Abdurachmanov <davidlt@rivosinc.com> - 7.0.2-7.0.riscv64
+- Bootstrap (riscv64)
+
+* Mon Oct 07 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.0.2-7
+- Properly enable aribb24/libaribcaption
+- Disable VANC dependency as it depends on decklink
+
+* Mon Oct 07 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.0.2-6
+- Enable SDI data processing (Kernel Labs VANC) processing
+- Enable Japanese DVD subtitles/teletext (aribb24/libaribcaption)
+
+* Mon Oct 07 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 7.0.2-5
+- Properly enable noopenh264
+
+* Wed Oct 02 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.0.2-4
+- Fix chromaprint bcond
+
+* Wed Sep 25 2024 Michel Lind <salimma@fedoraproject.org> - 7.0.2-3
+- Disable omxil completely, it's now retired
+- Rebuild for tesseract-5.4.1-3 (soversion change from 5.4.1 to just 5.4)
+
+* Fri Sep 20 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.0.2-2
+- Rebuild for newer ffnvcodec
+
 * Fri Sep 06 2024 Neal Gompa <ngompa@fedoraproject.org> - 7.0.2-1
 - Rebase to 7.0.2 (rhbz#2273572)
 - Drop OpenH264 dlopen headers as we use noopenh264 now

ffmpeg_free_sources

@@ -1096,6 +1096,8 @@ libavcodec/lcl.h
 libavcodec/lcldec.c
 libavcodec/lclenc.c
 libavcodec/leb.h
+libavcodec/libaribb24.c
+libavcodec/libaribcaption.c
 libavcodec/libaom.c
 libavcodec/libaom.h
 libavcodec/libaomdec.c

sources

@@ -1,3 +1,3 @@
-SHA512 (ffmpeg-free-7.0.2.tar.xz) = d22419888245c19b96679973b25e20d8bd32068fe998383afbd3d9ced4f8b088e743711138c2d034aa7e09b6d206b785b0a6345ca6af8ab28dc9f776619cc346
+SHA512 (ffmpeg-free-7.0.2.tar.xz) = 062ba768efda367b973250895147efb928f954321ab8a8de395da8b167262cea26cefda186a404e0be9f2080e02f436d2b9c8bf9508cbba0f325a31d697f9a8b
 SHA512 (ffmpeg-7.0.2.tar.xz.asc) = b41eeb8044754bfcf2cf67a3ed4a4e74194ee6e5f4ed5f03aa03bb68772f6bacd7a1839d8e9740573889230a71d3bc7d52b4625542f4c892e8de8c61deda2c51
 SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165