Accepting request 625732 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/625732 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
468760bea8
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Reduce the optional conditional for the SLE12 backports to
|
||||
cover everything, most of the packages in old codestreams were
|
||||
not really ready as they need additional baselibs/etc.
|
||||
* Since these are new features user will simply wait or use TW
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Enable "kmsgrab" input device
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 26 08:09:32 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Redo the nvidia condition based on review feeback
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 25 08:30:56 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Do not condition nvidia based on BUILD_ORIG all the support is in
|
||||
TW only and not on different instances as such safeguard it with
|
||||
version check only bsc#1102532
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Add new bconds to build on SLE12 backports project without
|
||||
requiring extra packages:
|
||||
* %bcond_without codec2
|
||||
* %bcond_without bs2b
|
||||
* %bcond_without lv2
|
||||
* %bcond_without rubberband
|
||||
* %bcond_without soxr
|
||||
* %bcond_without zmq
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 6 10:54:14 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
|
||||
@ -38,10 +38,15 @@
|
||||
%{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \
|
||||
%{nil}
|
||||
|
||||
# nvidia adds library present only after leap15
|
||||
%bcond_with nvcodec
|
||||
%if 0%{?BUILD_ORIG}
|
||||
%bcond_without nvidia
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without nvcodec
|
||||
%endif
|
||||
%else
|
||||
%bcond_with nvidia
|
||||
%bcond_with nvidia
|
||||
%endif
|
||||
%bcond_with fdk_aac
|
||||
%bcond_with librtmp
|
||||
@ -61,10 +66,22 @@
|
||||
%bcond_without mysofa
|
||||
%bcond_without vidstab
|
||||
%bcond_without srt
|
||||
%bcond_without codec2
|
||||
%bcond_without bs2b
|
||||
%bcond_without lv2
|
||||
%bcond_without rubberband
|
||||
%bcond_without soxr
|
||||
%bcond_without zmq
|
||||
%else
|
||||
%bcond_with mysofa
|
||||
%bcond_with vidstab
|
||||
%bcond_with srt
|
||||
%bcond_with codec2
|
||||
%bcond_with bs2b
|
||||
%bcond_with lv2
|
||||
%bcond_with rubberband
|
||||
%bcond_with soxr
|
||||
%bcond_with zmq
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version} >= 1500
|
||||
@ -110,7 +127,9 @@ BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(celt) >= 0.11.0
|
||||
%if %{with codec2}
|
||||
BuildRequires: pkgconfig(codec2)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(enca)
|
||||
BuildRequires: pkgconfig(fontconfig) >= 2.4.2
|
||||
BuildRequires: pkgconfig(freetype2)
|
||||
@ -119,10 +138,13 @@ BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(jack)
|
||||
BuildRequires: pkgconfig(libass)
|
||||
BuildRequires: pkgconfig(libbluray)
|
||||
%if %{with bs2b}
|
||||
BuildRequires: pkgconfig(libbs2b)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(libcdio)
|
||||
BuildRequires: pkgconfig(libcdio_paranoia)
|
||||
BuildRequires: pkgconfig(libdc1394-2)
|
||||
BuildRequires: pkgconfig(libdrm)
|
||||
BuildRequires: pkgconfig(libgme)
|
||||
BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15
|
||||
BuildRequires: pkgconfig(libopenjp2) >= 2.1.0
|
||||
@ -138,13 +160,21 @@ BuildRequires: pkgconfig(libv4l2)
|
||||
BuildRequires: pkgconfig(libva) >= 0.35.0
|
||||
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 rubberband}
|
||||
BuildRequires: pkgconfig(rubberband)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(sdl2)
|
||||
%if %{with soxr}
|
||||
BuildRequires: pkgconfig(soxr)
|
||||
%endif
|
||||
BuildRequires: pkgconfig(speex)
|
||||
%if %{with srt}
|
||||
BuildRequires: pkgconfig(srt)
|
||||
@ -176,7 +206,7 @@ BuildRequires: pkgconfig(fdk-aac)
|
||||
%if %{with librtmp}
|
||||
BuildRequires: pkgconfig(librtmp)
|
||||
%endif
|
||||
%if %{with nvidia}
|
||||
%if %{with nvcodec}
|
||||
BuildRequires: pkgconfig(ffnvcodec)
|
||||
%endif
|
||||
%if %{with xvid}
|
||||
@ -555,8 +585,11 @@ CFLAGS="%optflags" \
|
||||
--enable-libbluray \
|
||||
--enable-libcelt \
|
||||
--enable-libcdio \
|
||||
%if %{with codec2}
|
||||
--enable-libcodec2 \
|
||||
%endif
|
||||
--enable-libdc1394 \
|
||||
--enable-libdrm \
|
||||
--enable-libfontconfig \
|
||||
--enable-libfreetype \
|
||||
--enable-libfribidi \
|
||||
@ -572,8 +605,12 @@ CFLAGS="%optflags" \
|
||||
%endif
|
||||
--enable-libopus \
|
||||
--enable-libpulse \
|
||||
%if %{with rubberband}
|
||||
--enable-librubberband \
|
||||
%endif
|
||||
%if %{with soxr}
|
||||
--enable-libsoxr \
|
||||
%endif
|
||||
--enable-libspeex \
|
||||
--enable-libssh \
|
||||
%if %{with srt}
|
||||
@ -592,9 +629,13 @@ CFLAGS="%optflags" \
|
||||
%if %{with zimg}
|
||||
--enable-libzimg \
|
||||
%endif
|
||||
%if %{with zmq}
|
||||
--enable-libzmq \
|
||||
%endif
|
||||
--enable-libzvbi \
|
||||
%if %{with lv2}
|
||||
--enable-lv2 \
|
||||
%endif
|
||||
--enable-vaapi \
|
||||
--enable-vdpau \
|
||||
%if %{with fdk_aac}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user