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
This commit is contained in:
Dominique Leuenberger 2018-05-17 15:37:24 +00:00 committed by Git OBS Bridge
parent ed703317b6
commit e79425ab78
2 changed files with 18 additions and 3 deletions

View File

@ -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 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 - Following the above, add libtool BuildRequires and pass
autogen.sh to bootstrap. 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 Thu Mar 22 20:04:16 CET 2018 - hpj@suse.com

View File

@ -40,8 +40,6 @@ Patch1000: mutter-SLE-bell.patch
Patch1001: mutter-SLE-relax-some-constraints-on-CSD-windows.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. # 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 Patch1002: mutter-SLE-bsc984738-grab-display.patch
# Not available in openSUSE yet
# BuildRequires: pkgconfig(libpipewire-0.1)
BuildRequires: Mesa-libGLESv3-devel BuildRequires: Mesa-libGLESv3-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool BuildRequires: intltool
@ -63,6 +61,7 @@ BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libdrm) >= 2.4.83 BuildRequires: pkgconfig(libdrm) >= 2.4.83
BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(libinput)
BuildRequires: pkgconfig(libpipewire-0.1)
BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libudev) >= 136
@ -155,13 +154,14 @@ translation-update-upstream
%endif %endif
%build %build
# FIXME add --enable-remote-desktop when libpipewire-0.1 is available
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
%configure \ %configure \
--enable-wayland \ --enable-wayland \
--enable-native-backend \ --enable-native-backend \
--disable-static \ --disable-static \
--enable-egl-device \ --enable-egl-device \
--enable-gles2=yes \
--enable-remote-desktop \
--enable-compile-warnings=maximum \ --enable-compile-warnings=maximum \
%{nil} %{nil}
%make_build %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 # These so files are not split out since they are private to mutter
%{_libdir}/mutter/libmutter-clutter-%{mutter_major}.so %{_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-pango-%{mutter_major}.so
%{_libdir}/mutter/libmutter-cogl-path-%{mutter_major}.so %{_libdir}/mutter/libmutter-cogl-path-%{mutter_major}.so
%{_libdir}/mutter/libmutter-cogl-%{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-%{mutter_major}.pc
%{_libdir}/pkgconfig/mutter-clutter-x11-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-clutter-x11-%{mutter_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-%{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-pango-%{mutter_major}.pc
%{_libdir}/pkgconfig/mutter-cogl-path-%{mutter_major}.pc %{_libdir}/pkgconfig/mutter-cogl-path-%{mutter_major}.pc