From 29989b7e429f6b41fb351dcf13b42c506028fa3b91aba5485ed8b264d79a227a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 15 Dec 2015 09:31:44 +0000 Subject: [PATCH 1/3] Enable upnp support OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=148 --- vlc.changes | 6 ++++++ vlc.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/vlc.changes b/vlc.changes index 167d121..e8ccdf9 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 15 09:30:13 UTC 2015 - dimstar@opensuse.org + +- Enable libupnp support on Leap 42.1: the library is available + (boo#959100). + ------------------------------------------------------------------- Mon Dec 7 03:07:12 UTC 2015 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 712500c..f85c044 100644 --- a/vlc.spec +++ b/vlc.spec @@ -137,7 +137,7 @@ BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 BuildRequires: pkgconfig(libswscale) %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(SDL_image) >= 1.2.10 BuildRequires: pkgconfig(libprojectM) >= 2.0.0 BuildRequires: pkgconfig(libupnp) @@ -950,7 +950,7 @@ done %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %endif %endif From ae4afe0e3a24fc025d70e5505e6074d34c90fca08fc40374ab8fe04fb407ec67 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Dec 2015 10:49:18 +0000 Subject: [PATCH 2/3] Some more leap fixes OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=149 --- vlc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vlc.spec b/vlc.spec index f85c044..55e5953 100644 --- a/vlc.spec +++ b/vlc.spec @@ -377,7 +377,7 @@ export CXXFLAGS="%{optflags}" %endif --enable-libcddb \ %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} --enable-opencv \ %endif %endif @@ -540,7 +540,7 @@ done %{_libdir}/vlc/plugins/codec/liblibass_plugin.so %endif %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif %endif @@ -560,7 +560,7 @@ done %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so %{_libdir}/vlc/plugins/video_output/libaa_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so %endif %endif @@ -1044,7 +1044,7 @@ done %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so %if 0%{?suse_version} > 1110 -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif From d2a25b8f44647e7b0c87473d264cc5e86d17a57373cd9fb0e82ff0cfe57ff7a6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Dec 2015 13:58:30 +0000 Subject: [PATCH 3/3] Accepting request 351008 from home:wolfi323:branches:multimedia:libs - Build against libQt5X11Extras5 on Leap as well to make video integration into the GUI work (boo#953693) - Also add BuildRequires: pkgconfig(xi), without it the build fails on Leap now OBS-URL: https://build.opensuse.org/request/show/351008 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=151 --- vlc.changes | 8 ++++++++ vlc.spec | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/vlc.changes b/vlc.changes index e8ccdf9..7e7ad19 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 28 06:49:35 UTC 2015 - wbauer@tmo.at + +- Build against libQt5X11Extras5 on Leap as well to make video + integration into the GUI work (boo#953693) +- Also add BuildRequires: pkgconfig(xi), without it the build fails + on Leap now + ------------------------------------------------------------------- Tue Dec 15 09:30:13 UTC 2015 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 55e5953..b9a0093 100644 --- a/vlc.spec +++ b/vlc.spec @@ -81,8 +81,10 @@ BuildRequires: libopus-devel >= 1.0.3 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 || 0%{?is_opensuse} BuildRequires: pkgconfig(Qt5X11Extras) +# for some reason libXi-devel is explicitly needed on Leap 42.1, otherwise the build fails... +BuildRequires: pkgconfig(xi) %endif %else BuildRequires: libqt4-devel >= 4.6.0