X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mutter.spec;h=d928e1e7410139555bb13a5fd5e54e5d135fc849;hb=4ec3d55663249ebe938d0ec83702d2fbd0d7b0d7;hp=f9eed723979fc8e5d94a116badbb99e8d2fc2404;hpb=b2c27f865efe872cd07a813c89befaa50f2fd3f7;p=packages%2Fmutter.git

diff --git a/mutter.spec b/mutter.spec
index f9eed72..d928e1e 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,66 +1,85 @@
+#
+# Conditional build
+%bcond_without	pipewire	# remote desktop via pipewire
+%bcond_with	sysprof		# build with tracing support
+%bcond_with	tests		# run tests (causes infinite loop on builders)
+
 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.14.2
+Version:	3.34.4
 Release:	1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.14/%{name}-%{version}.tar.xz
-# Source0-md5:	28fdb6b2464d0a278013859f469a474b
-URL:		http://git.gnome.org/cgit/mutter
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/mutter/3.34/%{name}-%{version}.tar.xz
+# Source0-md5:	de19a6de98a2250dd7efdfca14359e39
+URL:		https://gitlab.gnome.org/GNOME/mutter
+BuildRequires:	EGL-devel
+BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	Mesa-libgbm-devel >= 10.3
-BuildRequires:	autoconf >= 2.62
-BuildRequires:	automake >= 1:1.11
+BuildRequires:	atk-devel >= 1:2.6
 BuildRequires:	cairo-devel >= 1.10.0
-BuildRequires:	clutter-devel >= 1.20.0
-BuildRequires:	cogl-devel >= 1.18.0
-BuildRequires:	gdk-pixbuf2-devel
-BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.26.0
-BuildRequires:	gnome-common
+BuildRequires:	cairo-gobject-devel >= 1.14.0
+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:	gnome-desktop-devel >= 3.0
-BuildRequires:	gobject-introspection-devel >= 0.10.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.8.0
-BuildRequires:	gtk+3-devel >= 3.10.0
-BuildRequires:	gtk-doc >= 1.15
-BuildRequires:	intltool >= 0.41.0
+BuildRequires:	gnome-settings-daemon-devel
+BuildRequires:	gobject-introspection-devel >= 1.40.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.33.0
+BuildRequires:	gtk+3-devel >= 3.20.0
+BuildRequires:	json-glib-devel >= 0.12.0
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
 BuildRequires:	libdrm-devel
-BuildRequires:	libinput-devel
-BuildRequires:	libtool >= 2:2.2.6
-# xcb-randr
+BuildRequires:	libgudev-devel >= 232
+BuildRequires:	libinput-devel >= 1.4.0
+BuildRequires:	libwacom-devel >= 0.13
+# xcb-randr, xcb-res
 BuildRequires:	libxcb-devel
-BuildRequires:	pango-devel >= 1:1.2.0
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pango-devel >= 1:1.30
+%{?with_pipewire:BuildRequires:	pipewire-devel >= 0.2.5}
 BuildRequires:	pkgconfig >= 1:0.21
-BuildRequires:	rpmbuild(macros) >= 1.98
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	startup-notification-devel >= 0.7
-BuildRequires:	systemd-devel
+%{?with_sysprof:BuildRequires:	sysprof-devel >= 3.34.0}
+# 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.5.90
+BuildRequires:	wayland-devel >= 1.13.0
+BuildRequires:	wayland-egl-devel
+BuildRequires:	wayland-protocols >= 1.18
 BuildRequires:	xkeyboard-config
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXcomposite-devel >= 0.2
+BuildRequires:	xorg-lib-libXau-devel
+BuildRequires:	xorg-lib-libXcomposite-devel >= 0.4
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXfixes-devel
-BuildRequires:	xorg-lib-libXi-devel >= 1.7
+BuildRequires:	xorg-lib-libXfixes-devel >= 3
+BuildRequires:	xorg-lib-libXi-devel >= 1.7.4
 BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrandr-devel >= 1.5.0
 BuildRequires:	xorg-lib-libXrender-devel
-BuildRequires:	xorg-lib-libxkbcommon-devel
-BuildRequires:	xorg-lib-libxkbcommon-x11-devel
+BuildRequires:	xorg-lib-libXtst-devel
+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.26.0
+Requires(post,postun):	glib2 >= 1:2.61.1
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gsettings-desktop-schemas >= 3.8.0
+Requires:	gsettings-desktop-schemas >= 3.33.0
 Requires:	zenity
 Provides:	gnome-wm
+Obsoletes:	mutter-apidocs < 3.18
 Obsoletes:	mutter-wayland < 3.14
+Obsoletes:	mutter-wayland-apidocs < 3.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,18 +99,28 @@ Summary:	Mutter shared library
 Summary(pl.UTF-8):	Biblioteka współdzielona zarządcy okien Mutter
 Group:		Libraries
 Requires:	Mesa-libgbm >= 10.3
+Requires:	atk >= 1:2.6
 Requires:	cairo >= 1.10.0
-Requires:	clutter >= 1.20.0
-Requires:	cogl >= 1.18.0
-Requires:	glib2 >= 1:2.26.0
+Requires:	cairo-gobject >= 1.14.0
+Requires:	fribidi >= 1.0.0
+Requires:	glib2 >= 1:2.61.1
 Requires:	gnome-desktop >= 3.0
-Requires:	gtk+3 >= 3.10.0
+Requires:	gtk+3 >= 3.20.0
+Requires:	json-glib >= 0.12.0
 Requires:	libcanberra-gtk3 >= 0.26
+Requires:	libinput >= 1.4.0
+Requires:	libwacom >= 0.13
+Requires:	pango >= 1:1.30
+%{?with_pipewire:Requires:	pipewire-libs >= 0.2.5}
 Requires:	startup-notification >= 0.7
+Requires:	libgudev >= 232
+Requires:	udev-libs >= 1:228
 Requires:	upower-libs >= 0.99.0
-Requires:	wayland >= 1.5.90
-Requires:	xorg-lib-libXcomposite >= 0.2
-Requires:	xorg-lib-libXi >= 1.7
+Requires:	wayland >= 1.13.0
+Requires:	xorg-lib-libXcomposite >= 0.4
+Requires:	xorg-lib-libXfixes >= 3
+Requires:	xorg-lib-libXi >= 1.7.4
+Requires:	xorg-lib-libXrandr >= 1.5.0
 Obsoletes:	mutter-wayland-libs < 3.14
 Conflicts:	mutter < 3.4.0-2
 
@@ -106,18 +135,30 @@ Summary:	Development package for Mutter
 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:	cairo-devel >= 1.10.0
-Requires:	clutter-devel >= 1.20.0
-Requires:	cogl-devel >= 1.18.0
-Requires:	glib2-devel >= 1:2.26.0
-Requires:	gtk+3-devel >= 3.10.0
+Requires:	cairo-gobject-devel >= 1.14.0
+Requires:	gdk-pixbuf2-devel >= 2.0
+Requires:	glib2-devel >= 1:2.61.1
+Requires:	gtk+3-devel >= 3.20.0
 Requires:	libcanberra-gtk3-devel >= 0.26
+Requires:	libdrm-devel
 Requires:	startup-notification-devel >= 0.7
-Requires:	xorg-lib-libXcomposite-devel >= 0.2
+Requires:	wayland-devel >= 1.6.90
+Requires:	wayland-egl-devel
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXau-devel
+Requires:	xorg-lib-libXcomposite-devel >= 0.4
 Requires:	xorg-lib-libXcursor-devel
 Requires:	xorg-lib-libXdamage-devel
-Requires:	xorg-lib-libXfixes-devel
+Requires:	xorg-lib-libXext-devel
+Requires:	xorg-lib-libXfixes-devel >= 3
+Requires:	xorg-lib-libXi-devel >= 1.7.4
+Requires:	xorg-lib-libXrandr-devel >= 1.5.0
 Requires:	xorg-lib-libXrender-devel
+Requires:	xorg-lib-libXtst-devel
+Requires:	xorg-lib-libxkbcommon-devel >= 0.4.3
 Obsoletes:	mutter-wayland-devel < 3.14
 
 %description devel
@@ -127,47 +168,24 @@ Header files for developing Mutter plugins.
 Pliki nagłówkowe do tworzenia wtyczek zarządcy okien i składania
 Mutter.
 
-%package apidocs
-Summary:	Mutter (Meta) API documentation
-Summary(pl.UTF-8):	Dokumentacja API Mutter (Meta)
-Group:		Documentation
-Requires:	gtk-doc-common
-Obsoletes:	mutter-wayland-apidocs < 3.14
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
-
-%description apidocs
-Mutter (Meta) API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API Mutter (Meta).
-
 %prep
 %setup -q
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	ZENITY=/usr/bin/zenity \
-	--enable-compile-warnings=maximum \
-	--disable-silent-rules \
-	--disable-static \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	-Dgles2_libname=libGLESv2.so.2 \
+	-Dinstalled_tests=false \
+	-Dprofiler=%{__true_false sysprof} \
+	%{!?with_pipewire:-Dremote_desktop=false} \
+	-Dtests=%{__true_false tests} \
+	-Dxwayland_path=/usr/bin/Xwayland
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -187,14 +205,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc NEWS doc/*.txt
 %attr(755,root,root) %{_bindir}/mutter
-%dir %{_libdir}/mutter/plugins
-%attr(755,root,root) %{_libdir}/mutter/plugins/default.so
+%dir %{_libdir}/mutter-5/plugins
+%attr(755,root,root) %{_libdir}/mutter-5/plugins/libdefault.so
 %attr(755,root,root) %{_libexecdir}/mutter-restart-helper
 %{_desktopdir}/mutter.desktop
-%{_desktopdir}/mutter-wayland.desktop
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/50-mutter-wayland.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-navigation.xml
 %{_datadir}/gnome-control-center/keybindings/50-mutter-system.xml
@@ -202,20 +220,43 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmutter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmutter.so.0
-%dir %{_libdir}/mutter
+%attr(755,root,root) %{_libdir}/libmutter-5.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmutter-5.so.0
+%dir %{_libdir}/mutter-5
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-clutter-5.so.*.*.*
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-clutter-5.so.0
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-pango-5.so.*.*.*
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-pango-5.so.0
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-path-5.so.*.*.*
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-path-5.so.0
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-5.so.*.*.*
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-5.so.0
 # intentionally installed in package-private dir
-%{_libdir}/mutter/Meta-*.typelib
+%{_libdir}/mutter-5/Cally-*.typelib
+%{_libdir}/mutter-5/Clutter-*.typelib
+%{_libdir}/mutter-5/ClutterX11-*.typelib
+%{_libdir}/mutter-5/Cogl-*.typelib
+%{_libdir}/mutter-5/CoglPango-*.typelib
+%{_libdir}/mutter-5/Meta-*.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmutter.so
-%{_includedir}/mutter
+%attr(755,root,root) %{_libdir}/libmutter-5.so
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-clutter-5.so
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-pango-5.so
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-path-5.so
+%attr(755,root,root) %{_libdir}/mutter-5/libmutter-cogl-5.so
+%{_includedir}/mutter-5
 # intentionally installed in package-private dir
-%{_libdir}/mutter/Meta-*.gir
-%{_pkgconfigdir}/libmutter.pc
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/meta
+%{_libdir}/mutter-5/Cally-*.gir
+%{_libdir}/mutter-5/Clutter-*.gir
+%{_libdir}/mutter-5/ClutterX11-*.gir
+%{_libdir}/mutter-5/Cogl-*.gir
+%{_libdir}/mutter-5/CoglPango-*.gir
+%{_libdir}/mutter-5/Meta-*.gir
+%{_pkgconfigdir}/libmutter-5.pc
+%{_pkgconfigdir}/mutter-clutter-5.pc
+%{_pkgconfigdir}/mutter-clutter-x11-5.pc
+%{_pkgconfigdir}/mutter-cogl-5.pc
+%{_pkgconfigdir}/mutter-cogl-pango-5.pc
+%{_pkgconfigdir}/mutter-cogl-path-5.pc