Revert "Update ffmpeg to 8.0 (#6382) (#6383)" (#6386) (#6387)

This commit is contained in:
Raboneko
2025-09-09 21:37:21 -07:00
committed by GitHub
parent efe89ecb49
commit 54a2ef4f05
4 changed files with 2033 additions and 116 deletions
File diff suppressed because it is too large Load Diff
+35 -43
View File
@@ -1,8 +1,7 @@
diff --git a/configure b/configure
index 727c3daea8..1da8f40bff 100755
--- a/configure
+++ b/configure
@@ -278,6 +278,7 @@ External library support:
diff -Naur ffmpeg-7.1.1.old/configure ffmpeg-7.1.1/configure
--- ffmpeg-7.1.1.old/configure 2025-03-24 10:54:38.202757211 +0100
+++ ffmpeg-7.1.1/configure 2025-03-24 10:54:38.618546808 +0100
@@ -278,6 +278,7 @@
--enable-libsrt enable Haivision SRT protocol via libsrt [no]
--enable-libssh enable SFTP protocol via libssh [no]
--enable-libsvtav1 enable AV1 encoding via SVT [no]
@@ -10,7 +9,7 @@ index 727c3daea8..1da8f40bff 100755
--enable-libtensorflow enable TensorFlow as a DNN module backend
for DNN based filters like sr [no]
--enable-libtesseract enable Tesseract, needed for ocr filter [no]
@@ -1973,6 +1974,7 @@ EXTERNAL_LIBRARY_LIST="
@@ -1953,6 +1954,7 @@
libshaderc
libshine
libsmbclient
@@ -18,7 +17,7 @@ index 727c3daea8..1da8f40bff 100755
libsnappy
libsoxr
libspeex
@@ -3658,6 +3660,7 @@ libvpx_vp8_decoder_deps="libvpx"
@@ -3575,6 +3577,7 @@
libvpx_vp8_encoder_deps="libvpx"
libvpx_vp9_decoder_deps="libvpx"
libvpx_vp9_encoder_deps="libvpx"
@@ -26,31 +25,18 @@ index 727c3daea8..1da8f40bff 100755
libvvenc_encoder_deps="libvvenc"
libwebp_encoder_deps="libwebp"
libwebp_anim_encoder_deps="libwebp"
@@ -7160,6 +7163,7 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame
die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
enabled libuavs3d && require_pkg_config libuavs3d "uavs3d >= 1.1.41" uavs3d.h uavs3d_decode
enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl
@@ -6997,6 +7000,7 @@
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
enabled libsvtav1 && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
+enabled libsvtvp9 && require_pkg_config libsvtvp9 SvtVp9Enc EbSvtVp9Enc.h eb_vp9_svt_init_handle
enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 2.0.0" libvmaf.h vmaf_init
enabled libvmaf && check_pkg_config libvmaf_cuda "libvmaf >= 2.0.0" libvmaf_cuda.h vmaf_cuda_state_init
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 83ef92963a..d63ec14d84 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1191,6 +1191,7 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o \
vorbis_data.o
+OBJS-$(CONFIG_LIBSVT_VP9_ENCODER) += libsvt_vp9.o
OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o
OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o
OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index f5ec2e01e8..11928d7afa 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -809,6 +809,7 @@ extern const FFCodec ff_libuavs3d_decoder;
enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
diff -Naur ffmpeg-7.1.1.old/libavcodec/allcodecs.c ffmpeg-7.1.1/libavcodec/allcodecs.c
--- ffmpeg-7.1.1.old/libavcodec/allcodecs.c 2025-03-24 10:54:38.119756212 +0100
+++ ffmpeg-7.1.1/libavcodec/allcodecs.c 2025-03-24 10:54:38.619934060 +0100
@@ -796,6 +796,7 @@
extern const FFCodec ff_libvo_amrwbenc_encoder;
extern const FFCodec ff_libvorbis_encoder;
extern const FFCodec ff_libvorbis_decoder;
@@ -58,11 +44,9 @@ index f5ec2e01e8..11928d7afa 100644
extern const FFCodec ff_libvpx_vp8_encoder;
extern const FFCodec ff_libvpx_vp8_decoder;
extern FFCodec ff_libvpx_vp9_encoder;
diff --git a/libavcodec/libsvt_vp9.c b/libavcodec/libsvt_vp9.c
new file mode 100644
index 0000000000..90ed5cbff2
--- /dev/null
+++ b/libavcodec/libsvt_vp9.c
diff -Naur ffmpeg-7.1.1.old/libavcodec/libsvt_vp9.c ffmpeg-7.1.1/libavcodec/libsvt_vp9.c
--- ffmpeg-7.1.1.old/libavcodec/libsvt_vp9.c 1970-01-01 01:00:00.000000000 +0100
+++ ffmpeg-7.1.1/libavcodec/libsvt_vp9.c 2025-03-24 10:54:38.620176868 +0100
@@ -0,0 +1,701 @@
+/*
+* Scalable Video Technology for VP9 encoder library plugin
@@ -276,11 +260,11 @@ index 0000000000..90ed5cbff2
+ param->intra_period = avctx->gop_size - 1;
+
+ if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
+ param->frame_rate_numerator = avctx->framerate.num;
+ param->frame_rate_denominator = avctx->framerate.den;
+ param->frame_rate_numerator = avctx->framerate.num;
+ param->frame_rate_denominator = avctx->framerate.den * avctx->ticks_per_frame;
+ } else {
+ param->frame_rate_numerator = avctx->time_base.den;
+ param->frame_rate_denominator = avctx->time_base.num;
+ param->frame_rate_numerator = avctx->time_base.den;
+ param->frame_rate_denominator = avctx->time_base.num * avctx->ticks_per_frame;
+ }
+
+ if (param->rate_control_mode) {
@@ -765,6 +749,14 @@ index 0000000000..90ed5cbff2
+ .defaults = eb_enc_defaults,
+ .p.wrapper_name = "libsvt_vp9",
+};
--
2.50.1
diff -Naur ffmpeg-7.1.1.old/libavcodec/Makefile ffmpeg-7.1.1/libavcodec/Makefile
--- ffmpeg-7.1.1.old/libavcodec/Makefile 2025-03-24 10:54:37.935753999 +0100
+++ ffmpeg-7.1.1/libavcodec/Makefile 2025-03-24 10:54:38.620394147 +0100
@@ -1157,6 +1157,7 @@
OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o \
vorbis_data.o
+OBJS-$(CONFIG_LIBSVT_VP9_ENCODER) += libsvt_vp9.o
OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o
OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o
OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
+92 -72
View File
@@ -1,17 +1,18 @@
%global _lto_cflags %{nil}
%global avcodec_soversion 62
%global avdevice_soversion 62
%global avfilter_soversion 11
%global avformat_soversion 62
%global avutil_soversion 60
%global swresample_soversion 6
%global swscale_soversion 9
%global avcodec_soversion 61
%global avdevice_soversion 61
%global avfilter_soversion 10
%global avformat_soversion 61
%global avutil_soversion 59
%global postproc_soversion 58
%global swresample_soversion 5
%global swscale_soversion 8
Summary: A complete solution to record, convert and stream audio and video
Name: ffmpeg
Version: 8.0
Release: 1%?dist
Version: 7.1.1
Release: 16%?dist
License: LGPLv3+
URL: http://%{name}.org/
Epoch: 1
@@ -20,13 +21,15 @@ Source0: http://%{name}.org/releases/%{name}-%{version}.tar.xz
# https://github.com/OpenVisualCloud/SVT-VP9/tree/master/ffmpeg_plugin
Patch0: %{name}-svt-vp9.patch
# https://github.com/HandBrake/HandBrake/tree/e117cfe7fca37abeec59ea4201e5d93ed7477746
Patch2: %{name}-HandBrake.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2240127
# Reference: https://crbug.com/1306560
Patch3: %{name}-chromium.patch
# Support LCEVCdec 4.0+:
Patch5: https://aur.archlinux.org/cgit/aur.git/plain/080-ffmpeg-lcevcdec4.0.0-fix.patch?h=ffmpeg-full#/%{name}-LCEVCdec-4.patch
BuildRequires: AMF-devel
BuildRequires: AMF-devel >= 1.4.28
BuildRequires: bzip2-devel
BuildRequires: codec2-devel
BuildRequires: doxygen
@@ -34,9 +37,8 @@ BuildRequires: frei0r-devel
BuildRequires: gmp-devel
BuildRequires: gsm-devel
BuildRequires: ilbc-devel
BuildRequires: lame-devel
BuildRequires: lame-devel >= 3.98.3
BuildRequires: ladspa-devel
BuildRequires: LCEVCdec-devel >= 4.0.0
BuildRequires: libavc1394-devel
BuildRequires: libchromaprint-devel
BuildRequires: libgcrypt-devel
@@ -55,18 +57,18 @@ BuildRequires: snappy-devel
BuildRequires: soxr-devel
BuildRequires: subversion
BuildRequires: texinfo
BuildRequires: twolame-devel
BuildRequires: twolame-devel >= 0.3.10
BuildRequires: vo-amrwbenc-devel
BuildRequires: xvidcore-devel
BuildRequires: xz-devel
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(aom)
BuildRequires: pkgconfig(aribb24)
BuildRequires: pkgconfig(aom) >= 1.0.0
BuildRequires: pkgconfig(aribb24) >= 1.0.3
BuildRequires: pkgconfig(caca)
BuildRequires: pkgconfig(dav1d)
BuildRequires: pkgconfig(davs2)
BuildRequires: pkgconfig(dvdnav)
BuildRequires: pkgconfig(dav1d) >= 0.5.0
BuildRequires: pkgconfig(davs2) >= 1.6.0
BuildRequires: pkgconfig(dvdnav) >= 6.1.1
BuildRequires: pkgconfig(fdk-aac)
BuildRequires: pkgconfig(ffnvcodec) >= 12.0.16.0
BuildRequires: pkgconfig(fontconfig)
@@ -74,42 +76,43 @@ BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(fribidi)
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(kvazaar)
BuildRequires: pkgconfig(lc3)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libaribcaption)
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(kvazaar) >= 0.8.1
BuildRequires: pkgconfig(lc3) >= 1.1.0
BuildRequires: pkgconfig(lcms2) >= 2.13
BuildRequires: pkgconfig(lcevc_dec) >= 2.0.0
BuildRequires: pkgconfig(libaribcaption) >= 1.1.1
BuildRequires: pkgconfig(libass) >= 0.11.0
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libbs2b)
BuildRequires: pkgconfig(libcdio_paranoia)
BuildRequires: pkgconfig(libdc1394-2)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libgme)
BuildRequires: pkgconfig(libjxl)
#BuildRequires: pkgconfig(lensfun)
BuildRequires: pkgconfig(libjxl) >= 0.7.0
#BuildRequires: pkgconfig(lensfun) > 0.3.95
BuildRequires: pkgconfig(libmodplug)
BuildRequires: pkgconfig(libmysofa)
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libopenmpt)
#BuildRequires: pkgconfig(libplacebo) >= 7.351.0
BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
BuildRequires: pkgconfig(libopenmpt) >= 0.2.6557
BuildRequires: pkgconfig(libplacebo) >= 4.192.0
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libqrencode)
#BuildRequires: pkgconfig(libquirc)
BuildRequires: pkgconfig(librabbitmq)
BuildRequires: pkgconfig(librist)
BuildRequires: pkgconfig(librabbitmq) >= 0.7.1
BuildRequires: pkgconfig(librist) >= 0.2.7
BuildRequires: pkgconfig(librtmp)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libssh)
BuildRequires: pkgconfig(libtcmalloc)
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(libva) >= 0.35.0
BuildRequires: pkgconfig(libva-drm)
BuildRequires: pkgconfig(libva-x11)
BuildRequires: pkgconfig(libv4l2)
BuildRequires: pkgconfig(libvvenc)
BuildRequires: pkgconfig(libvvenc) >= 1.11.0
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwebpmux)
BuildRequires: pkgconfig(libwebpmux) >= 0.4.0
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libzmq)
BuildRequires: pkgconfig(libzmq) >= 4.2.1
BuildRequires: pkgconfig(lilv-0)
BuildRequires: pkgconfig(lv2)
#BuildRequires: pkgconfig(OpenCL)
@@ -117,24 +120,24 @@ BuildRequires: pkgconfig(lv2)
BuildRequires: pkgconfig(openh264)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(rav1e)
BuildRequires: pkgconfig(rubberband)
BuildRequires: pkgconfig(rav1e) >= 0.4.0
BuildRequires: pkgconfig(rubberband) >= 1.8.1
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(shaderc)
BuildRequires: pkgconfig(shaderc) >= 2019.1
#BuildRequires: pkgconfig(shine)
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(srt)
BuildRequires: pkgconfig(srt) >= 1.3.0
BuildRequires: pkgconfig(tesseract)
BuildRequires: pkgconfig(uavs3d)
BuildRequires: pkgconfig(vapoursynth-script)
BuildRequires: pkgconfig(vidstab)
BuildRequires: pkgconfig(uavs3d) >= 1.1.41
BuildRequires: pkgconfig(vapoursynth-script) >= 42
BuildRequires: pkgconfig(vidstab) >= 0.98
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vorbisenc)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(xavs2)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(vpx) >= 1.4.0
BuildRequires: pkgconfig(vulkan) >= 1.3.277
BuildRequires: pkgconfig(xavs2) >= 1.3.0
BuildRequires: pkgconfig(xcb) >= 1.4
BuildRequires: pkgconfig(xcb-shape)
BuildRequires: pkgconfig(xcb-shm)
BuildRequires: pkgconfig(xcb-xfixes)
@@ -143,9 +146,9 @@ BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x264)
BuildRequires: pkgconfig(x265)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zimg)
BuildRequires: pkgconfig(zimg) >= 2.7.0
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(zvbi-0.2)
BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28
%ifarch x86_64 aarch64
BuildRequires: pkgconfig(ffnvcodec) >= 12.0.16.0
@@ -153,15 +156,14 @@ BuildRequires: pkgconfig(ffnvcodec) >= 12.0.16.0
%ifarch x86_64
BuildRequires: pkgconfig(libmfx)
BuildRequires: pkgconfig(libvmaf)
BuildRequires: pkgconfig(SvtAv1Enc)
BuildRequires: pkgconfig(libvmaf) >= 2.0.0
BuildRequires: pkgconfig(SvtAv1Enc) >= 0.9.0
BuildRequires: pkgconfig(SvtVp9Enc)
BuildRequires: pkgconfig(vpl)
#BuildRequires: pkgconfig(xevd)
#BuildRequires: pkgconfig(xeve)
BuildRequires: pkgconfig(vpl) >= 2.6
#BuildRequires: pkgconfig(xevd) >= 0.4.1
#BuildRequires: pkgconfig(xeve) >= 0.4.3
%endif
Obsoletes: %{name} < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-free < %{epoch}:%{version}-%{release}
Provides: %{name}-free = %{epoch}:%{version}-%{release}
@@ -178,11 +180,9 @@ Requires: libavdevice%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavfilter%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: libpostproc-free < %{epoch}:%{version}-%{release}
Obsoletes: libpostproc < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
%description libs
FFmpeg is a complete and free Internet live audio and video
@@ -195,9 +195,6 @@ This metapackage pulls in all the %{name} libraries.
Summary: Metapackage for %{name} development files
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
Obsoletes: %{name}-free-devel < %{epoch}:%{version}-%{release}
Provides: %{name}-free-devel = %{epoch}:%{version}-%{release}
%description devel
FFmpeg is a complete and free Internet live audio and video broadcasting
@@ -206,7 +203,6 @@ time in many formats. This package contains development files for %{name}.
%package -n libavcodec
Summary: FFmpeg codec library
Obsoletes: libavcodec < %{epoch}:%{version}-%{release}
Obsoletes: libavcodec-free < %{epoch}:%{version}-%{release}
Provides: libavcodec-free = %{epoch}:%{version}-%{release}
@@ -220,7 +216,6 @@ Summary: Development files for FFmpeg's codec library
Requires: libavcodec%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libavcodec-devel < %{epoch}:%{version}-%{release}
Obsoletes: libavcodec-free-devel < %{epoch}:%{version}-%{release}
Provides: libavcodec-free-devel = %{epoch}:%{version}-%{release}
@@ -233,7 +228,6 @@ This subpackage contains the headers for FFmpeg libavcodec.
%package -n libavdevice
Summary: FFMpeg devices muxing/demuxing library
Obsoletes: libavdevice < %{epoch}:%{version}-%{release}
Obsoletes: libavdevice-free < %{epoch}:%{version}-%{release}
Provides: libavdevice-free = %{epoch}:%{version}-%{release}
@@ -250,7 +244,6 @@ Requires: libavfilter-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavformat-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libavdevice-devel < %{epoch}:%{version}-%{release}
Obsoletes: libavdevice-free-devel < %{epoch}:%{version}-%{release}
Provides: libavdevice-free-devel = %{epoch}:%{version}-%{release}
@@ -262,9 +255,9 @@ Summary: FFmpeg audio and video filtering library
Requires: libavcodec%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: libavfilter < %{epoch}:%{version}-%{release}
Obsoletes: libavfilter-free < %{epoch}:%{version}-%{release}
Provides: libavfilter-free = %{epoch}:%{version}-%{release}
@@ -278,10 +271,10 @@ Requires: libavcodec-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavfilter%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavformat-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libpostproc-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswresample-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswscale-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libavfilter-devel < %{epoch}:%{version}-%{release}
Obsoletes: libavfilter-free-devel < %{epoch}:%{version}-%{release}
Provides: libavfilter-free-devel = %{epoch}:%{version}-%{release}
@@ -290,7 +283,6 @@ This subpackage contains the headers for FFmpeg libavfilter.
%package -n libavformat
Summary: FFmpeg's stream format library
Obsoletes: libavformat < %{epoch}:%{version}-%{release}
Obsoletes: libavformat-free < %{epoch}:%{version}-%{release}
Provides: libavformat-free = %{epoch}:%{version}-%{release}
@@ -306,7 +298,6 @@ Requires: libavformat%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswresample-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libavformat-devel < %{epoch}:%{version}-%{release}
Obsoletes: libavformat-free-devel < %{epoch}:%{version}-%{release}
Provides: libavformat-free-devel = %{epoch}:%{version}-%{release}
@@ -315,7 +306,6 @@ This subpackage contains the headers for FFmpeg libavformat.
%package -n libavutil
Summary: FFmpeg's utility library
Obsoletes: libavutil < %{epoch}:%{version}-%{release}
Obsoletes: libavutil-free < %{epoch}:%{version}-%{release}
Provides: libavutil-free = %{epoch}:%{version}-%{release}
@@ -330,17 +320,38 @@ for pixel and sample formats).
Summary: Development files for FFmpeg's utility library
Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libavutil-devel < %{epoch}:%{version}-%{release}
Obsoletes: libavutil-free-devel < %{epoch}:%{version}-%{release}
Provides: libavutil-free-devel = %{epoch}:%{version}-%{release}
%description -n libavutil-devel
This subpackage contains the headers for FFmpeg libavutil.
%package -n libpostproc
Summary: FFmpeg post-processing library
Obsoletes: libpostproc-free < %{epoch}:%{version}-%{release}
Provides: libpostproc-free = %{epoch}:%{version}-%{release}
%description -n libpostproc
A library with video postprocessing filters, such as deblocking and
deringing filters, noise reduction, automatic contrast and brightness
correction, linear/cubic interpolating deinterlacing.
%package -n libpostproc-devel
Summary: Development files for the FFmpeg post-processing library
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libpostproc%{?_isa} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
Obsoletes: libpostproc-free-devel < %{epoch}:%{version}-%{release}
Provides: libpostproc-free-devel = %{epoch}:%{version}-%{release}
%description -n libpostproc-devel
This subpackage contains the headers for FFmpeg libpostproc.
%package -n libswresample
Summary: FFmpeg software resampling library
Requires: libavutil%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: libavresemple < %{epoch}:%{version}-%{release}
Provides: libavresemple = %{epoch}:%{version}-%{release}
Obsoletes: libswresample-free < %{epoch}:%{version}-%{release}
Provides: libswresample-free = %{epoch}:%{version}-%{release}
@@ -353,6 +364,7 @@ Summary: Development files for the FFmpeg software resampling library
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswresample%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: libavresemple-devel < %{epoch}:%{version}-%{release}
Provides: libavresemple-devel = %{epoch}:%{version}-%{release}
Obsoletes: libswresample-free-devel < %{epoch}:%{version}-%{release}
Provides: libswresample-free-devel = %{epoch}:%{version}-%{release}
@@ -361,7 +373,6 @@ This subpackage contains the headers for FFmpeg libswresample.
%package -n libswscale
Summary: FFmpeg image scaling and colorspace/pixel conversion library
Obsoletes: libswscale < %{epoch}:%{version}-%{release}
Obsoletes: libswscale-free < %{epoch}:%{version}-%{release}
Provides: libswscale-free = %{epoch}:%{version}-%{release}
@@ -373,7 +384,6 @@ pixel format conversion operations.
Summary: Development files for FFmpeg's image scaling and colorspace library
Requires: libavutil-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: libswscale%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: libswscale-devel < %{epoch}:%{version}-%{release}
Obsoletes: libswscale-free-devel < %{epoch}:%{version}-%{release}
Provides: libswscale-free-devel = %{epoch}:%{version}-%{release}
@@ -455,7 +465,7 @@ This subpackage contains the headers for FFmpeg libswscale.
--enable-libopenjpeg \
--enable-libopenmpt \
--enable-libopus \
--disable-libplacebo \
--enable-libplacebo \
--enable-libpulse \
--enable-libqrencode \
--disable-libquirc \
@@ -507,6 +517,7 @@ This subpackage contains the headers for FFmpeg libswscale.
--enable-opencl \
--enable-opengl \
--enable-openssl \
--enable-postproc \
--enable-sdl2 \
--enable-shared \
--enable-swresample \
@@ -621,6 +632,15 @@ mv doc/*.html doc/html
%{_libdir}/libavutil.so
%{_mandir}/man3/libavutil.3*
%files -n libpostproc
%license COPYING.GPLv2 LICENSE.md
%{_libdir}/libpostproc.so.%{postproc_soversion}*
%files -n libpostproc-devel
%{_includedir}/libpostproc
%{_libdir}/pkgconfig/libpostproc.pc
%{_libdir}/libpostproc.so
%files -n libswresample
%license COPYING.GPLv2 LICENSE.md
%{_libdir}/libswresample.so.%{swresample_soversion}*
+2 -1
View File
@@ -1,7 +1,8 @@
import "andax/bump_extras.rhai" as bump;
import "andax/spec.rhai" as spec;
rpm.version(find(`<small>ffmpeg-([\d.]+?)\.tar\.xz</small>`, get("https://ffmpeg.org/download.html"), 1));
// rpm.version(find(`<small>ffmpeg-([\d.]+?)\.tar\.xz</small>`, get("https://ffmpeg.org/download.html"), 1));
rpm.version(bump::bodhi("ffmpeg-free", bump::as_bodhi_ver(labels.branch));
open_file("anda/multimedia/ffmpeg/VERSION_x265.txt", "w").write(bump::madoguchi("x265", labels.branch));
open_file("anda/multimedia/ffmpeg/VERSION_tesseract.txt", "w").write(bump::bodhi("tesseract", bump::as_bodhi_ver(labels.branch)));