From e79425ab7883ba08f6f707fcd323c28a546aa2d88f850e9be96b6168edbaae3c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 May 2018 15:37:24 +0000 Subject: [PATCH] Accepting request 610115 from home:hpjansson:rd Add dependency on libpipewire and build with --enable-remote-desktop. Pass --enable-gles2=yes to configure, build gles2 support in cogl, disabled by default from upstream. We already had the needed pkgconfig(glesv2) BuildRequires in place. OBS-URL: https://build.opensuse.org/request/show/610115 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=291 --- mutter.changes | 13 +++++++++++++ mutter.spec | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mutter.changes b/mutter.changes index 69df62a..f38229d 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 17 15:18:48 UTC 2018 - hpj@suse.com + +- Add dependency on libpipewire and build with + --enable-remote-desktop. + ------------------------------------------------------------------- Wed May 09 16:00:40 UTC 2018 - opensuse-packaging@opensuse.org @@ -48,6 +54,13 @@ Wed Apr 18 12:17:18 UTC 2018 - bjorn.lie@gmail.com - Following the above, add libtool BuildRequires and pass autogen.sh to bootstrap. +------------------------------------------------------------------- +Thu Apr 5 19:30:24 UTC 2018 - bjorn.lie@gmail.com + +- Pass --enable-gles2=yes to configure, build gles2 support in + cogl, disabled by default from upstream. We already had the + needed pkgconfig(glesv2) BuildRequires in place. + ------------------------------------------------------------------- Thu Mar 22 20:04:16 CET 2018 - hpj@suse.com diff --git a/mutter.spec b/mutter.spec index 31c8422..7218ea5 100644 --- a/mutter.spec +++ b/mutter.spec @@ -40,8 +40,6 @@ Patch1000: mutter-SLE-bell.patch Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.patch # PATCH-FIX-UPSTREAM mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj@suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes. Patch1002: mutter-SLE-bsc984738-grab-display.patch -# Not available in openSUSE yet -# BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: Mesa-libGLESv3-devel BuildRequires: fdupes BuildRequires: intltool @@ -63,6 +61,7 @@ BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libpipewire-0.1) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) >= 136 @@ -155,13 +154,14 @@ translation-update-upstream %endif %build -# FIXME add --enable-remote-desktop when libpipewire-0.1 is available NOCONFIGURE=1 ./autogen.sh %configure \ --enable-wayland \ --enable-native-backend \ --disable-static \ --enable-egl-device \ + --enable-gles2=yes \ + --enable-remote-desktop \ --enable-compile-warnings=maximum \ %{nil} %make_build @@ -185,6 +185,7 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print # These so files are not split out since they are private to mutter %{_libdir}/mutter/libmutter-clutter-%{mutter_major}.so +%{_libdir}/mutter/libmutter-cogl-gles2-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-pango-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-path-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-%{mutter_major}.so @@ -231,6 +232,7 @@ find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %{_libdir}/pkgconfig/mutter-clutter-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-clutter-x11-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-%{mutter_major}.pc +%{_libdir}/pkgconfig/mutter-cogl-gles2-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-pango-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-path-%{mutter_major}.pc