[PATCH gnome-team 0/4] Update mutter

  • Done
  • quality assurance status badge
Details
3 participants
  • Liliana Marie Prikler
  • Maxim Cournoyer
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal
V
V
Vivien Kraus wrote on 26 Nov 2023 23:52
(address . guix-patches@gnu.org)
cover.1701039139.git.vivien@planete-kraus.eu
Dear guix,

While trying to fix the test failures earlier today, I tried upgrading mutter
to 45.1. I keep it here because it might be helpful later, if not merged now.

Best regards,

Vivien

Vivien Kraus (4):
gnu: mutter: Update to 44.5.
gnu: Add munit.
gnu: Add libei.
gnu: mutter: Update to 45.1.

gnu/local.mk | 1 -
gnu/packages/check.scm | 31 ++
gnu/packages/freedesktop.scm | 40 +++
gnu/packages/gnome.scm | 10 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
5 files changed, 75 insertions(+), 297 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch


base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
V
V
Vivien Kraus wrote on 25 Nov 2023 16:11
[PATCH gnome-team 1/4] gnu: mutter: Update to 44.5.
(address . 67464@debbugs.gnu.org)
49f8e54de14c54d0d24eb9bedb0d06fd4b3b14fd.1701039139.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 44.5.
[inputs]: Replace sysprof with sysprof-3.44.
[patches]: Drop patches.
* gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch.
* gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.

Change-Id: Ibe2f578409c7e0bd3cd902525638be2dec124094
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 9 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
3 files changed, 3 insertions(+), 297 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch

Toggle diff (344 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..e382235de1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1671,7 +1671,6 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
- %D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nanosvg-prusa-slicer.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..f6fc80d4d8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7789,7 +7789,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.3")
+ (version "44.5")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7797,10 +7797,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q"))
- ;; TODO: Remove on update as this was merged upstream. See
- ;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
- (patches (search-patches "mutter-fix-inverted-test.patch"))))
+ "0ycnsap8q7ah2dj33956pl1g8ivdxn1m4valfyqg4qpbcpny0izj"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7979,7 +7976,7 @@ (define-public mutter
libxtst
pipewire
startup-notification
- sysprof
+ sysprof-3.44
upower
xkeyboard-config
xorg-server-xwayland
diff --git a/gnu/packages/patches/mutter-fix-inverted-test.patch b/gnu/packages/patches/mutter-fix-inverted-test.patch
deleted file mode 100644
index 3676b31def..0000000000
--- a/gnu/packages/patches/mutter-fix-inverted-test.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 5a83e8ef8250526a40e8e69c6398f990ab482b2f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:42:51 +0200
-Subject: [PATCH 1/5] cogl/gl-framebuffer: Fix spurious trailing spaces
-
-Purely cosmetic fix, no functional change.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 12 ++++++------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 12 ++++++------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index d6609bb2074..8d76f1578bf 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -72,32 +72,32 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index c8db6a23a29..1ffc1d53509 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -82,32 +82,32 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
---
-GitLab
-
-
-From a2203df9f43b9e501a972d23b3d5584005c03ce6 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 11:54:58 +0200
-Subject: [PATCH 2/5] 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.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- 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 1ffc1d53509..75a8b0c1fe2 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;
---
-GitLab
-
-
-From fad240f437d6b11f664c9c09aecabe5f5e703eca Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:31:38 +0200
-Subject: [PATCH 3/5] cogl/gl-framebuffer: Match testing features
-
-The function ensure_bits_initialized() in cogl-gl-framebuffer-fbo.c
-checks for COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS whereas the same
-in cogl-gl-framebuffer-back.c simply checks for the driver being
-COGL_DRIVER_GL3.
-
-Change the later to use the COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS
-flag as well.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 8d76f1578bf..f6a17e8f070 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -66,7 +66,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- COGL_FRAMEBUFFER_STATE_BIND);
-
- #ifdef HAVE_COGL_GL
-- if (ctx->driver == COGL_DRIVER_GL3)
-+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
- GLenum attachment, pname;
---
-GitLab
-
-
-From c3af4c1b1571b05f67d48b90d9ea7313f3ca6003 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:27:29 +0200
-Subject: [PATCH 4/5] cogl/gl-framebuffer: Fail without QUERY_FRAMEBUFFER_BITS
-
-glGetIntegerv() with GL_RED_BITS/GL_GREEN_BITS/GL_BLUE_BITS/etc. is not
-supported with the GL core context, so there is no point in falling back
-to that without supporting COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS,
-as this will cause an GL error.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 7 +------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index f6a17e8f070..0ccd2324077 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -119,12 +119,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- COGL_NOTE (FRAMEBUFFER,
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 75a8b0c1fe2..524196207f5 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -129,12 +129,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES) &&
---
-GitLab
-
-
-From d65883e0d7d70987e3888b86222b109c35f5a7a2 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:38:41 +0200
-Subject: [PATCH 5/5] cogl/gl-framebuffer: Remove conditional on HAVE_COGL_GL
-
-By testing the features flag, we can get rid of the conditional build
-on HAVE_COGL_GL entirely.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 --
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 0ccd2324077..94154d48efb 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -117,7 +116,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 524196207f5..3ea133d3143 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -75,7 +75,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -127,7 +126,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
---
-GitLab
-
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:03
[PATCH gnome-team 2/4] gnu: Add munit.
(address . 67464@debbugs.gnu.org)
c622107e77ac86786dae25e266e0e401d8b19f2d.1701039139.git.vivien@planete-kraus.eu
* gnu/packages/check.scm (munit): New variable.

Change-Id: I193e55ef4ceec1d62f595dd779f7b3d76154fad4
---
gnu/packages/check.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

Toggle diff (41 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1f5b886977..6a868ba477 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3648,3 +3648,34 @@ (define-public subunit
command line filters to process a subunit stream and language bindings for
Python, C, C++ and shell. Bindings are easy to write for other languages.")
(license (list license:asl2.0 license:bsd-3)))) ;user can pick
+
+(define-public munit
+ (package
+ (name "munit")
+ ;; No release for years, https://github.com/nemequ/munit/issues/95
+ (version "0.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemequ/munit")
+ (commit "fbbdf1467eb0d04a6ee465def2e529e4c87f2118")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13725v4pps2bpndniksa58nqi9gvx0f0900k0rqvp95bxw5z8vda"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-installability
+ ;; See https://github.com/nemequ/munit/pull/67
+ (lambda _
+ (substitute* "meson.build"
+ (("install: meson.is_subproject\\(\\)")
+ "install: not meson.is_subproject()")))))))
+ (synopsis "Small unit testing framework for C")
+ (description
+ "µnit is a small testing framework for C.")
+ (home-page "https://nemequ.github.io/munit/")
+ (license license:x11)))
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:03
[PATCH gnome-team 3/4] gnu: Add libei.
(address . 67464@debbugs.gnu.org)
4b950299eb4f1a5f965912982bfd11d19c3ce898.1701039139.git.vivien@planete-kraus.eu
* gnu/packages/freedesktop.scm (libei): New variable.

Change-Id: I83f5826ca691446194501f75f90c7babcd564f8c
---
gnu/packages/freedesktop.scm | 40 ++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)

Toggle diff (53 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 25b7998d05..d7fe203728 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -736,6 +736,46 @@ (define-public libinput-minimal
"-Ddebug-gui=false" ;requires gtk+@3
,flags))))))
+(define-public libei
+ (package
+ (name "libei")
+ (version "1.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/libinput/libei.git")
+ (commit version)))
+ (sha256
+ (base32
+ "0j1xplvi81h5lmg7qxm7vazh76b3k68vnbpv1iag1b4ps7cmkdkr"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (substitute* "test/meson.build"
+ (("subproject\\('munit'")
+ "# subproject('munit'")
+ ((", fallback: \\['munit', 'munit_dep'\\]")
+ ""))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:configure-flags #~'("-Ddocumentation=api" ;protocol requires hugo
+ "-Dsd-bus-provider=libelogind")))
+ (inputs
+ (list elogind libevdev libxkbcommon))
+ (propagated-inputs
+ ;; liboeffis-1.0.pc requires.private libelogind
+ (list elogind))
+ (native-inputs
+ (list doxygen libxml2 munit pkg-config python python-attrs python-black python-dbusmock python-jinja2 python-pytest python-structlog valgrind/interactive))
+ (home-page "https://libinput.pages.freedesktop.org/libei/")
+ (synopsis "Emulated Input protocol implementation")
+ (description
+ "Libei provides a client and server implementation of the @acronym{EI,Emulated
+Input} protocol for Wayland compositors.")
+ (license license:x11)))
+
(define-public libxdg-basedir
(package
(name "libxdg-basedir")
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:06
[PATCH gnome-team 4/4] gnu: mutter: Update to 45.1.
(address . 67464@debbugs.gnu.org)
7546557479fa33233e69642d01c14198a9c80849.1701039139.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 45.1.
[#:configure-flags]: Update runpath override to /lib/mutter-13.
[inputs]: Add libei. Replace sysprof-3.44 with sysprof.

Change-Id: I7e7e14560f5ece106f4adb838d28cf2ae91ca3c5
---
gnu/packages/gnome.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

Toggle diff (50 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f6fc80d4d8..2e62bb21ec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7789,7 +7789,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.5")
+ (version "45.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7797,7 +7797,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0ycnsap8q7ah2dj33956pl1g8ivdxn1m4valfyqg4qpbcpny0izj"))))
+ "0b11vacpkarahbrh7pd4nhsynbxb3ad8ic8w65wnrdrdnbpwblrc"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7814,7 +7814,7 @@ (define-public mutter
;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath="
#$output "/lib,-rpath="
- #$output "/lib/mutter-12")
+ #$output "/lib/mutter-13")
;; Disable systemd support.
"-Dsystemd=false"
;; Don't install tests.
@@ -7946,6 +7946,7 @@ (define-public mutter
gdk-pixbuf
glib
json-glib
+ libei
libinput
libx11
libxcomposite
@@ -7976,7 +7977,7 @@ (define-public mutter
libxtst
pipewire
startup-notification
- sysprof-3.44
+ sysprof
upower
xkeyboard-config
xorg-server-xwayland
--
2.41.0
V
V
Vivien Kraus wrote on 27 Nov 2023 18:52
[PATCH gnome-team v2 0/4] Update mutter (better)
(address . 67464@debbugs.gnu.org)
cover.1701107559.git.vivien@planete-kraus.eu
Dear guix,

I changed a couple of things. First, I don’t need sysprof-3.44. Then, I
removed the gtk+ propagated input. And finally, I updated the
propagated-inputs comments.

Best regards,

Vivien

Vivien Kraus (4):
gnu: mutter: Update to 44.6.
gnu: Add munit.
gnu: Add libei.
gnu: mutter: Update to 45.1.

gnu/local.mk | 1 -
gnu/packages/check.scm | 31 ++
gnu/packages/freedesktop.scm | 40 +++
gnu/packages/gnome.scm | 15 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
5 files changed, 77 insertions(+), 300 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch


base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:03
[PATCH gnome-team v2 3/4] gnu: Add libei.
(address . 67464@debbugs.gnu.org)
f71f6029d985e17b6080a67405475cf1a37a34bb.1701107559.git.vivien@planete-kraus.eu
* gnu/packages/freedesktop.scm (libei): New variable.

Change-Id: I83f5826ca691446194501f75f90c7babcd564f8c
---
gnu/packages/freedesktop.scm | 40 ++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)

Toggle diff (53 lines)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 25b7998d05..d7fe203728 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -736,6 +736,46 @@ (define-public libinput-minimal
"-Ddebug-gui=false" ;requires gtk+@3
,flags))))))
+(define-public libei
+ (package
+ (name "libei")
+ (version "1.1.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.freedesktop.org/libinput/libei.git")
+ (commit version)))
+ (sha256
+ (base32
+ "0j1xplvi81h5lmg7qxm7vazh76b3k68vnbpv1iag1b4ps7cmkdkr"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (substitute* "test/meson.build"
+ (("subproject\\('munit'")
+ "# subproject('munit'")
+ ((", fallback: \\['munit', 'munit_dep'\\]")
+ ""))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:configure-flags #~'("-Ddocumentation=api" ;protocol requires hugo
+ "-Dsd-bus-provider=libelogind")))
+ (inputs
+ (list elogind libevdev libxkbcommon))
+ (propagated-inputs
+ ;; liboeffis-1.0.pc requires.private libelogind
+ (list elogind))
+ (native-inputs
+ (list doxygen libxml2 munit pkg-config python python-attrs python-black python-dbusmock python-jinja2 python-pytest python-structlog valgrind/interactive))
+ (home-page "https://libinput.pages.freedesktop.org/libei/")
+ (synopsis "Emulated Input protocol implementation")
+ (description
+ "Libei provides a client and server implementation of the @acronym{EI,Emulated
+Input} protocol for Wayland compositors.")
+ (license license:x11)))
+
(define-public libxdg-basedir
(package
(name "libxdg-basedir")
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:06
[PATCH gnome-team v2 4/4] gnu: mutter: Update to 45.1.
(address . 67464@debbugs.gnu.org)
469b5c409f160de4da910cb10871528a2a48af90.1701107559.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 45.1.
[#:configure-flags]: Update runpath override to /lib/mutter-13.
[propagated-inputs]: Update comments.
[inputs]: Add libei.

Change-Id: I7e7e14560f5ece106f4adb838d28cf2ae91ca3c5
---
gnu/packages/gnome.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Toggle diff (52 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 416db8e6f6..4875103feb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7789,7 +7789,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.6")
+ (version "45.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7797,7 +7797,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0qlnjmq83g2bbkvigsaj7qw8gxbij4w37fpg1vywg43zcc1s2s7c"))))
+ "0b11vacpkarahbrh7pd4nhsynbxb3ad8ic8w65wnrdrdnbpwblrc"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7814,7 +7814,7 @@ (define-public mutter
;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath="
#$output "/lib,-rpath="
- #$output "/lib/mutter-12")
+ #$output "/lib/mutter-13")
;; Disable systemd support.
"-Dsystemd=false"
;; Don't install tests.
@@ -7937,8 +7937,8 @@ (define-public mutter
python-dbus
python-dbusmock))
(propagated-inputs
- (list gsettings-desktop-schemas ;required by libmutter-12.pc
- ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
+ (list gsettings-desktop-schemas ;required by libmutter-13.pc
+ ;; mutter-clutter-13.pc and mutter-cogl-13.pc refer to these:
at-spi2-core
cairo
eudev
@@ -7966,6 +7966,7 @@ (define-public mutter
gnome-settings-daemon
graphene
libcanberra
+ libei
libgudev
libice
libsm
--
2.41.0
V
V
Vivien Kraus wrote on 25 Nov 2023 16:11
[PATCH gnome-team v2 1/4] gnu: mutter: Update to 44.6.
(address . 67464@debbugs.gnu.org)
4a83b23a0dd8875d7a0d0d58b0fd9f666aa56c0d.1701107559.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 44.6.
[propagated-inputs]: Remove gtk+. Update comment.
[patches]: Drop patches.
* gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch.
* gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.

Change-Id: Ibe2f578409c7e0bd3cd902525638be2dec124094
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 12 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
3 files changed, 4 insertions(+), 299 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch

Toggle diff (347 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..e382235de1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1671,7 +1671,6 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
- %D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nanosvg-prusa-slicer.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..416db8e6f6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7789,7 +7789,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.3")
+ (version "44.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7797,10 +7797,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q"))
- ;; TODO: Remove on update as this was merged upstream. See
- ;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
- (patches (search-patches "mutter-fix-inverted-test.patch"))))
+ "0qlnjmq83g2bbkvigsaj7qw8gxbij4w37fpg1vywg43zcc1s2s7c"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7940,9 +7937,8 @@ (define-public mutter
python-dbus
python-dbusmock))
(propagated-inputs
- (list gsettings-desktop-schemas ;required by libmutter.pc
- gtk+ ;required by libmutter.pc
- ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
+ (list gsettings-desktop-schemas ;required by libmutter-12.pc
+ ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
at-spi2-core
cairo
eudev
diff --git a/gnu/packages/patches/mutter-fix-inverted-test.patch b/gnu/packages/patches/mutter-fix-inverted-test.patch
deleted file mode 100644
index 3676b31def..0000000000
--- a/gnu/packages/patches/mutter-fix-inverted-test.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 5a83e8ef8250526a40e8e69c6398f990ab482b2f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:42:51 +0200
-Subject: [PATCH 1/5] cogl/gl-framebuffer: Fix spurious trailing spaces
-
-Purely cosmetic fix, no functional change.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 12 ++++++------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 12 ++++++------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index d6609bb2074..8d76f1578bf 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -72,32 +72,32 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index c8db6a23a29..1ffc1d53509 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -82,32 +82,32 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
---
-GitLab
-
-
-From a2203df9f43b9e501a972d23b3d5584005c03ce6 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 11:54:58 +0200
-Subject: [PATCH 2/5] 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.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- 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 1ffc1d53509..75a8b0c1fe2 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;
---
-GitLab
-
-
-From fad240f437d6b11f664c9c09aecabe5f5e703eca Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:31:38 +0200
-Subject: [PATCH 3/5] cogl/gl-framebuffer: Match testing features
-
-The function ensure_bits_initialized() in cogl-gl-framebuffer-fbo.c
-checks for COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS whereas the same
-in cogl-gl-framebuffer-back.c simply checks for the driver being
-COGL_DRIVER_GL3.
-
-Change the later to use the COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS
-flag as well.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 8d76f1578bf..f6a17e8f070 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -66,7 +66,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- COGL_FRAMEBUFFER_STATE_BIND);
-
- #ifdef HAVE_COGL_GL
-- if (ctx->driver == COGL_DRIVER_GL3)
-+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
- GLenum attachment, pname;
---
-GitLab
-
-
-From c3af4c1b1571b05f67d48b90d9ea7313f3ca6003 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:27:29 +0200
-Subject: [PATCH 4/5] cogl/gl-framebuffer: Fail without QUERY_FRAMEBUFFER_BITS
-
-glGetIntegerv() with GL_RED_BITS/GL_GREEN_BITS/GL_BLUE_BITS/etc. is not
-supported with the GL core context, so there is no point in falling back
-to that without supporting COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS,
-as this will cause an GL error.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 7 +------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index f6a17e8f070..0ccd2324077 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -119,12 +119,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- COGL_NOTE (FRAMEBUFFER,
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 75a8b0c1fe2..524196207f5 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -129,12 +129,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES) &&
---
-GitLab
-
-
-From d65883e0d7d70987e3888b86222b109c35f5a7a2 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:38:41 +0200
-Subject: [PATCH 5/5] cogl/gl-framebuffer: Remove conditional on HAVE_COGL_GL
-
-By testing the features flag, we can get rid of the conditional build
-on HAVE_COGL_GL entirely.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 --
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 0ccd2324077..94154d48efb 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -117,7 +116,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 524196207f5..3ea133d3143 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -75,7 +75,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -127,7 +126,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
---
-GitLab
-
--
2.41.0
V
V
Vivien Kraus wrote on 26 Nov 2023 16:03
[PATCH gnome-team v2 2/4] gnu: Add munit.
(address . 67464@debbugs.gnu.org)
395910656e7754a5d7371857650272cb19650e48.1701107559.git.vivien@planete-kraus.eu
* gnu/packages/check.scm (munit): New variable.

Change-Id: I193e55ef4ceec1d62f595dd779f7b3d76154fad4
---
gnu/packages/check.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

Toggle diff (41 lines)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 1f5b886977..6a868ba477 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3648,3 +3648,34 @@ (define-public subunit
command line filters to process a subunit stream and language bindings for
Python, C, C++ and shell. Bindings are easy to write for other languages.")
(license (list license:asl2.0 license:bsd-3)))) ;user can pick
+
+(define-public munit
+ (package
+ (name "munit")
+ ;; No release for years, https://github.com/nemequ/munit/issues/95
+ (version "0.2.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nemequ/munit")
+ (commit "fbbdf1467eb0d04a6ee465def2e529e4c87f2118")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13725v4pps2bpndniksa58nqi9gvx0f0900k0rqvp95bxw5z8vda"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-installability
+ ;; See https://github.com/nemequ/munit/pull/67
+ (lambda _
+ (substitute* "meson.build"
+ (("install: meson.is_subproject\\(\\)")
+ "install: not meson.is_subproject()")))))))
+ (synopsis "Small unit testing framework for C")
+ (description
+ "µnit is a small testing framework for C.")
+ (home-page "https://nemequ.github.io/munit/")
+ (license license:x11)))
--
2.41.0
V
V
Vivien Kraus wrote on 27 Nov 2023 18:55
Re: [PATCH gnome-team v2 0/4] Update mutter (better)
(address . 67464@debbugs.gnu.org)
aa8e260a95db602eced27985b989a2ad8d14cf7c.camel@planete-kraus.eu
Le lundi 27 novembre 2023 à 18:52 +0100, Vivien Kraus a écrit :
Toggle quote (5 lines)
> I changed a couple of things.  First, I don’t need sysprof-3.44. 
> Then, I
> removed the gtk+ propagated input.  And finally, I updated the
> propagated-inputs comments.

I forgot to say, the first update step is now to 44.6 instead of 44.5.
Sorry.
L
L
Liliana Marie Prikler wrote on 27 Nov 2023 18:57
66f75ee830709cc86ffeb8613ba392597aacaf7a.camel@gmail.com
Am Montag, dem 27.11.2023 um 18:52 +0100 schrieb Vivien Kraus:
Toggle quote (15 lines)
> Dear guix,
>
> I changed a couple of things.  First, I don’t need sysprof-3.44. 
> Then, I removed the gtk+ propagated input.  And finally, I updated
> the propagated-inputs comments.
>
> Best regards,
>
> Vivien
>
> Vivien Kraus (4):
>   gnu: mutter: Update to 44.6.
>   gnu: Add munit.
>   gnu: Add libei.
>   gnu: mutter: Update to 45.1.
Are we targeting GNOME 44 or GNOME 45 here? I don't want to delay
rollout of gnome-team even further by moving the goalpost. Note that
44.7 and 45.2 tarballs should go out this weekend, so no micro-updates
if possible.

Cheers
V
V
Vivien Kraus wrote on 27 Nov 2023 19:10
1ec9978f45932979c955643fddf32faec9dbb24f.camel@planete-kraus.eu
Le lundi 27 novembre 2023 à 18:57 +0100, Liliana Marie Prikler a
écrit :
Toggle quote (7 lines)
> > Vivien Kraus (4):
> >   gnu: mutter: Update to 44.6.
> >   gnu: Add munit.
> >   gnu: Add libei.
> >   gnu: mutter: Update to 45.1.
> Are we targeting GNOME 44 or GNOME 45 here?  I don't want to delay
> rollout of gnome-team even further by moving the goalpost.
In order to try and solve the earlier mutter test failure, I tried
different things and at one point I tried the 45.1 update. I don’t
like to waste so I sent it here, but maybe we could be wiser and keep
it for later.

Toggle quote (2 lines)
> Note that 44.7 and 45.2 tarballs should go out this weekend, so no
> micro-updates if possible.
I’m not sure what the end of your sentence means. Should we stay with
44.5? 44.6? Should we wait for 44.7?

Best regards,

Vivien
L
L
Liliana Marie Prikler wrote on 27 Nov 2023 20:20
209911ae14f10dfccc1489205d094a4509814067.camel@gmail.com
Am Montag, dem 27.11.2023 um 19:10 +0100 schrieb Vivien Kraus:
Toggle quote (13 lines)
> Le lundi 27 novembre 2023 à 18:57 +0100, Liliana Marie Prikler a
> écrit :
> > > Vivien Kraus (4):
> > >   gnu: mutter: Update to 44.6.
> > >   gnu: Add munit.
> > >   gnu: Add libei.
> > >   gnu: mutter: Update to 45.1.
> > Are we targeting GNOME 44 or GNOME 45 here?  I don't want to delay
> > rollout of gnome-team even further by moving the goalpost.
> In order to try and solve the earlier mutter test failure, I tried
> different things and at one point I tried the 45.1 update.  I don’t
> like to waste so I sent it here, but maybe we could be wiser and keep
> it for later.
You will have to consider other parts of the stack as well, and with
mutter 45 bumping the library version once again I doubt that we'll
find a compatible gnome-shell 44. On that note, we should look into
updating gnome-shell etc. too.

Toggle quote (4 lines)
> > Note that 44.7 and 45.2 tarballs should go out this weekend, so no
> > micro-updates if possible.
> I’m not sure what the end of your sentence means. Should we stay with
> 44.5? 44.6? Should we wait for 44.7?
I'd wait for 44.7 and then update to that.

Cheers
V
V
Vivien Kraus wrote on 25 Nov 2023 16:11
[PATCH gnome-team v3] gnu: mutter: Update to 44.7.
89a967ea4911011708dabbf736b5bae5bba9c4ee.1701609150.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 44.7.
[propagated-inputs]: Remove gtk+. Update comment.
[patches]: Drop patches.
* gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch.
* gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.

Change-Id: Ibe2f578409c7e0bd3cd902525638be2dec124094
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 12 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
3 files changed, 4 insertions(+), 299 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch

Toggle diff (349 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..e382235de1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1671,7 +1671,6 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
- %D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nanosvg-prusa-slicer.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..84a237d9f3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7789,7 +7789,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.3")
+ (version "44.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7797,10 +7797,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q"))
- ;; TODO: Remove on update as this was merged upstream. See
- ;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
- (patches (search-patches "mutter-fix-inverted-test.patch"))))
+ "1a0j1ygph6bz83da4gr2z02xqf2l5y1x10482vyh3d34arqhph26"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7940,9 +7937,8 @@ (define-public mutter
python-dbus
python-dbusmock))
(propagated-inputs
- (list gsettings-desktop-schemas ;required by libmutter.pc
- gtk+ ;required by libmutter.pc
- ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
+ (list gsettings-desktop-schemas ;required by libmutter-12.pc
+ ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
at-spi2-core
cairo
eudev
diff --git a/gnu/packages/patches/mutter-fix-inverted-test.patch b/gnu/packages/patches/mutter-fix-inverted-test.patch
deleted file mode 100644
index 3676b31def..0000000000
--- a/gnu/packages/patches/mutter-fix-inverted-test.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 5a83e8ef8250526a40e8e69c6398f990ab482b2f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:42:51 +0200
-Subject: [PATCH 1/5] cogl/gl-framebuffer: Fix spurious trailing spaces
-
-Purely cosmetic fix, no functional change.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 12 ++++++------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 12 ++++++------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index d6609bb2074..8d76f1578bf 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -72,32 +72,32 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index c8db6a23a29..1ffc1d53509 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -82,32 +82,32 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
---
-GitLab
-
-
-From a2203df9f43b9e501a972d23b3d5584005c03ce6 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 11:54:58 +0200
-Subject: [PATCH 2/5] 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.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- 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 1ffc1d53509..75a8b0c1fe2 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;
---
-GitLab
-
-
-From fad240f437d6b11f664c9c09aecabe5f5e703eca Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:31:38 +0200
-Subject: [PATCH 3/5] cogl/gl-framebuffer: Match testing features
-
-The function ensure_bits_initialized() in cogl-gl-framebuffer-fbo.c
-checks for COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS whereas the same
-in cogl-gl-framebuffer-back.c simply checks for the driver being
-COGL_DRIVER_GL3.
-
-Change the later to use the COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS
-flag as well.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 8d76f1578bf..f6a17e8f070 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -66,7 +66,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- COGL_FRAMEBUFFER_STATE_BIND);
-
- #ifdef HAVE_COGL_GL
-- if (ctx->driver == COGL_DRIVER_GL3)
-+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
- GLenum attachment, pname;
---
-GitLab
-
-
-From c3af4c1b1571b05f67d48b90d9ea7313f3ca6003 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:27:29 +0200
-Subject: [PATCH 4/5] cogl/gl-framebuffer: Fail without QUERY_FRAMEBUFFER_BITS
-
-glGetIntegerv() with GL_RED_BITS/GL_GREEN_BITS/GL_BLUE_BITS/etc. is not
-supported with the GL core context, so there is no point in falling back
-to that without supporting COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS,
-as this will cause an GL error.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 7 +------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index f6a17e8f070..0ccd2324077 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -119,12 +119,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- COGL_NOTE (FRAMEBUFFER,
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 75a8b0c1fe2..524196207f5 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -129,12 +129,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES) &&
---
-GitLab
-
-
-From d65883e0d7d70987e3888b86222b109c35f5a7a2 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:38:41 +0200
-Subject: [PATCH 5/5] cogl/gl-framebuffer: Remove conditional on HAVE_COGL_GL
-
-By testing the features flag, we can get rid of the conditional build
-on HAVE_COGL_GL entirely.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 --
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 0ccd2324077..94154d48efb 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -117,7 +116,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 524196207f5..3ea133d3143 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -75,7 +75,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -127,7 +126,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
---
-GitLab
-

base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
M
M
Maxim Cournoyer wrote on 3 Dec 2023 17:32
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)
87edg34574.fsf@gmail.com
Hello,

Vivien Kraus <vivien@planete-kraus.eu> writes:

Toggle quote (4 lines)
> * gnu/packages/gnome.scm (mutter): Update to 44.7.
> [propagated-inputs]: Remove gtk+. Update comment.
> [patches]: Drop patches.

nitpick: I'd use [source]: Remove patches.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

--
Thanks,
Maxim
V
V
Vivien Kraus wrote on 25 Nov 2023 16:11
[PATCH gnome-team v4] gnu: mutter: Update to 44.7.
180df691366cfcc4f17557863cc3c1ab70feef40.1701626487.git.vivien@planete-kraus.eu
* gnu/packages/gnome.scm (mutter): Update to 44.7.
[propagated-inputs]: Remove gtk+. Update comment.
[source]: Remove patches.
* gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch.
* gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.

Change-Id: Ibe2f578409c7e0bd3cd902525638be2dec124094
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 12 +-
.../patches/mutter-fix-inverted-test.patch | 290 ------------------
3 files changed, 4 insertions(+), 299 deletions(-)
delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch

Toggle diff (349 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 93477f830b..e9c147c6fc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1677,7 +1677,6 @@ dist_patch_DATA = \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
- %D%/packages/patches/mutter-fix-inverted-test.patch \
%D%/packages/patches/mutt-store-references.patch \
%D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \
%D%/packages/patches/nanosvg-prusa-slicer.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..5abc66c7f0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7809,7 +7809,7 @@ (define-public zenity
(define-public mutter
(package
(name "mutter")
- (version "44.3")
+ (version "44.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7817,10 +7817,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q"))
- ;; TODO: Remove on update as this was merged upstream. See
- ;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
- (patches (search-patches "mutter-fix-inverted-test.patch"))))
+ "1a0j1ygph6bz83da4gr2z02xqf2l5y1x10482vyh3d34arqhph26"))))
;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
;; versions of cogl and clutter. As a result, many of the inputs,
;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -7960,9 +7957,8 @@ (define-public mutter
python-dbus
python-dbusmock))
(propagated-inputs
- (list gsettings-desktop-schemas ;required by libmutter.pc
- gtk+ ;required by libmutter.pc
- ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these:
+ (list gsettings-desktop-schemas ;required by libmutter-12.pc
+ ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
at-spi2-core
cairo
eudev
diff --git a/gnu/packages/patches/mutter-fix-inverted-test.patch b/gnu/packages/patches/mutter-fix-inverted-test.patch
deleted file mode 100644
index 3676b31def..0000000000
--- a/gnu/packages/patches/mutter-fix-inverted-test.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 5a83e8ef8250526a40e8e69c6398f990ab482b2f Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:42:51 +0200
-Subject: [PATCH 1/5] cogl/gl-framebuffer: Fix spurious trailing spaces
-
-Purely cosmetic fix, no functional change.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 12 ++++++------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 12 ++++++------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index d6609bb2074..8d76f1578bf 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -72,32 +72,32 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_BACK_LEFT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index c8db6a23a29..1ffc1d53509 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -82,32 +82,32 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- GLenum attachment, pname;
- size_t offset;
- } params[] = {
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE,
- .offset = offsetof (CoglFramebufferBits, red),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE,
- .offset = offsetof (CoglFramebufferBits, green),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE,
- .offset = offsetof (CoglFramebufferBits, blue),
- },
-- {
-+ {
- .attachment = GL_COLOR_ATTACHMENT0,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE,
- .offset = offsetof (CoglFramebufferBits, alpha),
- },
-- {
-+ {
- .attachment = GL_DEPTH_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE,
- .offset = offsetof (CoglFramebufferBits, depth),
- },
-- {
-+ {
- .attachment = GL_STENCIL_ATTACHMENT,
- .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE,
- .offset = offsetof (CoglFramebufferBits, stencil),
---
-GitLab
-
-
-From a2203df9f43b9e501a972d23b3d5584005c03ce6 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 11:54:58 +0200
-Subject: [PATCH 2/5] 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.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- 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 1ffc1d53509..75a8b0c1fe2 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;
---
-GitLab
-
-
-From fad240f437d6b11f664c9c09aecabe5f5e703eca Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:31:38 +0200
-Subject: [PATCH 3/5] cogl/gl-framebuffer: Match testing features
-
-The function ensure_bits_initialized() in cogl-gl-framebuffer-fbo.c
-checks for COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS whereas the same
-in cogl-gl-framebuffer-back.c simply checks for the driver being
-COGL_DRIVER_GL3.
-
-Change the later to use the COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS
-flag as well.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 8d76f1578bf..f6a17e8f070 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -66,7 +66,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- COGL_FRAMEBUFFER_STATE_BIND);
-
- #ifdef HAVE_COGL_GL
-- if (ctx->driver == COGL_DRIVER_GL3)
-+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
- GLenum attachment, pname;
---
-GitLab
-
-
-From c3af4c1b1571b05f67d48b90d9ea7313f3ca6003 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri, 2 Jun 2023 14:27:29 +0200
-Subject: [PATCH 4/5] cogl/gl-framebuffer: Fail without QUERY_FRAMEBUFFER_BITS
-
-glGetIntegerv() with GL_RED_BITS/GL_GREEN_BITS/GL_BLUE_BITS/etc. is not
-supported with the GL core context, so there is no point in falling back
-to that without supporting COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS,
-as this will cause an GL error.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 7 +------
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 7 +------
- 2 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index f6a17e8f070..0ccd2324077 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -119,12 +119,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- COGL_NOTE (FRAMEBUFFER,
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 75a8b0c1fe2..524196207f5 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -129,12 +129,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- else
- #endif /* HAVE_COGL_GL */
- {
-- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red));
-- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green));
-- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue));
-- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha));
-- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth));
-- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil));
-+ return FALSE;
- }
-
- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES) &&
---
-GitLab
-
-
-From d65883e0d7d70987e3888b86222b109c35f5a7a2 Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 5 Jun 2023 10:38:41 +0200
-Subject: [PATCH 5/5] cogl/gl-framebuffer: Remove conditional on HAVE_COGL_GL
-
-By testing the features flag, we can get rid of the conditional build
-on HAVE_COGL_GL entirely.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>
----
- cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 --
- cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-index 0ccd2324077..94154d48efb 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c
-@@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -117,7 +116,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
-diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-index 524196207f5..3ea133d3143 100644
---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c
-@@ -75,7 +75,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- framebuffer,
- COGL_FRAMEBUFFER_STATE_BIND);
-
--#ifdef HAVE_COGL_GL
- if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS))
- {
- const struct {
-@@ -127,7 +126,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo)
- }
- }
- else
--#endif /* HAVE_COGL_GL */
- {
- return FALSE;
- }
---
-GitLab
-

base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
--
2.41.0
M
M
Maxim Cournoyer wrote on 3 Dec 2023 19:42
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)
87il5fyvo7.fsf@gmail.com
Vivien Kraus <vivien@planete-kraus.eu> writes:

Toggle quote (6 lines)
> * gnu/packages/gnome.scm (mutter): Update to 44.7.
> [propagated-inputs]: Remove gtk+. Update comment.
> [source]: Remove patches.
> * gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch.
> * gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 19 Dec 2023 23:56
d2354c353f5b2d814e7bde1a27f42bfea36c24b6.camel@gmail.com
Am Sonntag, dem 03.12.2023 um 13:42 -0500 schrieb Maxim Cournoyer:
Toggle quote (10 lines)
> Vivien Kraus <vivien@planete-kraus.eu> writes:
>
> > * gnu/packages/gnome.scm (mutter): Update to 44.7.
> > [propagated-inputs]: Remove gtk+.  Update comment.
> > [source]: Remove patches.
> > * gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-
> > test.patch.
> > * gnu/packages/patches/mutter-fix-inverted-test.patch: Remove.
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Pushed at last.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 67464@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 67464
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch