X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mutter.spec;h=890139310ebd86b05cfe9d0d9f176267b9104f85;hb=ab20618ba06610e7cd11da424fcd0486f516cb4a;hp=11572d6200fb74668598744791313dc175ad3376;hpb=d80a3cbef976e257a20cbde78c0554fc4ba240ce;p=packages%2Fmutter.git

diff --git a/mutter.spec b/mutter.spec
index 11572d6..8901393 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,5 +1,7 @@
+# TODO: use xorg-xserver-Xwayland-devel >= 21.1 instead of no-xwayland patch after finishing xorg-xserver-Xwayland.spec
 #
 # Conditional build
+%bcond_with	eglstream	# Wayland EGLStream support
 %bcond_without	pipewire	# remote desktop via pipewire
 %bcond_with	sysprof		# build with tracing support
 %bcond_with	tests		# run tests (causes infinite loop on builders)
@@ -7,52 +9,55 @@
 Summary:	Window and compositing manager based on Clutter
 Summary(pl.UTF-8):	Zarządca okien i składania oparty na bibliotece Clutter
 Name:		mutter
-Version:	3.36.6
+Version:	40.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.36/%{name}-%{version}.tar.xz
-# Source0-md5:	c841bbcc1a73ce632371172ee04730ae
+Source0:	https://download.gnome.org/sources/mutter/40/%{name}-%{version}.tar.xz
+# Source0-md5:	84beb760caa91baad7838260593e488a
+Patch0:		%{name}-no-xwayland.patch
+Patch1:		%{name}-deps.patch
 URL:		https://gitlab.gnome.org/GNOME/mutter
 BuildRequires:	EGL-devel
 BuildRequires:	OpenGL-GLX-devel
-BuildRequires:	Mesa-libgbm-devel >= 10.3
+BuildRequires:	Mesa-libgbm-devel >= 17.3
 BuildRequires:	atk-devel >= 1:2.6
 BuildRequires:	cairo-devel >= 1.10.0
 BuildRequires:	cairo-gobject-devel >= 1.14.0
 BuildRequires:	dbus-devel
+%{?with_eglstream:BuildRequires:	egl-wayland-devel}
 BuildRequires:	fribidi-devel >= 1.0.0
 BuildRequires:	gdk-pixbuf2-devel >= 2.0
 BuildRequires:	gettext-tools >= 0.19.6
-BuildRequires:	glib2-devel >= 1:2.61.1
+BuildRequires:	glib2-devel >= 1:2.67.3
 BuildRequires:	gnome-desktop-devel >= 3.0
 BuildRequires:	gnome-settings-daemon-devel
 BuildRequires:	gobject-introspection-devel >= 1.40.0
-BuildRequires:	graphene-devel >= 1.9.3
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.33.0
+BuildRequires:	graphene-devel >= 1.10.2
+BuildRequires:	gsettings-desktop-schemas-devel >= 40
 BuildRequires:	gtk+3-devel >= 3.20.0
 BuildRequires:	json-glib-devel >= 0.12.0
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
 BuildRequires:	libdrm-devel
 BuildRequires:	libgudev-devel >= 232
-BuildRequires:	libinput-devel >= 1.7
+BuildRequires:	libinput-devel >= 1.15.0
 BuildRequires:	libwacom-devel >= 0.13
 # xcb-randr, xcb-res
 BuildRequires:	libxcb-devel
-BuildRequires:	meson >= 0.50.0
+BuildRequires:	meson >= 0.51.0
 BuildRequires:	ninja >= 1.5
-BuildRequires:	pango-devel >= 1:1.30
-%{?with_pipewire:BuildRequires:	pipewire-devel >= 0.3.0}
+BuildRequires:	pango-devel >= 1:1.46.0
+%{?with_pipewire:BuildRequires:	pipewire-devel >= 0.3.21}
 BuildRequires:	pkgconfig >= 1:0.21
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	startup-notification-devel >= 0.7
-%{?with_sysprof:BuildRequires:	sysprof-devel >= 3.35.2}
+%{?with_sysprof:BuildRequires:	sysprof-devel >= 3.37.2}
 # or elogind-devel
 BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel >= 1:228
 BuildRequires:	upower-devel >= 0.99.0
-BuildRequires:	wayland-devel >= 1.13.0
+BuildRequires:	wayland-devel >= 1.18
 BuildRequires:	wayland-egl-devel
 BuildRequires:	wayland-protocols >= 1.19
 BuildRequires:	xkeyboard-config
@@ -74,9 +79,9 @@ BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.4.3
 BuildRequires:	xorg-lib-libxkbcommon-x11-devel >= 0.4.3
 BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xz
-Requires(post,postun):	glib2 >= 1:2.61.1
+Requires(post,postun):	glib2 >= 1:2.67.3
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gsettings-desktop-schemas >= 3.33.0
+Requires:	gsettings-desktop-schemas >= 40
 Requires:	zenity
 Provides:	gnome-wm
 Obsoletes:	mutter-apidocs < 3.18
@@ -84,7 +89,7 @@ Obsoletes:	mutter-wayland < 3.14
 Obsoletes:	mutter-wayland-apidocs < 3.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		apiver		6
+%define		apiver		8
 
 %description
 Mutter is a window and compositing manager that displays and manages
@@ -102,26 +107,26 @@ odziedziczoną z zarządcy okien Metacity.
 Summary:	Mutter shared library
 Summary(pl.UTF-8):	Biblioteka współdzielona zarządcy okien Mutter
 Group:		Libraries
-Requires:	Mesa-libgbm >= 10.3
+Requires:	Mesa-libgbm >= 17.3
 Requires:	atk >= 1:2.6
 Requires:	cairo >= 1.10.0
 Requires:	cairo-gobject >= 1.14.0
 Requires:	fribidi >= 1.0.0
-Requires:	glib2 >= 1:2.61.1
+Requires:	glib2 >= 1:2.67.3
 Requires:	gnome-desktop >= 3.0
-Requires:	graphene >= 1.9.3
+Requires:	graphene >= 1.10.2
 Requires:	gtk+3 >= 3.20.0
 Requires:	json-glib >= 0.12.0
 Requires:	libcanberra-gtk3 >= 0.26
-Requires:	libinput >= 1.7
+Requires:	libinput >= 1.15.0
 Requires:	libwacom >= 0.13
-Requires:	pango >= 1:1.30
-%{?with_pipewire:Requires:	pipewire-libs >= 0.3.0}
+Requires:	pango >= 1:1.46.0
+%{?with_pipewire:Requires:	pipewire-libs >= 0.3.21}
 Requires:	startup-notification >= 0.7
 Requires:	libgudev >= 232
 Requires:	udev-libs >= 1:228
 Requires:	upower-libs >= 0.99.0
-Requires:	wayland >= 1.13.0
+Requires:	wayland >= 1.18
 Requires:	xorg-lib-libXcomposite >= 0.4
 Requires:	xorg-lib-libXfixes >= 3
 Requires:	xorg-lib-libXi >= 1.7.4
@@ -141,17 +146,17 @@ Summary(pl.UTF-8):	Pakiet programistyczny do wtyczek zarządcy okien Mutter
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	EGL-devel
-Requires:	Mesa-libgbm-devel >= 10.3
+Requires:	Mesa-libgbm-devel >= 17.3
 Requires:	cairo-devel >= 1.10.0
 Requires:	cairo-gobject-devel >= 1.14.0
 Requires:	gdk-pixbuf2-devel >= 2.0
-Requires:	glib2-devel >= 1:2.61.1
-Requires:	graphene-devel >= 1.9.3
+Requires:	glib2-devel >= 1:2.67.3
+Requires:	graphene-devel >= 1.10.2
 Requires:	gtk+3-devel >= 3.20.0
 Requires:	libcanberra-gtk3-devel >= 0.26
 Requires:	libdrm-devel
 Requires:	startup-notification-devel >= 0.7
-Requires:	wayland-devel >= 1.6.90
+Requires:	wayland-devel >= 1.8
 Requires:	wayland-egl-devel
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXau-devel
@@ -176,15 +181,18 @@ Mutter.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %meson build \
+	%{?with_eglstream:-Dwayland_eglstream=true} \
 	-Dgles2_libname=libGLESv2.so.2 \
 	-Dinstalled_tests=false \
 	-Dprofiler=%{__true_false sysprof} \
 	%{!?with_pipewire:-Dremote_desktop=false} \
 	-Dtests=%{__true_false tests} \
-	-Dxwayland_initfd=enabled \
+	-Dxwayland_initfd=disabled \
 	-Dxwayland_path=/usr/bin/Xwayland
 
 %ninja_build -C build
@@ -215,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/mutter-%{apiver}/plugins
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/plugins/libdefault.so
 %attr(755,root,root) %{_libexecdir}/mutter-restart-helper
+/lib/udev/rules.d/61-mutter.rules
 %{_desktopdir}/mutter.desktop
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
@@ -234,36 +243,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-clutter-%{apiver}.so.0
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-pango-%{apiver}.so.*.*.*
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-pango-%{apiver}.so.0
-%attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-path-%{apiver}.so.*.*.*
-%attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-path-%{apiver}.so.0
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-%{apiver}.so.*.*.*
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-%{apiver}.so.0
 # intentionally installed in package-private dir
-%{_libdir}/mutter-%{apiver}/Cally-*.typelib
-%{_libdir}/mutter-%{apiver}/Clutter-*.typelib
-%{_libdir}/mutter-%{apiver}/ClutterX11-*.typelib
-%{_libdir}/mutter-%{apiver}/Cogl-*.typelib
-%{_libdir}/mutter-%{apiver}/CoglPango-*.typelib
-%{_libdir}/mutter-%{apiver}/Meta-*.typelib
+%{_libdir}/mutter-%{apiver}/Cally-%{apiver}.typelib
+%{_libdir}/mutter-%{apiver}/Clutter-%{apiver}.typelib
+%{_libdir}/mutter-%{apiver}/ClutterX11-%{apiver}.typelib
+%{_libdir}/mutter-%{apiver}/Cogl-%{apiver}.typelib
+%{_libdir}/mutter-%{apiver}/CoglPango-%{apiver}.typelib
+%{_libdir}/mutter-%{apiver}/Meta-%{apiver}.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmutter-%{apiver}.so
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-clutter-%{apiver}.so
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-pango-%{apiver}.so
-%attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-path-%{apiver}.so
 %attr(755,root,root) %{_libdir}/mutter-%{apiver}/libmutter-cogl-%{apiver}.so
 %{_includedir}/mutter-%{apiver}
 # intentionally installed in package-private dir
-%{_libdir}/mutter-%{apiver}/Cally-*.gir
-%{_libdir}/mutter-%{apiver}/Clutter-*.gir
-%{_libdir}/mutter-%{apiver}/ClutterX11-*.gir
-%{_libdir}/mutter-%{apiver}/Cogl-*.gir
-%{_libdir}/mutter-%{apiver}/CoglPango-*.gir
-%{_libdir}/mutter-%{apiver}/Meta-*.gir
+%{_libdir}/mutter-%{apiver}/Cally-%{apiver}.gir
+%{_libdir}/mutter-%{apiver}/Clutter-%{apiver}.gir
+%{_libdir}/mutter-%{apiver}/ClutterX11-%{apiver}.gir
+%{_libdir}/mutter-%{apiver}/Cogl-%{apiver}.gir
+%{_libdir}/mutter-%{apiver}/CoglPango-%{apiver}.gir
+%{_libdir}/mutter-%{apiver}/Meta-%{apiver}.gir
 %{_pkgconfigdir}/libmutter-%{apiver}.pc
 %{_pkgconfigdir}/mutter-clutter-%{apiver}.pc
 %{_pkgconfigdir}/mutter-clutter-x11-%{apiver}.pc
 %{_pkgconfigdir}/mutter-cogl-%{apiver}.pc
 %{_pkgconfigdir}/mutter-cogl-pango-%{apiver}.pc
-%{_pkgconfigdir}/mutter-cogl-path-%{apiver}.pc