forked from jengelh/ffmpeg-5
Accepting request 961334 from home:iznogood:branches:multimedia:libs
Yes, this does not build on i586 for 15.3, but I think we can live with that as ffmpeg-5 will never be the "main" ffmpeg on 15.3, in fact I doubt it will even reach it at all. - Drop pkgconfig(celt) BuildRequires and stop passing --enable-libcelt to configure and drop celt from enable_decoders, abandoned upstream for opus. - Drop pkgconfig(libv4l2) BuildRequires and stop passing --enable-libv4l2 to configure, only needed very old devices and may cause problems for others for those needing it, use LD_PRELOAD pointing on libv4l2. - Drop pkgconfig(librtmp) BuildRequires and stop passing conditional --enable-librtmp to configure, built-in RTMP support is better, and has listen mode. - Drop bcond conditionals for cuda_sdk, libaom, srt, lv2, soxr, zmq, zimg and openmpt, build unconditionally for all supported versions of openSUSE. - Drop pkgconfig(enca) BuildRequires: Seems unused. OBS-URL: https://build.opensuse.org/request/show/961334 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=11
This commit is contained in:
Git OBS Bridge
parent
03d7b82502
commit
003a83005a
@ -18,7 +18,6 @@ huffyuv # trivial+zlib
|
||||
ilbc # ilbc
|
||||
libaom # libaom
|
||||
libaom_av1 # libaom
|
||||
libcelt # celt, opus
|
||||
libcodec2 # codec2
|
||||
libdav1d # av1
|
||||
libgsm # libgsm
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 10 13:37:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Drop pkgconfig(celt) BuildRequires and stop passing
|
||||
--enable-libcelt to configure and drop celt from enable_decoders,
|
||||
abandoned upstream for opus.
|
||||
- Drop pkgconfig(libv4l2) BuildRequires and stop passing
|
||||
--enable-libv4l2 to configure, only needed very old devices and
|
||||
may cause problems for others for those needing it, use
|
||||
LD_PRELOAD pointing on libv4l2.
|
||||
- Drop pkgconfig(librtmp) BuildRequires and stop passing
|
||||
conditional --enable-librtmp to configure, built-in RTMP support
|
||||
is better, and has listen mode.
|
||||
- Drop bcond conditionals for cuda_sdk, libaom, srt, lv2, soxr,
|
||||
zmq, zimg and openmpt, build unconditionally for all supported
|
||||
versions of openSUSE.
|
||||
- Drop pkgconfig(enca) BuildRequires: Seems unused.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 19 13:26:41 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
|
||||
|
||||
|
||||
@ -37,14 +37,8 @@
|
||||
%preamble_string ffmpeg-private-devel %comparator %conflicts_version \
|
||||
%nil
|
||||
|
||||
%if 0%{?BUILD_ORIG}
|
||||
%bcond_with amrwb
|
||||
%bcond_without cuda_sdk
|
||||
%else
|
||||
%bcond_with cuda_sdk
|
||||
%endif
|
||||
%bcond_with fdk_aac_dlopen
|
||||
%bcond_with librtmp
|
||||
%bcond_with opencore
|
||||
%bcond_with smbclient
|
||||
%bcond_with x264
|
||||
@ -52,42 +46,23 @@
|
||||
%bcond_with xvid
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without libaom
|
||||
%bcond_without mysofa
|
||||
%bcond_without vidstab
|
||||
%bcond_without srt
|
||||
%bcond_without codec2
|
||||
%bcond_without lv2
|
||||
%bcond_without librav1e
|
||||
%bcond_without rubberband
|
||||
%bcond_without soxr
|
||||
%bcond_without zmq
|
||||
%bcond_without vulkan
|
||||
%else
|
||||
%bcond_with libaom
|
||||
%bcond_with mysofa
|
||||
%bcond_with vidstab
|
||||
%bcond_with srt
|
||||
%bcond_with codec2
|
||||
%bcond_with lv2
|
||||
%bcond_with librav1e
|
||||
%bcond_with rubberband
|
||||
%bcond_with soxr
|
||||
%bcond_with zmq
|
||||
%bcond_with vulkan
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1500
|
||||
%bcond_without zimg
|
||||
%bcond_without openmpt
|
||||
%else
|
||||
%bcond_with zimg
|
||||
%bcond_with openmpt
|
||||
%endif
|
||||
|
||||
%define _name ffmpeg
|
||||
%define _major_version 5
|
||||
%define _major_expected 6
|
||||
|
||||
Name: ffmpeg-5
|
||||
Version: 5.0
|
||||
Release: 0
|
||||
@ -107,6 +82,7 @@ Source6: ffmpeg-dlopen-headers.tar.xz
|
||||
Source92: ffmpeg_get_dlopen_headers.sh
|
||||
Source98: http://ffmpeg.org/ffmpeg-devel.asc#/ffmpeg-5.keyring
|
||||
Source99: baselibs.conf
|
||||
|
||||
Patch1: ffmpeg-arm6l.diff
|
||||
Patch2: ffmpeg-new-coder-errors.diff
|
||||
Patch3: ffmpeg-codec-choice.diff
|
||||
@ -116,6 +92,7 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch
|
||||
Patch10: ffmpeg-chromium.patch
|
||||
Patch11: ffmpeg-openh264-averr-on-bad-version.patch
|
||||
Patch91: ffmpeg-dlopen-openh264.patch
|
||||
|
||||
BuildRequires: ladspa-devel
|
||||
BuildRequires: libgsm-devel
|
||||
BuildRequires: libmp3lame-devel
|
||||
@ -130,18 +107,15 @@ BuildRequires: pkgconfig(SvtAv1Enc) >= 0.8.4
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
%if %{with libaom}
|
||||
BuildRequires: pkgconfig(aom)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(celt) >= 0.11.0
|
||||
%if %{with codec2}
|
||||
BuildRequires: pkgconfig(codec2)
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
|
||||
BuildRequires: pkgconfig(dav1d)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(enca)
|
||||
BuildRequires: pkgconfig(ffnvcodec)
|
||||
BuildRequires: pkgconfig(fontconfig) >= 2.4.2
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
BuildRequires: pkgconfig(fribidi) >= 0.19.0
|
||||
@ -156,29 +130,22 @@ BuildRequires: pkgconfig(libdc1394-2)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(libgme)
|
||||
BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
|
||||
%if %{with openmpt}
|
||||
BuildRequires: pkgconfig(libopenmpt)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libpng)
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libraw1394)
|
||||
BuildRequires: pkgconfig(libssh)
|
||||
BuildRequires: pkgconfig(libv4l2)
|
||||
BuildRequires: pkgconfig(libva) >= 0.35.0
|
||||
BuildRequires: pkgconfig(libva-drm)
|
||||
BuildRequires: pkgconfig(libva-x11)
|
||||
BuildRequires: pkgconfig(libvmaf) >= 1.3.9
|
||||
BuildRequires: pkgconfig(libwebp) >= 0.4
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
%if %{with zmq}
|
||||
BuildRequires: pkgconfig(libzmq)
|
||||
%endif
|
||||
%if %{with lv2}
|
||||
BuildRequires: pkgconfig(lilv-0)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(ogg)
|
||||
BuildRequires: pkgconfig(opus)
|
||||
%if %{with librav1e}
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
|
||||
BuildRequires: pkgconfig(rav1e)
|
||||
%endif
|
||||
%if %{with rubberband}
|
||||
@ -188,13 +155,9 @@ BuildRequires: pkgconfig(sdl2)
|
||||
%if %{with smbclient}
|
||||
BuildRequires: pkgconfig(smbclient)
|
||||
%endif
|
||||
%if %{with soxr}
|
||||
BuildRequires: pkgconfig(soxr)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(speex)
|
||||
%if %{with srt}
|
||||
BuildRequires: pkgconfig(srt)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(theora) >= 1.1
|
||||
BuildRequires: pkgconfig(twolame)
|
||||
BuildRequires: pkgconfig(vdpau)
|
||||
@ -220,18 +183,12 @@ BuildRequires: pkgconfig(xfixes)
|
||||
BuildRequires: pkgconfig(libmfx)
|
||||
%endif
|
||||
%endif
|
||||
%if %{with zimg}
|
||||
BuildRequires: pkgconfig(zimg)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28
|
||||
%if %{with fdk_aac_dlopen}
|
||||
BuildRequires: pkgconfig(fdk-aac)
|
||||
%endif
|
||||
%if %{with librtmp}
|
||||
BuildRequires: pkgconfig(librtmp)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(ffnvcodec)
|
||||
%if %{with xvid}
|
||||
BuildRequires: libxvidcore-devel
|
||||
%endif
|
||||
@ -587,16 +544,10 @@ LDFLAGS="%_lto_cflags" \
|
||||
%if %{with vulkan}
|
||||
--enable-libshaderc --enable-vulkan \
|
||||
%endif
|
||||
%if ! %{with cuda_sdk}
|
||||
--disable-cuda-sdk \
|
||||
%endif
|
||||
%if %{with libaom}
|
||||
--enable-libaom \
|
||||
%endif
|
||||
--enable-libass \
|
||||
--enable-libbluray \
|
||||
--enable-libbs2b \
|
||||
--enable-libcelt \
|
||||
--enable-libcdio \
|
||||
%if %{with codec2}
|
||||
--enable-libcodec2 \
|
||||
@ -616,13 +567,11 @@ LDFLAGS="%_lto_cflags" \
|
||||
--enable-libmysofa \
|
||||
%endif
|
||||
--enable-libopenjpeg \
|
||||
%if %{with openmpt}
|
||||
--enable-libopenmpt \
|
||||
%endif
|
||||
--enable-libopenh264-dlopen \
|
||||
--enable-libopus \
|
||||
--enable-libpulse \
|
||||
%if %{with librav1e}
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
|
||||
--enable-librav1e \
|
||||
%endif
|
||||
%if %{with rubberband}
|
||||
@ -633,14 +582,10 @@ LDFLAGS="%_lto_cflags" \
|
||||
--enable-libsvtav1 \
|
||||
%endif
|
||||
%endif
|
||||
%if %{with soxr}
|
||||
--enable-libsoxr \
|
||||
%endif
|
||||
--enable-libspeex \
|
||||
--enable-libssh \
|
||||
%if %{with srt}
|
||||
--enable-libsrt \
|
||||
%endif
|
||||
--enable-libtheora \
|
||||
--enable-libtwolame \
|
||||
%if %{with vidstab}
|
||||
@ -648,26 +593,19 @@ LDFLAGS="%_lto_cflags" \
|
||||
%endif
|
||||
--enable-libvmaf \
|
||||
--enable-libvorbis \
|
||||
--enable-libv4l2 \
|
||||
--enable-libvpx \
|
||||
--enable-libwebp \
|
||||
--enable-libxml2 \
|
||||
%if %{with zimg}
|
||||
--enable-libzimg \
|
||||
%endif
|
||||
%if %{with zmq}
|
||||
--enable-libzmq \
|
||||
%endif
|
||||
--enable-libzvbi \
|
||||
%if 0%{?suse_version} > 1500
|
||||
%ifarch %ix86
|
||||
%else
|
||||
--enable-lto \
|
||||
--enable-lto \
|
||||
%endif
|
||||
%endif
|
||||
%if %{with lv2}
|
||||
--enable-lv2 \
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
|
||||
%ifarch x86_64
|
||||
--enable-libmfx \
|
||||
@ -693,9 +631,6 @@ LDFLAGS="%_lto_cflags" \
|
||||
%if %{with x265}
|
||||
--enable-libx265 \
|
||||
%endif
|
||||
%if %{with librtmp}
|
||||
--enable-librtmp \
|
||||
%endif
|
||||
%if %{with xvid}
|
||||
--enable-libxvid \
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user