From d2a25b8f44647e7b0c87473d264cc5e86d17a57373cd9fb0e82ff0cfe57ff7a6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Dec 2015 13:58:30 +0000 Subject: [PATCH] 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