From b2c43a2fd4455018cd00c56fd690eef489f951fcb2f555435d529bdc334d0743 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2016 08:23:31 +0000 Subject: [PATCH 1/7] 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 From 571181a8c085a3952684daa3434521ea9550776af473b6e2a1ee19094f66f598 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2016 08:29:04 +0000 Subject: [PATCH 2/7] typo OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=176 --- vlc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.spec b/vlc.spec index d8727bc..5069a51 100644 --- a/vlc.spec +++ b/vlc.spec @@ -418,7 +418,7 @@ export LDFLAGS="-pie" %endif %if 0%{?suse_version} >= 1321 || 0%{?BUILD_ORIG} --enable-avcodec \ -%andif +%endif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ From 95a22e024012c088361c7907516cef178987d763671b6fb13bb40d1c2f0c8c8d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2016 08:59:40 +0000 Subject: [PATCH 3/7] No vdpau in OSS yet OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=177 --- vlc.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/vlc.spec b/vlc.spec index 5069a51..4e4577e 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1122,7 +1122,6 @@ install -Dm0644 %{S:3} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %{_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} @@ -1166,9 +1165,7 @@ 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 From c6ac8929c4ad75e38f8c1f18dd69812b1a25437c9554d92e00df9f02bfb3c0a5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Aug 2016 09:16:33 +0000 Subject: [PATCH 4/7] Accepting request 417435 from multimedia:libs Revert for now OBS-URL: https://build.opensuse.org/request/show/417435 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=178 --- vlc.changes | 5 ----- vlc.spec | 19 +++++-------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/vlc.changes b/vlc.changes index d99cc6f..2ad56c9 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 4e4577e..5f06f19 100644 --- a/vlc.spec +++ b/vlc.spec @@ -374,6 +374,9 @@ 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 \ @@ -416,12 +419,10 @@ export LDFLAGS="-pie" %else --disable-swscale \ %endif -%if 0%{?suse_version} >= 1321 || 0%{?BUILD_ORIG} - --enable-avcodec \ -%endif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ + --enable-avcodec \ --enable-postproc \ --enable-faad \ --enable-a52 \ @@ -429,6 +430,7 @@ export LDFLAGS="-pie" %else --disable-libmpeg2 \ --disable-mad \ + --disable-avcodec \ --disable-postproc \ --disable-faad \ --disable-a52 \ @@ -1120,15 +1122,6 @@ 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 -%endif - -%if %{with gstreamer} -%files codec-gstreamer -%defattr(-,root,root) -%{_libdir}/vlc/plugins/codec/libgstdecode_plugin.so -%endif %if %{with gstreamer} %files codec-gstreamer @@ -1143,9 +1136,7 @@ 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 From 5d369693569dc0fc6563f7d9e72166e9ee3f5a75f8cd87989cd3862445c27076 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 9 Aug 2016 12:15:05 +0000 Subject: [PATCH 5/7] Enable avcodec OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=179 --- vlc.changes | 6 ++++++ vlc.spec | 24 ++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/vlc.changes b/vlc.changes index 2ad56c9..69b403d 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/vlc.spec b/vlc.spec index 5f06f19..013b6fe 100644 --- a/vlc.spec +++ b/vlc.spec @@ -195,11 +195,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 +372,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 +417,6 @@ export LDFLAGS="-pie" %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ - --enable-avcodec \ --enable-postproc \ --enable-faad \ --enable-a52 \ @@ -430,12 +424,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 +718,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 +813,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 +857,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 +883,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 +963,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 +1131,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 From 0d46a09e406352f67a166e3007276a2921ae92c40ef3007cb5a985a29471e949 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 10 Aug 2016 16:31:05 +0000 Subject: [PATCH 6/7] - BuildConflict pkgconfig(avformat) >=55: vlc 2.2.x is not yet compatible with these updates. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=180 --- vlc.changes | 6 ++++++ vlc.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/vlc.changes b/vlc.changes index 69b403d..eb5f7f3 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org + +- BuildConflict pkgconfig(avformat) >=55: vlc 2.2.x is not yet + compatible with these updates. + ------------------------------------------------------------------- Tue Aug 9 11:14:19 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 013b6fe..59a0b5d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -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 From ec9a3f9d07ac096248f44794288b6972285986ee83d81a16a43c672b7a28c134 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 10 Aug 2016 16:33:00 +0000 Subject: [PATCH 7/7] fixup OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=181 --- vlc.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlc.changes b/vlc.changes index eb5f7f3..c90fbff 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org -- BuildConflict pkgconfig(avformat) >=55: vlc 2.2.x is not yet +- BuildConflict pkgconfig(libavutil) >=55: vlc 2.2.x is not yet compatible with these updates. -------------------------------------------------------------------