[PATCH] gnu: Add mesa-demos.

[PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: patch1 --]
[-- Type: text/x-diff, Size: 1047 bytes --]

From 051341d49fae36579ce318ab0b9c245ed084cdae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 13 Mar 2015 15:57:51 +0100
Subject: [PATCH 2/3] gnu: msea: Propagate input libxshmfence.

* gnu/packages/gl.scm (mesa): Propagate input libxshmfence.
---
 gnu/packages/gl.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e237cb1..b5f8e07 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -174,13 +174,13 @@ texture compression to Mesa.")
         ("libdrm" ,libdrm)
         ("libx11" ,libx11)
         ("libxdamage" ,libxdamage)
+        ("libxshmfence" ,libxshmfence)
         ("libxxf86vm" ,libxxf86vm)))
     (inputs
       `(("udev" ,eudev)
         ("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("presentproto" ,presentproto)
-        ("libxshmfence" ,libxshmfence)
         ("expat" ,expat)
         ("libxfixes" ,libxfixes)
         ("libxml2" ,libxml2)
-- 
2.2.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch2 --]
[-- Type: text/x-diff, Size: 1902 bytes --]

From e1f288dee780b374fc2162eb39d96a50d64964c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 13 Mar 2015 15:58:25 +0100
Subject: [PATCH 3/3] gnu: Add mesa-demos.

* gnu/packages/gl.scm (mesa-demos): New variable.
---
 gnu/packages/gl.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index b5f8e07..ae551c2 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -259,6 +259,35 @@ emulation to complete hardware acceleration for modern GPUs.")
                                                  (assoc-ref outputs "out")
                                                  "/include")))))))))
 
+(define-public mesa-demos
+  (package
+    (name "mesa-demos")
+    (version "8.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.freedesktop.org/pub/mesa/demos/" version
+                    "/mesa-demos-" version".tar.bz2"))
+              (sha256
+               (base32
+                "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("glut" ,freeglut)
+       ("glew" ,glew)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://mesa3d.org/")
+    (synopsis "Collection of OpenGL / Mesa demos and test programs")
+    (description
+     "Mesa-demos is a collection of OpenGL / Mesa demos and test programs
+authored by the Mesa project.")
+    ;; The package contains many source files without a license, some
+    ;; instances of the expat license, and some X11 style licenses by SGI, so
+    ;; we consider it to be collectively under the X11 license.
+    (license l:x11)))
+
 (define-public glew
   (package
     (name "glew")
-- 
2.2.1

Re: [PATCH] gnu: Add mesa-demos.

[Ludovic Courtès]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> From 051341d49fae36579ce318ab0b9c245ed084cdae Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Fri, 13 Mar 2015 15:57:51 +0100
> Subject: [PATCH 2/3] gnu: msea: Propagate input libxshmfence.
>
> * gnu/packages/gl.scm (mesa): Propagate input libxshmfence.

[...]

> +        ("libxshmfence" ,libxshmfence)

Please add a margin comment explaining the reason.

> From e1f288dee780b374fc2162eb39d96a50d64964c1 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Fri, 13 Mar 2015 15:58:25 +0100
> Subject: [PATCH 3/3] gnu: Add mesa-demos.
>
> * gnu/packages/gl.scm (mesa-demos): New variable.

[...]

> +    ;; The package contains many source files without a license, some
> +    ;; instances of the expat license, and some X11 style licenses by SGI, so
> +    ;; we consider it to be collectively under the X11 license.

Is there a top-level ‘LICENSE’ or ‘COPYING’ or ‘COPYRIGHT’ file?  If
there is, then the intent is most likely that the files without a
license headers are covered by whatever this top-level file says.

If there is really no indication, that would make the software non-free.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

ludo@gnu.org (Ludovic Courtès) writes:

> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
>
>> From 051341d49fae36579ce318ab0b9c245ed084cdae Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>>  <taylanbayirli@gmail.com>
>> Date: Fri, 13 Mar 2015 15:57:51 +0100
>> Subject: [PATCH 2/3] gnu: msea: Propagate input libxshmfence.
>>
>> * gnu/packages/gl.scm (mesa): Propagate input libxshmfence.
>
> [...]
>
>> +        ("libxshmfence" ,libxshmfence)
>
> Please add a margin comment explaining the reason.

It's in the "Requires.private" field of the gl.pc pkg-config file.  The
same seems to be the case for other packages in the propagated-inputs
list.  Should it be explained for all of them?..

>> From e1f288dee780b374fc2162eb39d96a50d64964c1 Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>>  <taylanbayirli@gmail.com>
>> Date: Fri, 13 Mar 2015 15:58:25 +0100
>> Subject: [PATCH 3/3] gnu: Add mesa-demos.
>>
>> * gnu/packages/gl.scm (mesa-demos): New variable.
>
> [...]
>
>> +    ;; The package contains many source files without a license, some
>> +    ;; instances of the expat license, and some X11 style licenses by SGI, so
>> +    ;; we consider it to be collectively under the X11 license.
>
> Is there a top-level ‘LICENSE’ or ‘COPYING’ or ‘COPYRIGHT’ file?  If
> there is, then the intent is most likely that the files without a
> license headers are covered by whatever this top-level file says.
>
> If there is really no indication, that would make the software non-free.

Sadly, there is no such file.

Debian has it as a "source package", and has a Copyright file assembled
for it:

http://metadata.ftp-master.debian.org/changelogs/main/m/mesa-demos/mesa-demos_8.0.1-2_copyright

It builds the mesa-utils and mesa-utils-extra packages from this source
package.  Do we have to do something similar?

Taylan

Re: [PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

>>> +        ("libxshmfence" ,libxshmfence)
>>
>> Please add a margin comment explaining the reason.
>
> It's in the "Requires.private" field of the gl.pc pkg-config file.  The
> same seems to be the case for other packages in the propagated-inputs
> list.  Should it be explained for all of them?..

I just noticed that there's more packages in that .pc section which are
in the inputs but not propagated inputs.  Should I propagate them all?

Here is the whole .pc field, pretty-printed:

Requires.private:
libdrm >= 2.4.38
x11
xext
xdamage
xfixes
x11-xcb
xcb
xcb-glx >= 1.8.1
xcb-dri2 >= 1.8
xcb-dri3
xcb-present
xcb-sync
xshmfence >= 1.1
xxf86vm

And here are the propagated and normal inputs prior to my patch:

(propagated-inputs
  `(("glproto" ,glproto)
    ("libdrm" ,libdrm)
    ("libx11" ,libx11)
    ("libxdamage" ,libxdamage)
    ("libxxf86vm" ,libxxf86vm)))
(inputs
  `(("udev" ,eudev)
    ("dri2proto" ,dri2proto)
    ("dri3proto" ,dri3proto)
    ("libxshmfence" ,libxshmfence)
    ("presentproto" ,presentproto)
    ("expat" ,expat)
    ("libxfixes" ,libxfixes)
    ("libxml2" ,libxml2)
    ;; TODO: Add 'libva'
    ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
    ("makedepend" ,makedepend)
    ("s2tc" ,s2tc)))

So I think libxshmfence and libxfixes should be propagated, right?

Taylan

Re: [PATCH] gnu: Add mesa-demos.

[Ludovic Courtès]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:
>
>>>> +        ("libxshmfence" ,libxshmfence)
>>>
>>> Please add a margin comment explaining the reason.
>>
>> It's in the "Requires.private" field of the gl.pc pkg-config file.  The
>> same seems to be the case for other packages in the propagated-inputs
>> list.  Should it be explained for all of them?..
>
> I just noticed that there's more packages in that .pc section which are
> in the inputs but not propagated inputs.  Should I propagate them all?

Yes, I think so.

> So I think libxshmfence and libxfixes should be propagated, right?

Right.

A single comment above ‘propagated-inputs’ saying that all of them are
in the .pc is enough.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add mesa-demos.

[Ludovic Courtès]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> ludo@gnu.org (Ludovic Courtès) writes:

[...]

>>> From e1f288dee780b374fc2162eb39d96a50d64964c1 Mon Sep 17 00:00:00 2001
>>> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>>>  <taylanbayirli@gmail.com>
>>> Date: Fri, 13 Mar 2015 15:58:25 +0100
>>> Subject: [PATCH 3/3] gnu: Add mesa-demos.
>>>
>>> * gnu/packages/gl.scm (mesa-demos): New variable.
>>
>> [...]
>>
>>> +    ;; The package contains many source files without a license, some
>>> +    ;; instances of the expat license, and some X11 style licenses by SGI, so
>>> +    ;; we consider it to be collectively under the X11 license.
>>
>> Is there a top-level ‘LICENSE’ or ‘COPYING’ or ‘COPYRIGHT’ file?  If
>> there is, then the intent is most likely that the files without a
>> license headers are covered by whatever this top-level file says.
>>
>> If there is really no indication, that would make the software non-free.
>
> Sadly, there is no such file.
>
> Debian has it as a "source package", and has a Copyright file assembled
> for it:
>
> http://metadata.ftp-master.debian.org/changelogs/main/m/mesa-demos/mesa-demos_8.0.1-2_copyright

Do the files without a license mentioned in the comment above appear in
Debian’s copyright file?  Or are they just removed from the Debian
package(s)?

According to <http://libreplanet.org/wiki/NONFSDG#mesademos> there are
two demos that should be removed.

> It builds the mesa-utils and mesa-utils-extra packages from this source
> package.  Do we have to do something similar?

No idea.  I would say no until there’s a need for it.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

I noticed that the mesa-demos tarball contains *many* demos which are
probably unneeded by most users, and that the Debian mesa-utils package
merely installs 4 tools.  (The reason I wanted to package this in first
place was just to get glxinfo(1), which is one of these four.)  So I
copied that solution after all.

Updated patches below.  The glproto propagated input is not in any .pc
file so I positioned the comment accordingly.  I don't know why glproto
is propagated; maybe it's obvious for someone who knows X.Org and Mesa
well / the original packager.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch1 --]
[-- Type: text/x-diff, Size: 1389 bytes --]

From 8d83adfaf2d61531d34b757162a7ef723d78bd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 13 Mar 2015 15:57:51 +0100
Subject: [PATCH 3/5] gnu: mesa: Propagate inputs libxshmfence and libxfixes.

* gnu/packages/gl.scm (mesa): Propagate inputs libxshmfence and libxfixes.
---
 gnu/packages/gl.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d2096b6..4866464 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -170,18 +170,19 @@ also known as DXTn or DXTC) for Mesa.")
     (build-system gnu-build-system)
     (propagated-inputs
       `(("glproto" ,glproto)
+        ;; The following are in the Requires.private field of gl.pc.
         ("libdrm" ,libdrm)
         ("libx11" ,libx11)
         ("libxdamage" ,libxdamage)
+        ("libxfixes" ,libxfixes)
+        ("libxshmfence" ,libxshmfence)
         ("libxxf86vm" ,libxxf86vm)))
     (inputs
       `(("udev" ,eudev)
         ("dri2proto" ,dri2proto)
         ("dri3proto" ,dri3proto)
         ("presentproto" ,presentproto)
-        ("libxshmfence" ,libxshmfence)
         ("expat" ,expat)
-        ("libxfixes" ,libxfixes)
         ("libxml2" ,libxml2)
         ;; TODO: Add 'libva'
         ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
-- 
2.2.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: patch2 --]
[-- Type: text/x-diff, Size: 2567 bytes --]

From 78a255834286d56c6472d25a2092de4fda2179c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 13 Mar 2015 15:58:25 +0100
Subject: [PATCH 4/5] gnu: Add mesa-utils.

* gnu/packages/gl.scm (mesa-utils): New variable.
(mesa-demos-source): New procedure.
---
 gnu/packages/gl.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4866464..59500c2 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -260,6 +260,48 @@ emulation to complete hardware acceleration for modern GPUs.")
                                                  (assoc-ref outputs "out")
                                                  "/include")))))))))
 
+;;; The mesa-demos distribution contains non-free files, many files with no
+;;; clear license information, and many demos that aren't useful for most
+;;; people, so we just use this for the mesa-utils package below, and possibly
+;;; other packages in the future.  This is modeled after Debian's solution.
+(define (mesa-demos-source version)
+  (origin
+    (method url-fetch)
+    (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/demos/" version
+                        "/mesa-demos-" version ".tar.bz2"))
+    (sha256 (base32 "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"))))
+
+(define-public mesa-utils
+  (package
+    (name "mesa-utils")
+    (version "8.2.0")
+    (source (mesa-demos-source version))
+    (build-system gnu-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("glut" ,freeglut)
+       ("glew" ,glew)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace
+          install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (for-each (lambda (file)
+                          (copy-file file (string-append out "/bin")))
+                        '("src/xdemos/glxdemo" "src/xdemos/glxgears"
+                          "src/xdemos/glxinfo" "src/xdemos/glxheads"))))))))
+    (home-page "http://mesa3d.org/")
+    (synopsis "Utility tools for Mesa")
+    (description
+     "The mesa-utils package contains several utility tools for Mesa: glxdemo,
+glxgears, glxheads, and glxinfo.")
+    ;; glxdemo is public domain; others expat.
+    (license (list l:expat l:public-domain))))
+
 (define-public glew
   (package
     (name "glew")
-- 
2.2.1

Re: [PATCH] gnu: Add mesa-demos.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> Updated patches below.

Apologies; the latter patch was untested and (of course) contained silly
bugs.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2627 bytes --]

From 807816ec67414770cf5a6fa82c863096e14b276e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 13 Mar 2015 15:58:25 +0100
Subject: [PATCH 4/5] gnu: Add mesa-utils.

* gnu/packages/gl.scm (mesa-utils): New variable.
(mesa-demos-source): New procedure.
---
 gnu/packages/gl.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4866464..5e2f72a 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -260,6 +260,50 @@ emulation to complete hardware acceleration for modern GPUs.")
                                                  (assoc-ref outputs "out")
                                                  "/include")))))))))
 
+;;; The mesa-demos distribution contains non-free files, many files with no
+;;; clear license information, and many demos that aren't useful for most
+;;; people, so we just use this for the mesa-utils package below, and possibly
+;;; other packages in the future.  This is modeled after Debian's solution.
+(define (mesa-demos-source version)
+  (origin
+    (method url-fetch)
+    (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/demos/" version
+                        "/mesa-demos-" version ".tar.bz2"))
+    (sha256 (base32 "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"))))
+
+(define-public mesa-utils
+  (package
+    (name "mesa-utils")
+    (version "8.2.0")
+    (source (mesa-demos-source version))
+    (build-system gnu-build-system)
+    (inputs
+     `(("mesa" ,mesa)
+       ("glut" ,freeglut)
+       ("glew" ,glew)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace
+          install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let ((out (assoc-ref outputs "out")))
+              (mkdir-p (string-append out "/bin"))
+              (for-each
+               (lambda (file)
+                 (copy-file file (string-append out "/bin/" (basename file))))
+               '("src/xdemos/glxdemo" "src/xdemos/glxgears"
+                 "src/xdemos/glxinfo" "src/xdemos/glxheads"))))))))
+    (home-page "http://mesa3d.org/")
+    (synopsis "Utility tools for Mesa")
+    (description
+     "The mesa-utils package contains several utility tools for Mesa: glxdemo,
+glxgears, glxheads, and glxinfo.")
+    ;; glxdemo is public domain; others expat.
+    (license (list l:expat l:public-domain))))
+
 (define-public glew
   (package
     (name "glew")
-- 
2.2.1

Re: [PATCH] gnu: Add mesa-demos.

[Ludovic Courtès]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> I noticed that the mesa-demos tarball contains *many* demos which are
> probably unneeded by most users, and that the Debian mesa-utils package
> merely installs 4 tools.  (The reason I wanted to package this in first
> place was just to get glxinfo(1), which is one of these four.)  So I
> copied that solution after all.

Sounds good, thanks for investigating.

> Updated patches below.  The glproto propagated input is not in any .pc
> file so I positioned the comment accordingly.  I don't know why glproto
> is propagated; maybe it's obvious for someone who knows X.Org and Mesa
> well / the original packager.

Git tells me Andreas might know (commit 917748dd.)  :-)

> From 8d83adfaf2d61531d34b757162a7ef723d78bd7d Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Fri, 13 Mar 2015 15:57:51 +0100
> Subject: [PATCH 3/5] gnu: mesa: Propagate inputs libxshmfence and libxfixes.
>
> * gnu/packages/gl.scm (mesa): Propagate inputs libxshmfence and libxfixes.

OK.

> From 807816ec67414770cf5a6fa82c863096e14b276e Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Fri, 13 Mar 2015 15:58:25 +0100
> Subject: [PATCH 4/5] gnu: Add mesa-utils.
>
> * gnu/packages/gl.scm (mesa-utils): New variable.
> (mesa-demos-source): New procedure.

OK.

Thanks!

Ludo’.