From 4bf3da96034c687097b695e6fba1419f0e84ca796e51e0bb161be1c391850605 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 3 Mar 2018 00:21:34 +0000 Subject: [PATCH] Accepting request 580636 from home:xexaxo:branches:X11:Wayland Small maintenance fixes - Remove unneeded dependencies, update existing version checks - Remove no longer present libinput configure toggle Note: the build fix was submitted upstream and ideally will be in next release - 4.0 For the future don't be shy to send patches upstream ;-) OBS-URL: https://build.opensuse.org/request/show/580636 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=70 --- weston.changes | 10 ++++++++++ weston.spec | 23 ++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/weston.changes b/weston.changes index 387a633..b24e926 100644 --- a/weston.changes +++ b/weston.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Feb 27 14:41:38 UTC 2018 - emil.l.velikov@gmail.com + +- Remove unneeded dependencies, update existing version checks + +------------------------------------------------------------------- +Tue Feb 27 14:15:43 UTC 2018 - emil.l.velikov@gmail.com + +- Remove no longer present libinput configure toggle + ------------------------------------------------------------------- Thu Sep 14 14:39:38 UTC 2017 - jengelh@inai.de diff --git a/weston.spec b/weston.spec index 993d93e..88eac2b 100644 --- a/weston.spec +++ b/weston.spec @@ -1,7 +1,7 @@ # # spec file for package weston # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,14 +33,11 @@ Source3: %name.keyring Patch1: 0001-build-honor-results-obtained-by-pkg-config-libinput.patch BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1.11 -BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libtool >= 2.2 -BuildRequires: libvpx-devel BuildRequires: libxml2-tools BuildRequires: pam-devel BuildRequires: pkgconfig -BuildRequires: rsvg-view BuildRequires: xkeyboard-config BuildRequires: xz BuildRequires: pkgconfig(cairo) >= 1.10.0 @@ -51,29 +48,29 @@ BuildRequires: pkgconfig(dbus-1) >= 1.6 BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(freerdp2) BuildRequires: pkgconfig(gbm) -BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdrm) >= 2.4.30 -BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd) >= 209 BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwebp) +# mtdev isn't really required - the configure check was fixed after the 3.0 release BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(pixman-1) >= 0.25.2 -BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(wayland-client) >= 1.10.0 +BuildRequires: pkgconfig(wayland-client) >= 1.12.0 BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.0 +BuildRequires: pkgconfig(wayland-protocols) >= 1.8 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.10.0 +BuildRequires: pkgconfig(wayland-server) >= 1.12.0 BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xcb-shm) BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xcb-xkb) >= 1.9 BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xkbcommon) >= 0.3.0 +Requires: vpx-tools Requires: xkeyboard-config %description @@ -142,7 +139,7 @@ to develop plugins for Weston. # Ensure people will use pkgconfig to locate headers. # Implicit enable-libunwind would make the tests run endlessly on i586. %configure --disable-static --includedir="%_includedir/%name" \ - --disable-setuid-install --disable-libinput-backend \ + --disable-setuid-install \ --disable-libunwind make %{?_smp_mflags}