Accepting request 351909 from multimedia:libs

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/351909
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=48

vlc.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
+
+- Enable libupnp support on Leap 42.1: the library is available
+  (boo#959100).
+
 -------------------------------------------------------------------
 Mon Dec  7 03:07:12 UTC 2015 - dimstar@opensuse.org
 

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
@@ -137,7 +139,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)
@@ -377,7 +379,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 +542,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 +562,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
@@ -950,7 +952,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
@@ -1044,7 +1046,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