Accepting request 419788 from multimedia:libs

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/419788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2016-08-18 07:16:10 +00:00 committed by Git OBS Bridge
commit 7e26732018
2 changed files with 21 additions and 16 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org
- BuildConflict pkgconfig(libavutil) >=55: vlc 2.2.x is not yet
compatible with these updates.
-------------------------------------------------------------------
Tue Aug 9 11:14:19 UTC 2016 - dimstar@opensuse.org
- Enable avcodec on openSUSE since ffmpeg had been in the distro
since Leap 42.1.
-------------------------------------------------------------------
Thu Aug 4 18:59:44 UTC 2016 - dimstar@opensuse.org

View File

@ -126,6 +126,7 @@ BuildRequires: update-desktop-files
BuildRequires: vcdimager-devel
BuildRequires: xosd-devel
BuildRequires: xz
BuildConflicts: pkgconfig(libavutil) >= 55
Requires: %{name}-noX = %{version}-%{release}
# We need the noX package first, as it contains vlc-cache-gen
PreReq: %{name}-noX
@ -195,11 +196,9 @@ BuildRequires: libkde4-devel
%if 0%{?suse_version} >= 1320
BuildRequires: pkgconfig(ncursesw)
%endif
%if 0%{?suse_version} >= 1321
BuildRequires: pkgconfig(libavcodec) >= 55.26.0
BuildRequires: pkgconfig(libavformat) >= 53.21.0
BuildRequires: pkgconfig(libavutil) >= 52.4.0
%endif
# Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons.
%if 0%{?BUILD_ORIG}
BuildRequires: faad2-devel
@ -374,9 +373,6 @@ export LDFLAGS="-pie"
--disable-dependency-tracking \
--enable-aa \
--enable-alsa \
%if ! 0%{?BUILD_ORIG}
--disable-avcodec \
%endif
--enable-dvbpsi \
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
--enable-dvdnav \
@ -422,7 +418,6 @@ export LDFLAGS="-pie"
%if 0%{?BUILD_ORIG}
--enable-libmpeg2 \
--enable-mad \
--enable-avcodec \
--enable-postproc \
--enable-faad \
--enable-a52 \
@ -430,12 +425,12 @@ export LDFLAGS="-pie"
%else
--disable-libmpeg2 \
--disable-mad \
--disable-avcodec \
--disable-postproc \
--disable-faad \
--disable-a52 \
--disable-dca \
%endif
--enable-avcodec \
--enable-lirc \
--enable-live555 \
--enable-lua \
@ -724,6 +719,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%endif
%{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
%{_libdir}/vlc/plugins/access/libattachment_plugin.so
%{_libdir}/vlc/plugins/access/libavio_plugin.so
%{_libdir}/vlc/plugins/access/libcdda_plugin.so
%{_libdir}/vlc/plugins/access/libdtv_plugin.so
%{_libdir}/vlc/plugins/access/libdvb_plugin.so
@ -818,6 +814,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
%{_libdir}/vlc/plugins/codec/libaes3_plugin.so
%{_libdir}/vlc/plugins/codec/libaraw_plugin.so
%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
%{_libdir}/vlc/plugins/codec/libcc_plugin.so
%{_libdir}/vlc/plugins/codec/libcdg_plugin.so
%{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
@ -861,6 +858,10 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%{_libdir}/vlc/plugins/codec/libtelx_plugin.so
%{_libdir}/vlc/plugins/codec/libtheora_plugin.so
%{_libdir}/vlc/plugins/codec/libuleaddvaudio_plugin.so
%if 0%{?suse_version} > 1140
%{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
%endif
%{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so
%{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
%if 0%{?suse_version} > 1110
%{_libdir}/vlc/plugins/codec/libxwd_plugin.so
@ -883,6 +884,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%{_libdir}/vlc/plugins/demux/libaiff_plugin.so
%{_libdir}/vlc/plugins/demux/libasf_plugin.so
%{_libdir}/vlc/plugins/demux/libau_plugin.so
%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
%{_libdir}/vlc/plugins/demux/libavi_plugin.so
%{_libdir}/vlc/plugins/demux/libcaf_plugin.so
%{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so
@ -962,9 +964,7 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
%if 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
%endif
%{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
@ -1132,21 +1132,14 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%if 0%{?BUILD_ORIG}
%files codecs
%defattr(-,root,root)
%{_libdir}/vlc/plugins/access/libavio_plugin.so
%{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so
%{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so
%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
%{_libdir}/vlc/plugins/codec/libfaad_plugin.so
%{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
%{_libdir}/vlc/plugins/codec/libtwolame_plugin.so
%{_libdir}/vlc/plugins/codec/libx264_plugin.so
#{_libdir}/vlc/plugins/codec/libx265_plugin.so
%if 0%{?suse_version} > 1140
%{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
%endif
%{_libdir}/vlc/plugins/codec/libvaapi_x11_plugin.so
%{_libdir}/vlc/plugins/demux/libavformat_plugin.so
%if 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/demux/libhevc_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so