From d275ab5cd340be019c320b10d8ed046187e6db76ab83877246b975db9bb5cc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 16 Dec 2014 10:15:57 +0000 Subject: [PATCH] Accepting request 265271 from home:fcrozat:branches:GNOME:Factory - Disable wayland on SLE12. - Remove BuildRequires pkgconfig(gbm), not needed unless building native backend. OBS-URL: https://build.opensuse.org/request/show/265271 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=162 --- mutter.changes | 7 +++++++ mutter.spec | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mutter.changes b/mutter.changes index 8a2ac91..382befc 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 12 15:51:53 UTC 2014 - fcrozat@suse.com + +- Disable wayland on SLE12. +- Remove BuildRequires pkgconfig(gbm), not needed unless building + native backend. + ------------------------------------------------------------------- Wed Dec 3 23:35:43 UTC 2014 - badshah400@gmail.com diff --git a/mutter.spec b/mutter.spec index f0a407c..2824c29 100644 --- a/mutter.spec +++ b/mutter.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} == 1315 +%define build_wayland 0 +%else +%define build_wayland 1 +%endif + Name: mutter Version: 3.14.2 Release: 0 @@ -45,11 +51,12 @@ BuildRequires: update-desktop-files BuildRequires: zenity BuildRequires: pkgconfig(cairo) >= 1.10.0 BuildRequires: pkgconfig(clutter-1.0) >= 1.19.7 +%if %{build_wayland} BuildRequires: pkgconfig(clutter-egl-1.0) BuildRequires: pkgconfig(clutter-wayland-1.0) BuildRequires: pkgconfig(clutter-wayland-compositor-1.0) +%endif BuildRequires: pkgconfig(cogl-1.0) >= 1.17.1 -BuildRequires: pkgconfig(gbm) >= 10.3 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.25.10 BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.7.3 @@ -61,7 +68,9 @@ BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(pango) >= 1.2.0 BuildRequires: pkgconfig(upower-glib) >= 0.99.0 +%if %{build_wayland} BuildRequires: pkgconfig(wayland-server) >= 1.4.93 +%endif BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb-randr) BuildRequires: pkgconfig(xcomposite) >= 0.2