GNU bug report logs - #26887
[PATCH 01/11] gnu: libdrm: Update to 2.4.80.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26887 in the body.
You can then email your comments to 26887 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Subject: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Thu, 11 May 2017 11:30:11 -0400

From: Marius Bakke <mbakke <at> fastmail.com>

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.80.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 89830a628..8d7f2195c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -277,7 +277,7 @@ rasterisation.")
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.79")
+    (version "2.4.80")
     (source
       (origin
         (method url-fetch)
@@ -287,7 +287,7 @@ rasterisation.")
                ".tar.bz2"))
         (sha256
          (base32
-          "15xiwnicf7vl1l37k8nj0z496p7ln1qp8qws7q13ikiv54cz7an6"))
+          "1wa9cnzf60xwx67zq9ay48xr3j3sn1z80q77jpbzmkg906b52am8"))
         (patches (search-patches "libdrm-symbol-check.patch"))))
     (build-system gnu-build-system)
     (inputs
-- 
2.13.0

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Subject: [PATCH 05/11] gnu: cogl: Enable wayland support.
Date: Thu, 11 May 2017 11:30:15 -0400

* gnu/packages/gnome.scm (cogl)[inputs]: Add wayland.
[arguments]: Add "--enable-wayland-egl-platform" and
"--enable-wayland-egl-server".
---
 gnu/packages/gnome.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7f8aa839d..e6a1e3ca5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2920,9 +2920,13 @@ throughout GNOME for API documentation).")
        ("cairo" ,cairo)
        ("pango" ,pango)
        ("gstreamer" ,gstreamer)
-       ("gst-plugins-base" ,gst-plugins-base)))
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("wayland" ,wayland)))
     (arguments
      `(#:configure-flags (list "--enable-cogl-gst"
+                               "--enable-wayland-egl-platform"
+                               "--enable-wayland-egl-server"
+
                                ;; Arrange to pass an absolute file name to
                                ;; dlopen for libGL.so.
                                (string-append "--with-gl-libname="
-- 
2.13.0

Message #11 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Subject: [PATCH 06/11] gnu: gnome-desktop: Update to 3.24.1.
Date: Thu, 11 May 2017 11:30:16 -0400

* gnu/packages/gnome.scm (gnome-desktop): Update to 3.24.1.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e6a1e3ca5..4a0274735 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -253,7 +253,7 @@ commonly used macros.")
 (define-public gnome-desktop
   (package
     (name "gnome-desktop")
-    (version "3.22.2")
+    (version "3.24.1")
     (source
      (origin
       (method url-fetch)
@@ -262,7 +262,7 @@ commonly used macros.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "074yjz4g9gii045v2pl1ad34hcg92ci04ynxqcabwnf3lvvypmsi"))))
+        "1as5ri52n6wphvhqnxa813q15jri0x47hxsjikjcmb2big9vf2fy"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("gobject-introspection" ,gobject-introspection)
-- 
2.13.0

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Subject: [PATCH 02/11] gnu: mesa: Update to 17.0.4.
Date: Thu, 11 May 2017 11:30:12 -0400

From: Marius Bakke <mbakke <at> fastmail.com>

* gnu/packages/patches/mesa-skip-disk-cache-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gl.scm (mesa): Update to 17.0.4.
[source]: Adapt URI to new directory structure.
[arguments]: End phases on #t. Remove stray whitespaces.
[home-page]: Use HTTPS.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/gl.scm                                | 23 +++++++++++++---------
 .../patches/mesa-skip-disk-cache-test.patch        | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 gnu/packages/patches/mesa-skip-disk-cache-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5822add4c..552dd0549 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -775,6 +775,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mcrypt-CVE-2012-4409.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4426.patch			\
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
+  %D%/packages/patches/mesa-skip-disk-cache-test.patch		\
   %D%/packages/patches/mesa-wayland-egl-symbols-check-mips.patch	\
   %D%/packages/patches/metabat-remove-compilation-date.patch	\
   %D%/packages/patches/mhash-keygen-test-segfault.patch		\
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index bb2eb768e..f43f46439 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -217,17 +217,20 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "13.0.5")
+    (version "17.0.4")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
-                            version "/mesa-" version ".tar.xz"))
+        (uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  "mesa-" version ".tar.xz")
+                   (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz"))
+          "0im3ca1vwwmkjf5w761vh7vabr4vrrdxpckr0wm974x18n2xqs8j"))
         (patches
-         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
+         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"
+                         "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("glproto" ,glproto)
@@ -281,7 +284,7 @@ also known as DXTn or DXTC) for Mesa.")
          ;; Without floating point texture support, drivers such as Nouveau
          ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
          "--enable-texture-float"
-         
+
          ;; Also enable the tests.
          "--enable-gallium-tests"
 
@@ -301,7 +304,8 @@ also known as DXTn or DXTC) for Mesa.")
              (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
                (("/usr/bin/env bash") (which "bash")))
              (substitute* "src/intel/genxml/gen_pack_header.py"
-               (("/usr/bin/env python2") (which "python")))))
+               (("/usr/bin/env python2") (which "python")))
+             #t))
          (add-before
            'build 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -325,8 +329,9 @@ also known as DXTn or DXTC) for Mesa.")
                  ;; it's never installed since Mesa removed its
                  ;; egl_gallium support.
                  (("\"gbm_dri\\.so")
-                  (string-append "\"" out "/lib/dri/gbm_dri.so")))))))))
-    (home-page "http://mesa3d.org/")
+                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
+               #t))))))
+    (home-page "https://mesa3d.org/")
     (synopsis "OpenGL implementation")
     (description "Mesa is a free implementation of the OpenGL specification -
 a system for rendering interactive 3D graphics.  A variety of device drivers
diff --git a/gnu/packages/patches/mesa-skip-disk-cache-test.patch b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
new file mode 100644
index 000000000..437711047
--- /dev/null
+++ b/gnu/packages/patches/mesa-skip-disk-cache-test.patch
@@ -0,0 +1,20 @@
+disk_cache_create() here looks up the users home directory from <pwd.h>
+which resolves to "/" in the build environment. I could not find an easy
+way to set the home directory to something else, so we disable this test
+for now.
+
+--- a/src/compiler/glsl/tests/cache_test.c
++++ b/src/compiler/glsl/tests/cache_test.c
+@@ -137,11 +137,6 @@
+    unsetenv("MESA_GLSL_CACHE_DIR");
+    unsetenv("XDG_CACHE_HOME");
+
+-   cache = disk_cache_create();
+-   expect_non_null(cache, "disk_cache_create with no environment variables");
+-
+-   disk_cache_destroy(cache);
+-
+    /* Test with XDG_CACHE_HOME set */
+    setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
+    cache = disk_cache_create();
+
-- 
2.13.0

Message #17 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: 26887 <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Thu, 11 May 2017 11:58:11 -0400

[Message part 1 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

These patches are intended for gnome-updates. The first three are merged
from master. Also, the mutter patch is not functional yet, as it
probably requires some updated package from master.

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>, 26887 <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Thu, 11 May 2017 22:04:58 +0200

[Message part 1 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
> These patches are intended for gnome-updates. The first three are merged
> from master. Also, the mutter patch is not functional yet, as it
> probably requires some updated package from master.

I think it's better to merge master directly instead of cherry-picking
these patches. We'd want to do that before starting it on Hydra anyway.

Would you like to do it? I think we can start building it shortly, Hydra
seems to have caught up with recent events. Maybe it'll be ready for the
release :)

Do you know if anything else remains after Mutter?

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>, 26887 <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 05/11] gnu: cogl: Enable wayland support.
Date: Thu, 11 May 2017 22:14:38 +0200

[Message part 1 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

> * gnu/packages/gnome.scm (cogl)[inputs]: Add wayland.
> [arguments]: Add "--enable-wayland-egl-platform" and
> "--enable-wayland-egl-server".

LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #26 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26887 <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Thu, 11 May 2017 16:41:44 -0400

[Message part 1 (text/plain, inline)]

Marius Bakke <mbakke <at> fastmail.com> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>
>> These patches are intended for gnome-updates. The first three are merged
>> from master. Also, the mutter patch is not functional yet, as it
>> probably requires some updated package from master.
>
> I think it's better to merge master directly instead of cherry-picking
> these patches. We'd want to do that before starting it on Hydra anyway.
>
> Would you like to do it? I think we can start building it shortly, Hydra
> seems to have caught up with recent events. Maybe it'll be ready for the
> release :)
>
I can merge master and put these on top, though I can't test my patches
very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
If your computer(s) are faster, I'd be more than happy to let you finish
this branch.

> Do you know if anything else remains after Mutter?

Within the gnome meta-package, everything from gnome-shell down. If all
of those main packages can be upgraded, I'll be satisfied.

[signature.asc (application/pgp-signature, inline)]

Message #29 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26887 <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Thu, 11 May 2017 23:34:53 +0200

[Message part 1 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>
>>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>>
>>> These patches are intended for gnome-updates. The first three are merged
>>> from master. Also, the mutter patch is not functional yet, as it
>>> probably requires some updated package from master.
>>
>> I think it's better to merge master directly instead of cherry-picking
>> these patches. We'd want to do that before starting it on Hydra anyway.
>>
>> Would you like to do it? I think we can start building it shortly, Hydra
>> seems to have caught up with recent events. Maybe it'll be ready for the
>> release :)
>>
> I can merge master and put these on top, though I can't test my patches
> very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
> If your computer(s) are faster, I'd be more than happy to let you finish
> this branch.

I think these patches look fine (see other comments), at least up to
mutter. I'd suggest merging master and adding the patches leading to
it, as long as everyone is fine with adding wayland as a hard dependency
of gtk+.

Then we can start an evaluation on Hydra to get some substitutes before
trying the mutter update :)

[signature.asc (application/pgp-signature, inline)]

Message #32 received at 26887 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26887 <at> debbugs.gnu.org, guix-devel <at> gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Fri, 12 May 2017 19:17:40 -0400

[Message part 1 (text/plain, inline)]

Marius Bakke <mbakke <at> fastmail.com> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Marius Bakke <mbakke <at> fastmail.com> writes:
>>
>>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>>
>>>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>>>
>>>> These patches are intended for gnome-updates. The first three are merged
>>>> from master. Also, the mutter patch is not functional yet, as it
>>>> probably requires some updated package from master.
>>>
>>> I think it's better to merge master directly instead of cherry-picking
>>> these patches. We'd want to do that before starting it on Hydra anyway.
>>>
>>> Would you like to do it? I think we can start building it shortly, Hydra
>>> seems to have caught up with recent events. Maybe it'll be ready for the
>>> release :)
>>>
>> I can merge master and put these on top, though I can't test my patches
>> very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
>> If your computer(s) are faster, I'd be more than happy to let you finish
>> this branch.
>
> I think these patches look fine (see other comments), at least up to
> mutter. I'd suggest merging master and adding the patches leading to
> it, as long as everyone is fine with adding wayland as a hard dependency
> of gtk+.
>
> Then we can start an evaluation on Hydra to get some substitutes before
> trying the mutter update :)

Last call for objections to wayland as a hard dependency of gtk+ on the
gnome-updates branch! This will be committed in approximately 24 hours
otherwise.

[signature.asc (application/pgp-signature, inline)]

Message #37 received at 26887-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26885-done <at> debbugs.gnu.org, 26883-done <at> debbugs.gnu.org,
 26881-done <at> debbugs.gnu.org, 26884-done <at> debbugs.gnu.org,
 26887-done <at> debbugs.gnu.org, 26880-done <at> debbugs.gnu.org, guix-devel <at> gnu.org,
 26886-done <at> debbugs.gnu.org, 26882-done <at> debbugs.gnu.org
Subject: Re: bug#26887: [PATCH 01/11] gnu: libdrm: Update to 2.4.80.
Date: Sat, 13 May 2017 19:36:56 -0400

[Message part 1 (text/plain, inline)]

Kei Kebreau <kei <at> openmailbox.org> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>
>>> Marius Bakke <mbakke <at> fastmail.com> writes:
>>>
>>>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>>>
>>>>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>>>>
>>>>> These patches are intended for gnome-updates. The first three are merged
>>>>> from master. Also, the mutter patch is not functional yet, as it
>>>>> probably requires some updated package from master.
>>>>
>>>> I think it's better to merge master directly instead of cherry-picking
>>>> these patches. We'd want to do that before starting it on Hydra anyway.
>>>>
>>>> Would you like to do it? I think we can start building it shortly, Hydra
>>>> seems to have caught up with recent events. Maybe it'll be ready for the
>>>> release :)
>>>>
>>> I can merge master and put these on top, though I can't test my patches
>>> very quickly (building webkitgtk+ repeatedly on 10-year-old hardware \o/).
>>> If your computer(s) are faster, I'd be more than happy to let you finish
>>> this branch.
>>
>> I think these patches look fine (see other comments), at least up to
>> mutter. I'd suggest merging master and adding the patches leading to
>> it, as long as everyone is fine with adding wayland as a hard dependency
>> of gtk+.
>>
>> Then we can start an evaluation on Hydra to get some substitutes before
>> trying the mutter update :)
>
> Last call for objections to wayland as a hard dependency of gtk+ on the
> gnome-updates branch! This will be committed in approximately 24 hours
> otherwise.

The gnome-updates branch has been updated! I'll be closing all of my
related bugs.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.