diff -Nru mutter-42.9/debian/changelog mutter-42.9/debian/changelog --- mutter-42.9/debian/changelog 2024-02-22 07:25:36.000000000 +0000 +++ mutter-42.9/debian/changelog 2024-03-01 09:47:40.000000000 +0000 @@ -1,3 +1,13 @@ +mutter (42.9-0ubuntu7) jammy; urgency=medium + + * Add build-Set-built-headers-as-libmutter_dep-sources.patch to prevent + occasional build failures depending on parallelism (LP: #2055530) + * Add cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch to + fix test failures in mutter:cogl+cogl/conform / framebuffer-get-bits + when Mesa >= 23.1.1 (LP: #2055519) + + -- Daniel van Vugt Fri, 01 Mar 2024 17:47:40 +0800 + mutter (42.9-0ubuntu6) jammy; urgency=medium [ Kai-Heng Feng ] diff -Nru mutter-42.9/debian/patches/build-Set-built-headers-as-libmutter_dep-sources.patch mutter-42.9/debian/patches/build-Set-built-headers-as-libmutter_dep-sources.patch --- mutter-42.9/debian/patches/build-Set-built-headers-as-libmutter_dep-sources.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-42.9/debian/patches/build-Set-built-headers-as-libmutter_dep-sources.patch 2024-03-01 09:47:40.000000000 +0000 @@ -0,0 +1,43 @@ +From: =?utf-8?q?Jonas_=C3=85dahl?= +Date: Thu, 11 May 2023 20:23:18 +0200 +Subject: build: Set built headers as libmutter_dep sources + +This should help avoiding compiling objects depending on built headers +to fail if they happen to be built before the sources are built. + +Part-of: + +Origin: Upstream commit 99a58be10481b5d1ca29ff4f4ca3e0091728f4b5 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2055530 +Forwarded: not-needed +Last-Update: 2024-03-01 +--- + src/meson.build | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/meson.build b/src/meson.build +index 13a69c1..c018f79 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1015,6 +1015,13 @@ subdir('meta') + + mutter_built_sources += mutter_enum_types + ++mutter_built_headers = [] ++foreach built_source : mutter_built_sources ++ if built_source.full_path().endswith('.h') ++ built_headers += [built_source] ++ endif ++endforeach ++ + libmutter = shared_library(libmutter_name, + mutter_sources, + mutter_built_sources, +@@ -1039,6 +1046,7 @@ libmutter = shared_library(libmutter_name, + libmutter_dep = declare_dependency( + link_with: libmutter, + include_directories: mutter_includes, ++ sources: mutter_built_headers, + dependencies: [ + libmutter_cogl_dep, + libmutter_clutter_dep, diff -Nru mutter-42.9/debian/patches/cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch mutter-42.9/debian/patches/cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch --- mutter-42.9/debian/patches/cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-42.9/debian/patches/cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch 2024-03-01 09:47:40.000000000 +0000 @@ -0,0 +1,37 @@ +From: Olivier Fourdan +Date: Fri, 2 Jun 2023 11:54:58 +0200 +Subject: cogl/gl-framebuffer: Fix inverted test in ensure_bits_initialized() + +Cogl's feature COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS is required +to use the GL_FRAMEBUFFER_ATTACHMENT_* queries. + +Unfortunately, the test for the availability of the private feature is +actually inverted in ensure_bits_initialized() which causes that whole +portion of code to be ignored, falling back to the glGetIntegerv() +method which isn't supported in core profiles. + +As Mesa has recently started to be more strict about these, this causes +the CI tests to fail in mutter. + +Origin: Upstream commit 71acd891c101d6c8beadd7763a99475650d6b7c2 +Bug: https://gitlab.gnome.org/GNOME/mutter/-/issues/2848 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2055519 +Forwarded: not-needed +Last-Update: 2024-03-01 +--- + cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c +index c8db6a2..7cc5377 100644 +--- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c ++++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c +@@ -76,7 +76,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) + COGL_FRAMEBUFFER_STATE_BIND); + + #ifdef HAVE_COGL_GL +- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) ++ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) + { + const struct { + GLenum attachment, pname; diff -Nru mutter-42.9/debian/patches/series mutter-42.9/debian/patches/series --- mutter-42.9/debian/patches/series 2024-02-22 07:25:36.000000000 +0000 +++ mutter-42.9/debian/patches/series 2024-03-01 09:47:40.000000000 +0000 @@ -16,3 +16,5 @@ Revert-data-udev-Don-t-disable-KMS-modifiers-on-newer-i91.patch gen_default_modes-Consider-reduced-blanking-with-lower-pi.patch compositor-x11-Sync-again-at-the-end-of-before_paint.patch +build-Set-built-headers-as-libmutter_dep-sources.patch +cogl-gl-framebuffer-Fix-inverted-test-in-ensure_bits_init.patch