From b2c43a2fd4455018cd00c56fd690eef489f951fcb2f555435d529bdc334d0743 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2016 08:23:31 +0000 Subject: [PATCH] Enable avcodec module for Tumbleweed OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=175 --- vlc.changes | 5 +++++ vlc.spec | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/vlc.changes b/vlc.changes index 2ad56c9..d99cc6f 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 8 08:22:56 UTC 2016 - dimstar@opensuse.org + +- Enable avcodec module for openSUSE Tumbleweed. + ------------------------------------------------------------------- Thu Aug 4 18:59:44 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 5f06f19..d8727bc 100644 --- a/vlc.spec +++ b/vlc.spec @@ -374,9 +374,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 \ @@ -419,10 +416,12 @@ export LDFLAGS="-pie" %else --disable-swscale \ %endif +%if 0%{?suse_version} >= 1321 || 0%{?BUILD_ORIG} + --enable-avcodec \ +%andif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ - --enable-avcodec \ --enable-postproc \ --enable-faad \ --enable-a52 \ @@ -430,7 +429,6 @@ export LDFLAGS="-pie" %else --disable-libmpeg2 \ --disable-mad \ - --disable-avcodec \ --disable-postproc \ --disable-faad \ --disable-a52 \ @@ -1122,6 +1120,16 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %endif %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so +%if 0%{?suse_version} >= 1321 +%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so +%{_libdir}/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so +%endif + +%if %{with gstreamer} +%files codec-gstreamer +%defattr(-,root,root) +%{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so +%endif %if %{with gstreamer} %files codec-gstreamer @@ -1136,7 +1144,9 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/plugins/audio_filter/liba52tofloat32_plugin.so %{_libdir}/vlc/plugins/audio_filter/libdtstofloat32_plugin.so %{_libdir}/vlc/plugins/audio_filter/libmpgatofixed32_plugin.so +%if 0%{?suse_version} < 1321 %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so +%endif %{_libdir}/vlc/plugins/codec/libfaad_plugin.so %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so @@ -1156,7 +1166,9 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_libdir}/vlc/libvlc_vdpau.so.0.0.0 %dir %{_libdir}/vlc/plugins/vdpau %{_libdir}/vlc/plugins/vdpau/libvdpau_adjust_plugin.so +%if 0%{?suse_version} < 1321 %{_libdir}/vlc/plugins/vdpau/libvdpau_avcodec_plugin.so +%endif %{_libdir}/vlc/plugins/vdpau/libvdpau_chroma_plugin.so %{_libdir}/vlc/plugins/vdpau/libvdpau_deinterlace_plugin.so %{_libdir}/vlc/plugins/vdpau/libvdpau_display_plugin.so