mutter: Fix wip/mutter build on NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mutter: Fix wip/mutter build on NetBSD
From: Dan Cîrnaț <dan%alt.md@localhost>
Date: Sat, 20 Jun 2020 15:56:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Sat Jun 20 17:56:26 2020 +0200
Changeset:	8167898df5cdeca78f49b8d03fd94f88f3f0f4e9

Modified Files:
	mutter/Makefile
	mutter/PLIST
	mutter/distinfo
Added Files:
	mutter/patches/patch-src_meson.build

Log Message:
mutter: Fix wip/mutter build on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8167898df5cdeca78f49b8d03fd94f88f3f0f4e9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mutter/Makefile                      | 11 +++++++++--
 mutter/PLIST                         | 30 ------------------------------
 mutter/distinfo                      |  1 +
 mutter/patches/patch-src_meson.build | 12 ++++++++++++
 4 files changed, 22 insertions(+), 32 deletions(-)

diffs:
diff --git a/mutter/Makefile b/mutter/Makefile
index af8a865c4a..2cd12b99b3 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -18,6 +18,9 @@ MESON_ARGS+=		-Dnative_backend=false
 MESON_ARGS+=		-Dlibwacom=false
 MESON_ARGS+=		-Dremote_desktop=false
 MESON_ARGS+=		-Dprofiler=false
+MESON_ARGS+=		-Dwayland=false
+MESON_ARGS+=		-Dtests=false #tests require Wayland support
+MESON_ARGS+=		-Dsm=true
 
 PKGCONFIG_OVERRIDE+=	clutter/clutter/mutter-clutter.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl-pango/mutter-cogl-pango.pc.in
@@ -25,17 +28,21 @@ PKGCONFIG_OVERRIDE+=	cogl/cogl-path/mutter-cogl-path.pc.in
 PKGCONFIG_OVERRIDE+=	cogl/cogl/mutter-cogl.pc.in
 PKGCONFIG_OVERRIDE+=	src/libmutter.pc.in
 
+# workaround for enums not being generated
+pre-build:
+	cd ${WRKSRC} && ninja -C output/ cogl/cogl-path/cogl-path-enum-types.h
+
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
-.include "../../wip/libinput/buildlink3.mk"
+#.include "../../wip/libinput/buildlink3.mk"
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../wip/gnome-desktop3/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../wip/gnome-settings-daemon/buildlink3.mk"
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../wip/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
 .include "../../wip/graphene/buildlink3.mk"
diff --git a/mutter/PLIST b/mutter/PLIST
index 57f93f81b0..c1bfccc3be 100644
--- a/mutter/PLIST
+++ b/mutter/PLIST
@@ -165,7 +165,6 @@ include/mutter-6/cogl/cogl/cogl-texture.h
 include/mutter-6/cogl/cogl/cogl-trace.h
 include/mutter-6/cogl/cogl/cogl-types.h
 include/mutter-6/cogl/cogl/cogl-version.h
-include/mutter-6/cogl/cogl/cogl-wayland-server.h
 include/mutter-6/cogl/cogl/cogl-xlib-renderer.h
 include/mutter-6/cogl/cogl/cogl-xlib.h
 include/mutter-6/cogl/cogl/cogl.h
@@ -260,15 +259,6 @@ lib/pkgconfig/mutter-clutter-x11-6.pc
 lib/pkgconfig/mutter-cogl-6.pc
 lib/pkgconfig/mutter-cogl-pango-6.pc
 lib/pkgconfig/mutter-cogl-path-6.pc
-libexec/installed-tests/mutter-6/cogl/conform/config.env
-libexec/installed-tests/mutter-6/cogl/conform/run-tests.sh
-libexec/installed-tests/mutter-6/cogl/conform/test-conformance
-libexec/installed-tests/mutter-6/cogl/conform/unit-tests
-libexec/installed-tests/mutter-6/mutter-headless-start-test
-libexec/installed-tests/mutter-6/mutter-test-client
-libexec/installed-tests/mutter-6/mutter-test-runner
-libexec/installed-tests/mutter-6/mutter-test-unit-tests
-libexec/installed-tests/mutter-6/wayland-test-clients/subsurface-remap-toplevel
 libexec/mutter-restart-helper
 man/man1/mutter.1
 share/GConf/gsettings/mutter-schemas.convert
@@ -277,10 +267,7 @@ share/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 share/glib-2.0/schemas/org.gnome.mutter.wayland.gschema.xml
 share/gnome-control-center/keybindings/50-mutter-navigation.xml
 share/gnome-control-center/keybindings/50-mutter-system.xml
-share/gnome-control-center/keybindings/50-mutter-wayland.xml
 share/gnome-control-center/keybindings/50-mutter-windows.xml
-share/installed-tests/mutter-6/mutter-all.test
-share/installed-tests/mutter-6/mutter-cogl.test
 share/locale/am/LC_MESSAGES/mutter.mo
 share/locale/ar/LC_MESSAGES/mutter.mo
 share/locale/as/LC_MESSAGES/mutter.mo
@@ -377,20 +364,3 @@ share/locale/yo/LC_MESSAGES/mutter.mo
 share/locale/zh_CN/LC_MESSAGES/mutter.mo
 share/locale/zh_HK/LC_MESSAGES/mutter.mo
 share/locale/zh_TW/LC_MESSAGES/mutter.mo
-share/mutter-6/tests/stacking/basic-wayland.metatest
-share/mutter-6/tests/stacking/basic-x11.metatest
-share/mutter-6/tests/stacking/client-side-decorated.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-parent.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest
-share/mutter-6/tests/stacking/closed-transient-no-input-parents.metatest
-share/mutter-6/tests/stacking/closed-transient-only-take-focus-parents.metatest
-share/mutter-6/tests/stacking/closed-transient.metatest
-share/mutter-6/tests/stacking/minimized.metatest
-share/mutter-6/tests/stacking/mixed-windows.metatest
-share/mutter-6/tests/stacking/override-redirect.metatest
-share/mutter-6/tests/stacking/set-override-redirect-parent.metatest
-share/mutter-6/tests/stacking/set-parent-exported.metatest
-share/mutter-6/tests/stacking/set-parent.metatest
diff --git a/mutter/distinfo b/mutter/distinfo
index 45ba7c4741..5c16fcd837 100644
--- a/mutter/distinfo
+++ b/mutter/distinfo
@@ -4,3 +4,4 @@ SHA1 (mutter-3.36.3.tar.xz) = 2ffb00f15331ab3aa38c7f76a1a2839b8713a27b
 RMD160 (mutter-3.36.3.tar.xz) = 9ba2ad9ad6394609c7b2bb6d0d4121c47f9cf1a5
 SHA512 (mutter-3.36.3.tar.xz) = df9f3428ce19d9fd8992b048fe047565e133bf790f7b28830afe697c4616b25a846a5267a72f07041cd2b75af685f8d56c4e876a8a40d49e1e0f60a4b99a790e
 Size (mutter-3.36.3.tar.xz) = 2684324 bytes
+SHA1 (patch-src_meson.build) = 3f19c844e0c0f16f3978b1c2a801adea699689a7
diff --git a/mutter/patches/patch-src_meson.build b/mutter/patches/patch-src_meson.build
new file mode 100644
index 0000000000..500674e810
--- /dev/null
+++ b/mutter/patches/patch-src_meson.build
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/meson.build.orig	2020-06-02 23:25:27.559633000 +0000
++++ src/meson.build
+@@ -892,6 +892,7 @@ libmutter = shared_library(libmutter_nam
+   c_args: mutter_c_args,
+   dependencies: [
+     libmutter_cogl_dep,
++    libmutter_cogl_path_dep,
+     libmutter_clutter_dep,
+     mutter_deps,
+   ],
Prev by Date: gnome-shell: wip/gnome-shell requires newer dependency versions
Next by Date: gnome-shell: Fix wip/gnome-shell build on NetBSD
Previous by Thread: gnome-shell: wip/gnome-shell requires newer dependency versions
Next by Thread: gnome-shell: Fix wip/gnome-shell build on NetBSD
Indexes:
Home | Main Index | Thread Index | Old Index