diff mbox

gnu: mesa: Update to 13.0.1.

Message ID 20161130120602.4342-1-mbakke@fastmail.com
State New
Headers show

Commit Message

Marius Bakke Nov. 30, 2016, 12:06 p.m. UTC
* gnu/packages/gl.scm (mesa): Update to 13.0.1.
[native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ...
[source]: ... here.
[arguments]: Don't apply patch.
[inputs]: Remove eudev.
---
 gnu/packages/gl.scm | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

Comments

Ludovic Courtès Dec. 1, 2016, 2:09 p.m. UTC | #1
Marius Bakke <mbakke@fastmail.com> skribis:

> * gnu/packages/gl.scm (mesa): Update to 13.0.1.
> [native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ...
> [source]: ... here.
> [arguments]: Don't apply patch.
> [inputs]: Remove eudev.

eudev was added in this commit:

  commit ce4d7abf02627e990551c3bf0b67abfdf6725952
  Author: Mark H Weaver <mhw@netris.org>
  Date:   Tue Dec 16 17:22:47 2014 -0500

      gnu: mesa: Update to 10.4.0.

      * gnu/packages/gl.scm (mesa): Update to 10.4.0.  Use current libdrm.  Add
        eudev, dri3proto, presentproto, and libxshmfence to inputs.  Add gnu-gettext
        to native-inputs.  Add --enable-xa configure flag.  Add new phases
        'add-missing-m4-files' and 'patch-create_test_cases'.

Are you sure it’s no longer necessary?  Mark?

The parts about apply the MIPS patch is good to me.  Perhaps you can
already push it as a separate patch to ‘staging’.

Thanks,
Ludo’.
Marius Bakke Dec. 1, 2016, 5:14 p.m. UTC | #2
Ludovic Courtès <ludo@gnu.org> writes:

> Marius Bakke <mbakke@fastmail.com> skribis:
>
>> * gnu/packages/gl.scm (mesa): Update to 13.0.1.
>> [native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ...
>> [source]: ... here.
>> [arguments]: Don't apply patch.
>> [inputs]: Remove eudev.
>
> eudev was added in this commit:
>
>   commit ce4d7abf02627e990551c3bf0b67abfdf6725952
>   Author: Mark H Weaver <mhw@netris.org>
>   Date:   Tue Dec 16 17:22:47 2014 -0500
>
>       gnu: mesa: Update to 10.4.0.
>
>       * gnu/packages/gl.scm (mesa): Update to 10.4.0.  Use current libdrm.  Add
>         eudev, dri3proto, presentproto, and libxshmfence to inputs.  Add gnu-gettext
>         to native-inputs.  Add --enable-xa configure flag.  Add new phases
>         'add-missing-m4-files' and 'patch-create_test_cases'.
>
> Are you sure it’s no longer necessary?  Mark?

I removed eudev after reading the release notes for 13.0.0:

http://mesa3d.org/relnotes/13.0.0.html

(very bottom of page)

> The parts about apply the MIPS patch is good to me.  Perhaps you can
> already push it as a separate patch to ‘staging’.

I can submit an update for 12.0.4 if the major version bump is too risky
right now, or bump to 13.0.2 which was released three days ago. WDYT?
Mark H Weaver Dec. 1, 2016, 6:39 p.m. UTC | #3
Marius Bakke <mbakke@fastmail.com> writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> skribis:
>>
>>> * gnu/packages/gl.scm (mesa): Update to 13.0.1.
>>> [native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ...
>>> [source]: ... here.
>>> [arguments]: Don't apply patch.
>>> [inputs]: Remove eudev.
>>
>> eudev was added in this commit:
>>
>>   commit ce4d7abf02627e990551c3bf0b67abfdf6725952
>>   Author: Mark H Weaver <mhw@netris.org>
>>   Date:   Tue Dec 16 17:22:47 2014 -0500
>>
>>       gnu: mesa: Update to 10.4.0.
>>
>>       * gnu/packages/gl.scm (mesa): Update to 10.4.0.  Use current libdrm.  Add
>>         eudev, dri3proto, presentproto, and libxshmfence to inputs.  Add gnu-gettext
>>         to native-inputs.  Add --enable-xa configure flag.  Add new phases
>>         'add-missing-m4-files' and 'patch-create_test_cases'.
>>
>> Are you sure it’s no longer necessary?  Mark?
>
> I removed eudev after reading the release notes for 13.0.0:
>
> http://mesa3d.org/relnotes/13.0.0.html
>
> (very bottom of page)

Indeed, the release notes seem to indicate that 'eudev' can be removed
from 'inputs'.  Looks okay to me.

    Thanks!
      Mark
Ludovic Courtès Dec. 1, 2016, 11:02 p.m. UTC | #4
Marius Bakke <mbakke@fastmail.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> skribis:
>>
>>> * gnu/packages/gl.scm (mesa): Update to 13.0.1.
>>> [native-inputs]: Move 'mesa-wayland-egl-symbols-check-mips.patch' to ...
>>> [source]: ... here.
>>> [arguments]: Don't apply patch.
>>> [inputs]: Remove eudev.
>>
>> eudev was added in this commit:
>>
>>   commit ce4d7abf02627e990551c3bf0b67abfdf6725952
>>   Author: Mark H Weaver <mhw@netris.org>
>>   Date:   Tue Dec 16 17:22:47 2014 -0500
>>
>>       gnu: mesa: Update to 10.4.0.
>>
>>       * gnu/packages/gl.scm (mesa): Update to 10.4.0.  Use current libdrm.  Add
>>         eudev, dri3proto, presentproto, and libxshmfence to inputs.  Add gnu-gettext
>>         to native-inputs.  Add --enable-xa configure flag.  Add new phases
>>         'add-missing-m4-files' and 'patch-create_test_cases'.
>>
>> Are you sure it’s no longer necessary?  Mark?
>
> I removed eudev after reading the release notes for 13.0.0:
>
> http://mesa3d.org/relnotes/13.0.0.html
>
> (very bottom of page)

OK, thanks for confirming.

>> The parts about apply the MIPS patch is good to me.  Perhaps you can
>> already push it as a separate patch to ‘staging’.
>
> I can submit an update for 12.0.4 if the major version bump is too risky
> right now, or bump to 13.0.2 which was released three days ago. WDYT?

Go for 13.0.2 if you think it’s safe enough (the API doesn’t really
change I suppose, it’s “just OpenGL” no?), but better check a couple of
key packages reported by ‘guix package -l mesa’.

Thanks!

Ludo’.
Marius Bakke Dec. 2, 2016, 11:26 a.m. UTC | #5
Ludovic Courtès <ludo@gnu.org> writes:

>>> The parts about apply the MIPS patch is good to me.  Perhaps you can
>>> already push it as a separate patch to ‘staging’.
>>
>> I can submit an update for 12.0.4 if the major version bump is too risky
>> right now, or bump to 13.0.2 which was released three days ago. WDYT?
>
> Go for 13.0.2 if you think it’s safe enough (the API doesn’t really
> change I suppose, it’s “just OpenGL” no?), but better check a couple of
> key packages reported by ‘guix package -l mesa’.

I tried 'mpv' and 'vlc' on a few media files without problems. Mesa 13
brings OpenGL 4.4 support depending on the driver, I've only tested an
older Intel card.. Pushed to staging anyway!
Ricardo Wurmus Dec. 4, 2016, 10:17 a.m. UTC | #6
Marius Bakke <mbakke@fastmail.com> writes:

> Pushed to staging anyway!

Just a note: the original plan was to freeze staging on November 30 and
merge on December 7 (Wednesday).  I think it’s time to actually freeze
staging now.
Leo Famulari Dec. 4, 2016, 6:05 p.m. UTC | #7
On Sun, Dec 04, 2016 at 11:17:12AM +0100, Ricardo Wurmus wrote:
> 
> Marius Bakke <mbakke@fastmail.com> writes:
> 
> > Pushed to staging anyway!
> 
> Just a note: the original plan was to freeze staging on November 30 and
> merge on December 7 (Wednesday).  I think it’s time to actually freeze
> staging now.

Is there a reason to wait? Or should we start evaluating staging on
Hydra today?
Ludovic Courtès Dec. 4, 2016, 8:52 p.m. UTC | #8
Leo Famulari <leo@famulari.name> skribis:

> On Sun, Dec 04, 2016 at 11:17:12AM +0100, Ricardo Wurmus wrote:
>> 
>> Marius Bakke <mbakke@fastmail.com> writes:
>> 
>> > Pushed to staging anyway!
>> 
>> Just a note: the original plan was to freeze staging on November 30 and
>> merge on December 7 (Wednesday).  I think it’s time to actually freeze
>> staging now.
>
> Is there a reason to wait? Or should we start evaluating staging on
> Hydra today?

No there’s no reason to wait indeed!  (I emailed you later today on this
topic.  :-))

Ludo’.
diff mbox

Patch

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 50b474c..850dfe1 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -196,7 +196,7 @@  also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "12.0.1")
+    (version "13.0.1")
     (source
       (origin
         (method url-fetch)
@@ -204,7 +204,9 @@  also known as DXTn or DXTC) for Mesa.")
                             version "/mesa-" version ".tar.xz"))
         (sha256
          (base32
-          "12b3i59xdn2in2hchrkgh4fwij8zhznibx976l3pdj3qkyvlzcms"))))
+          "0cd7axwihwsay0i9fvcw14cldbxyvf8b8rd5sh53plvppyr2z5ki"))
+        (patches
+         (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("glproto" ,glproto)
@@ -227,20 +229,10 @@  also known as DXTn or DXTC) for Mesa.")
         ("makedepend" ,makedepend)
         ("presentproto" ,presentproto)
         ("s2tc" ,s2tc)
-        ("udev" ,eudev)
         ("wayland" ,wayland)))
     (native-inputs
       `(("pkg-config" ,pkg-config)
-        ("python" ,python-2)
-
-         ;; XXX To prevent a large number of rebuilds on other systems,
-         ;; apply the following patch on MIPS systems only.  In the next
-         ;; core-updates cycle, this patch could be applied on all platforms.
-        ,@(if (string-prefix? "mips" (or (%current-target-system)
-                                         (%current-system)))
-              `(("mips-patch"
-                 ,(search-patch "mesa-wayland-egl-symbols-check-mips.patch")))
-              '())))
+        ("python" ,python-2)))
     (arguments
      `(#:configure-flags
        '(;; drop r300 from default gallium drivers, as it requires llvm
@@ -267,16 +259,6 @@  also known as DXTn or DXTC) for Mesa.")
               '("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
        #:phases
        (modify-phases %standard-phases
-         ;; Add an 'apply-mips-patch' phase conditionally (see above.)
-         ,@(if (string-prefix? "mips" (or (%current-target-system)
-                                          (%current-system)))
-               `((add-after 'unpack 'apply-mips-patch
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (let ((patch (assoc-ref inputs "mips-patch")))
-                       (zero? (system* "patch" "-p1" "--force"
-                                       "--input" patch))))))
-               '())
-
          (add-after
            'unpack 'patch-create_test_cases
            (lambda _