* [PATCH 02/10] gnu: libdrm: Update to 2.4.68.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-18 16:55 ` [PATCH 03/10] gnu: Order module imports in (gnu packages gl) alphabetically David Craven
` (8 subsequent siblings)
9 siblings, 0 replies; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.68.
---
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 0e16f6b..b58a248 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -262,7 +262,7 @@ rasterisation.")
(define-public libdrm
(package
(name "libdrm")
- (version "2.4.65")
+ (version "2.4.68")
(source
(origin
(method url-fetch)
@@ -272,7 +272,7 @@ rasterisation.")
".tar.bz2"))
(sha256
(base32
- "1i4n7mz49l0j4kr0dg9n1j3hlc786ncqgj0v5fci1mz7pp40m5ki"))
+ "1px91j6imaaq2fy8ksvgldmv0cdz3w379jqiciqvqa99jajxjjsv"))
(patches (search-patches "libdrm-symbol-check.patch"))))
(build-system gnu-build-system)
(inputs
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 03/10] gnu: Order module imports in (gnu packages gl) alphabetically.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
2016-07-18 16:55 ` [PATCH 02/10] gnu: libdrm: Update to 2.4.68 David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-19 20:33 ` Ludovic Courtès
2016-07-18 16:55 ` [PATCH 04/10] gnu: Rename #:prefix l: to #:prefix license: David Craven
` (7 subsequent siblings)
9 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm: Order module imports alphabetically.
---
gnu/packages/gl.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 907e3bf..853c8b5 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -20,29 +20,29 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages gl)
- #:use-module (ice-9 match)
- #:use-module (guix build utils)
- #:use-module ((guix licenses) #:prefix l:)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix build-system gnu)
- #:use-module (guix build-system cmake)
- #:use-module (guix packages)
- #:use-module (guix utils)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
- #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages guile)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
- #:use-module (gnu packages xorg)
- #:use-module (gnu packages xml)
- #:use-module (gnu packages fontutils)
- #:use-module (gnu packages guile)
#:use-module (gnu packages video)
#:use-module (gnu packages xdisorg)
- #:use-module (gnu packages zip))
+ #:use-module (gnu packages xml)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages zip)
+ #:use-module (guix download)
+ #:use-module (guix build utils)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system cmake)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
+ #:use-module (ice-9 match))
(define-public glu
(package
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 04/10] gnu: Rename #:prefix l: to #:prefix license:.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
2016-07-18 16:55 ` [PATCH 02/10] gnu: libdrm: Update to 2.4.68 David Craven
2016-07-18 16:55 ` [PATCH 03/10] gnu: Order module imports in (gnu packages gl) alphabetically David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-19 20:32 ` Ludovic Courtès
2016-07-18 16:55 ` [PATCH 05/10] gnu: mesa: Update to 12.0.0 David Craven
` (6 subsequent siblings)
9 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm: Rename #:prefix l: to #:prefix license:.
---
gnu/packages/gl.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 853c8b5..4ac926e 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -71,7 +71,7 @@ matrices for creating perspective and orthographic projections,
positioning a camera, and selection/picking, Rendering of disk,
cylinder, and sphere primitives, Interpreting OpenGL error values
as ASCII text.")
- (license (l:x11-style "http://directory.fsf.org/wiki/License:SGIFreeBv2"))))
+ (license (license:x11-style "http://directory.fsf.org/wiki/License:SGIFreeBv2"))))
(define-public freeglut
(package
@@ -112,7 +112,7 @@ GLUT (and hence freeglut) allows the user to create and manage windows
containing OpenGL contexts on a wide range of platforms and also read
the mouse, keyboard and joystick functions. Freeglut is released under
the X-Consortium license.")
- (license l:x11)))
+ (license license:x11)))
(define-public ftgl
(package
@@ -138,7 +138,7 @@ the X-Consortium license.")
"FTGL is a font rendering library for OpenGL applications. Supported
rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
Polygon meshes, and Extruded polygon meshes.")
- (license l:x11)))
+ (license license:x11)))
(define-public s2tc
(package
@@ -170,7 +170,7 @@ Polygon meshes, and Extruded polygon meshes.")
(description
"S2TC is a patent-free implementation of S3 Texture Compression (S3TC,
also known as DXTn or DXTC) for Mesa.")
- (license l:expat)))
+ (license license:expat)))
;;; Mesa needs LibVA headers to build its Gallium-based VA API implementation;
;;; LibVA itself depends on Mesa. We use the following to solve the circular
@@ -287,7 +287,7 @@ also known as DXTn or DXTC) for Mesa.")
a system for rendering interactive 3D graphics. A variety of device drivers
allows Mesa to be used in many different environments ranging from software
emulation to complete hardware acceleration for modern GPUs.")
- (license l:x11)))
+ (license license:x11)))
(define-public mesa-headers
(package
@@ -355,7 +355,7 @@ emulation to complete hardware acceleration for modern GPUs.")
"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))))
+ (license (list license:expat license:public-domain))))
(define-public glew
(package
@@ -399,7 +399,7 @@ glxgears, glxheads, and glxinfo.")
loading library. GLEW provides efficient run-time mechanisms for determining
which OpenGL extensions are supported on the target platform. OpenGL core and
extension functionality is exposed in a single header file.")
- (license l:bsd-3)))
+ (license license:bsd-3)))
(define-public guile-opengl
(package
@@ -445,7 +445,7 @@ extension functionality is exposed in a single header file.")
(description
"Guile-OpenGL is a library for Guile that provides bindings to the
OpenGL graphics API.")
- (license l:lgpl3+)))
+ (license license:lgpl3+)))
(define-public libepoxy
(package
@@ -502,7 +502,7 @@ OpenGL graphics API.")
(synopsis "A library for handling OpenGL function pointer management")
(description
"A library for handling OpenGL function pointer management.")
- (license l:x11)))
+ (license license:x11)))
(define-public soil
(package
@@ -544,4 +544,4 @@ OpenGL graphics API.")
(description
"SOIL is a tiny C library used primarily for uploading textures into
OpenGL.")
- (license l:public-domain)))
+ (license license:public-domain)))
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 05/10] gnu: mesa: Update to 12.0.0.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (2 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 04/10] gnu: Rename #:prefix l: to #:prefix license: David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-18 16:55 ` [PATCH 06/10] gnu: mesa: Enable wayland support David Craven
` (5 subsequent siblings)
9 siblings, 0 replies; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm (mesa): Update to 12.0.0.
---
gnu/packages/gl.scm | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4ac926e..6e635a3 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -192,7 +192,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
- (version "11.0.9")
+ (version "12.0.0")
(source
(origin
(method url-fetch)
@@ -200,7 +200,7 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz"))
(sha256
(base32
- "009b3nq8ly5nzy9cxi9cxf4qasrhggjz0v0q87rwq5kaqvqjy9m1"))))
+ "1ikxaj4avz29ch403bblq3l47g1r6hp4har94i8r664k44jw1400"))))
(build-system gnu-build-system)
(propagated-inputs
`(("glproto" ,glproto)
@@ -213,19 +213,20 @@ also known as DXTn or DXTC) for Mesa.")
("libxxf86vm" ,libxxf86vm)))
;; TODO: Add vdpau.
(inputs
- `(("udev" ,eudev)
+ `(("expat" ,expat)
("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto)
- ("presentproto" ,presentproto)
- ("expat" ,expat)
("libva" ,(force libva-without-mesa))
("libxml2" ,libxml2)
;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
("libxvmc" ,libxvmc)
("makedepend" ,makedepend)
- ("s2tc" ,s2tc)))
+ ("presentproto" ,presentproto)
+ ("s2tc" ,s2tc)
+ ("udev" ,eudev)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python-2)))
(arguments
`(#:configure-flags
'(;; drop r300 from default gallium drivers, as it requires llvm
@@ -249,8 +250,10 @@ also known as DXTn or DXTC) for Mesa.")
#:phases (alist-cons-after
'unpack 'patch-create_test_cases
(lambda _
- (substitute* "src/glsl/tests/lower_jumps/create_test_cases.py"
- (("/usr/bin/env bash") (which "bash"))))
+ (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"))))
(alist-cons-before
'build 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys)
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (3 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 05/10] gnu: mesa: Update to 12.0.0 David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-19 20:47 ` Ludovic Courtès
2016-07-18 16:55 ` [PATCH 07/10] gnu: mesa: Enable virtio gallium driver David Craven
` (4 subsequent siblings)
9 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm (mesa): Enable configure-flags required by wayland.
---
gnu/packages/gl.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 6e635a3..67bab1b 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -223,7 +223,8 @@ also known as DXTn or DXTC) for Mesa.")
("makedepend" ,makedepend)
("presentproto" ,presentproto)
("s2tc" ,s2tc)
- ("udev" ,eudev)))
+ ("udev" ,eudev)
+ ("wayland" ,wayland)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python-2)))
@@ -233,12 +234,16 @@ also known as DXTn or DXTC) for Mesa.")
"--with-gallium-drivers=r600,svga,swrast,nouveau"
;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio
- "--with-egl-platforms=x11,drm"
+ "--with-egl-platforms=x11,drm,wayland"
"--enable-glx-tls" ;Thread Local Storage, improves performance
;; "--enable-opencl"
;; "--enable-omx"
"--enable-osmesa"
"--enable-xa"
+ ;; features required by wayland
+ "--enable-gles2"
+ "--enable-gbm"
+ "--enable-shared-glapi"
;; on non-intel systems, drop i915 and i965
;; from the default dri drivers
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-18 16:55 ` [PATCH 06/10] gnu: mesa: Enable wayland support David Craven
@ 2016-07-19 20:47 ` Ludovic Courtès
2016-07-19 20:55 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-19 20:47 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/packages/gl.scm (mesa): Enable configure-flags required by wayland.
This patch and the other patches that touch libdrm and mesa look good
but… they trigger a lot of rebuild, so we need to “schedule” them.
Currently the build farm is a bit overwhelmed as a consequence of the
recent outage, and there are already a couple of update branches waiting
(python-updates and core-updates).
Do these patches introduce API incompatibilities or things like that?
If not, I think we should group them with one of the other updates,
probably python-updates.
Thoughts?
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-19 20:47 ` Ludovic Courtès
@ 2016-07-19 20:55 ` David Craven
2016-07-21 12:13 ` Ludovic Courtès
0 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-19 20:55 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Sounds good. Just wondering what's the policy on default build options
in guixsd? Leaning more towards enable everything than enable as
little as possible? Or do you decide on a case by case basis? Just
curious...
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-19 20:55 ` David Craven
@ 2016-07-21 12:13 ` Ludovic Courtès
2016-07-21 12:19 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-21 12:13 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
Hi!
David Craven <david@craven.ch> skribis:
> Sounds good. Just wondering what's the policy on default build options
> in guixsd? Leaning more towards enable everything than enable as
> little as possible? Or do you decide on a case by case basis? Just
> curious...
It’s mostly on a case-by-case basis.
An important criterion to decide whether to add an optional dependency
or feature is its popularity over extra-space ratio.
For instance, I suspect Wayland is not used much with Guix. Thus, we
should check how adding Wayland support affects the size of Mesa’s
closure, using ‘guix size’:
https://www.gnu.org/software/guix/manual/html_node/Invoking-guix-size.html
If the overhead is “small”, that’s fine; otherwise, that may suggest
leaving it disabled in the default Mesa.
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 12:13 ` Ludovic Courtès
@ 2016-07-21 12:19 ` David Craven
2016-07-21 12:29 ` Efraim Flashner
2016-07-21 16:02 ` Ludovic Courtès
0 siblings, 2 replies; 49+ messages in thread
From: David Craven @ 2016-07-21 12:19 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
When trying to run guix size on a custom built package I get a no
substitue information available message...
David
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 12:19 ` David Craven
@ 2016-07-21 12:29 ` Efraim Flashner
2016-07-21 12:38 ` Efraim Flashner
2016-07-21 16:02 ` Ludovic Courtès
1 sibling, 1 reply; 49+ messages in thread
From: Efraim Flashner @ 2016-07-21 12:29 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
On Thu, Jul 21, 2016 at 02:19:26PM +0200, David Craven wrote:
> When trying to run guix size on a custom built package I get a no
> substitue information available message...
>
You're going to have to build it first both ways, once with and once
without the wayland support.
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 12:29 ` Efraim Flashner
@ 2016-07-21 12:38 ` Efraim Flashner
0 siblings, 0 replies; 49+ messages in thread
From: Efraim Flashner @ 2016-07-21 12:38 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 733 bytes --]
On Thu, Jul 21, 2016 at 03:29:37PM +0300, Efraim Flashner wrote:
> On Thu, Jul 21, 2016 at 02:19:26PM +0200, David Craven wrote:
> > When trying to run guix size on a custom built package I get a no
> > substitue information available message...
> >
>
> You're going to have to build it first both ways, once with and once
> without the wayland support.
>
`guix size mesa' -> 203.0 MiB
`guix size mesa wayland' -> 214.6 MiB
wayland = 1.4
libxml2 = 10.0
libffi = 0.1
------
~ 11.5 MiB
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 12:19 ` David Craven
2016-07-21 12:29 ` Efraim Flashner
@ 2016-07-21 16:02 ` Ludovic Courtès
2016-07-21 16:04 ` David Craven
1 sibling, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-21 16:02 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> When trying to run guix size on a custom built package I get a no
> substitue information available message...
Quoting the manual:
When the package passed to ‘guix size’ is available in the store,
‘guix size’ queries the daemon to determine its dependencies, and
measures its size in the store, similar to ‘du -ms --apparent-size’
(*note (coreutils)du invocation::).
When the given package is _not_ in the store, ‘guix size’ reports
information based on the available substitutes (*note Substitutes::).
This makes it possible it to profile disk usage of store items that are
not even on disk, only available remotely.
Maybe the package in question was neither in your store, nor on the
substitute server?
HTH,
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 16:02 ` Ludovic Courtès
@ 2016-07-21 16:04 ` David Craven
2016-07-29 7:28 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-21 16:04 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ah I'm still rebuilding after a rebase, that's probably the issue then.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-21 16:04 ` David Craven
@ 2016-07-29 7:28 ` David Craven
2016-07-29 14:57 ` Ludovic Courtès
0 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-29 7:28 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
So is this going into the main mesa package? Or should I submit a
mesa-wayland package instead?
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-29 7:28 ` David Craven
@ 2016-07-29 14:57 ` Ludovic Courtès
2016-07-29 15:26 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-29 14:57 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> So is this going into the main mesa package? Or should I submit a
> mesa-wayland package instead?
(Please keep a bit of context when replying.)
In my last message I gave you the main criterion for deciding whether to
add Wayland support in Mesa so that you could decide whether to it was
worthy:
https://lists.gnu.org/archive/html/guix-devel/2016-07/msg00840.html
What did ‘guix size’ reveal, and what does it suggest? :-)
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-29 14:57 ` Ludovic Courtès
@ 2016-07-29 15:26 ` David Craven
2016-07-30 22:22 ` Ludovic Courtès
2016-07-30 22:23 ` Ludovic Courtès
0 siblings, 2 replies; 49+ messages in thread
From: David Craven @ 2016-07-29 15:26 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
> What did ‘guix size’ reveal, and what does it suggest? :-)
Efraim did an estimate of about 10 MB, my measurement was 30MB but
that includes the spirv toolchain and virtio driver. Are these
boundaries measurements close enough for a decision? I can do a more
precise measurement if you want... I guess we can live with 10-15MB =P
But I'm probably biases xD
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-29 15:26 ` David Craven
@ 2016-07-30 22:22 ` Ludovic Courtès
2016-07-30 22:23 ` Ludovic Courtès
1 sibling, 0 replies; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-30 22:22 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
>> What did ‘guix size’ reveal, and what does it suggest? :-)
>
> Efraim did an estimate of about 10 MB, my measurement was 30MB but
> that includes the spirv toolchain and virtio driver.
Comparing ‘guix size mesa’ to ‘guix size mesa wayland’ shows a 6%
increase (203 to 214 MiB), which sounds reasonable, indeed.
Go for it!
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/10] gnu: mesa: Enable wayland support.
2016-07-29 15:26 ` David Craven
2016-07-30 22:22 ` Ludovic Courtès
@ 2016-07-30 22:23 ` Ludovic Courtès
2016-08-05 14:31 ` David Craven
1 sibling, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-30 22:23 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
>> What did ‘guix size’ reveal, and what does it suggest? :-)
I wrote “go for it”, but I should have added “not now”. :-)
Mesa has 467 dependents, which we cannot afford to rebuild at the
moment.
Could you keep it on hold?
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 07/10] gnu: mesa: Enable virtio gallium driver.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (4 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 06/10] gnu: mesa: Enable wayland support David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-18 16:55 ` [PATCH 08/10] gnu: mesa-utils: Update to 8.3.0 David Craven
` (3 subsequent siblings)
9 siblings, 0 replies; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm (mesa): Enable virtio gallium driver.
---
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 67bab1b..5e4fca9 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -231,7 +231,7 @@ also known as DXTn or DXTC) for Mesa.")
(arguments
`(#:configure-flags
'(;; drop r300 from default gallium drivers, as it requires llvm
- "--with-gallium-drivers=r600,svga,swrast,nouveau"
+ "--with-gallium-drivers=r600,svga,swrast,nouveau,virgl"
;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio
"--with-egl-platforms=x11,drm,wayland"
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 08/10] gnu: mesa-utils: Update to 8.3.0.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (5 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 07/10] gnu: mesa: Enable virtio gallium driver David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-19 20:43 ` Ludovic Courtès
2016-07-18 16:55 ` [PATCH 09/10] vm: Honor 'QEMU_FLAGS' and 'QEMU_NET_FLAGS' David Craven
` (2 subsequent siblings)
9 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/packages/gl.scm (mesa-utils): Update to 8.3.0.
---
gnu/packages/gl.scm | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 5e4fca9..21a9463 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -325,12 +325,12 @@ emulation to complete hardware acceleration for modern GPUs.")
(method url-fetch)
(uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/demos/" version
"/mesa-demos-" version ".tar.bz2"))
- (sha256 (base32 "14msj0prbl3ljwd24yaqv9pz1xzicdmqgg616xxlppbdh6syrgz4"))))
+ (sha256 (base32 "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"))))
(define-public mesa-utils
(package
(name "mesa-utils")
- (version "8.2.0")
+ (version "8.3.0")
(source (mesa-demos-source version))
(build-system gnu-build-system)
(inputs
@@ -340,12 +340,7 @@ emulation to complete hardware acceleration for modern GPUs.")
(native-inputs
`(("pkg-config" ,pkg-config)))
(arguments
- '(;; XXX: fails to build against latest mesa:
- ;; eglut.c: error: 'EGL_SCREEN_BIT_MESA' undeclared
- ;;
- ;; <https://bugs.freedesktop.org/show_bug.cgi?id=91643>
- #:configure-flags '("--disable-egl")
- #:phases
+ '(#:phases
(modify-phases %standard-phases
(replace
'install
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [PATCH 09/10] vm: Honor 'QEMU_FLAGS' and 'QEMU_NET_FLAGS'.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (6 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 08/10] gnu: mesa-utils: Update to 8.3.0 David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-19 20:35 ` Ludovic Courtès
2016-07-18 16:55 ` [PATCH 10/10] vm: Enable virtio gpu by default David Craven
2016-07-21 10:15 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile Andy Wingo
9 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/system/vm.scm (common-qemu-options): Add 'QEMU_FLAGS' and
'QEMU_NET_FLAGS'.
---
gnu/system/vm.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index c31e3a8..9f52909 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -462,11 +462,11 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
"")
" -no-reboot -net nic,model=virtio \
" #$@(map virtfs-option shared-fs) " \
- -net user \
+ -net user,$QEMU_NET_FLAGS \
-vga std \
-drive file=" #$image
",if=virtio,cache=writeback,werror=report,readonly \
- -m 256"))
+ -m 256 $QEMU_FLAGS"))
(define* (system-qemu-image/shared-store-script os
#:key
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 09/10] vm: Honor 'QEMU_FLAGS' and 'QEMU_NET_FLAGS'.
2016-07-18 16:55 ` [PATCH 09/10] vm: Honor 'QEMU_FLAGS' and 'QEMU_NET_FLAGS' David Craven
@ 2016-07-19 20:35 ` Ludovic Courtès
2016-07-19 20:38 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: Ludovic Courtès @ 2016-07-19 20:35 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
David Craven <david@craven.ch> skribis:
> * gnu/system/vm.scm (common-qemu-options): Add 'QEMU_FLAGS' and
> 'QEMU_NET_FLAGS'.
> ---
> gnu/system/vm.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
> index c31e3a8..9f52909 100644
> --- a/gnu/system/vm.scm
> +++ b/gnu/system/vm.scm
> @@ -462,11 +462,11 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
> "")
> " -no-reboot -net nic,model=virtio \
> " #$@(map virtfs-option shared-fs) " \
> - -net user \
> + -net user,$QEMU_NET_FLAGS \
> -vga std \
> -drive file=" #$image
> ",if=virtio,cache=writeback,werror=report,readonly \
> - -m 256"))
> + -m 256 $QEMU_FLAGS"))
When is this needed? ‘guix system vm’ returns a script that appends its
arguments, so you can do:
$(guix system vm foo.scm) -m 1024 -net foo,bar
Ludo’.
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 10/10] vm: Enable virtio gpu by default.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (7 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 09/10] vm: Honor 'QEMU_FLAGS' and 'QEMU_NET_FLAGS' David Craven
@ 2016-07-18 16:55 ` David Craven
2016-07-21 10:15 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile Andy Wingo
9 siblings, 0 replies; 49+ messages in thread
From: David Craven @ 2016-07-18 16:55 UTC (permalink / raw)
To: guix-devel; +Cc: David Craven
* gnu/system/vm.scm (common-qemu-options): Enable virtio gpu by default.
---
gnu/system/vm.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 9f52909..1a2c2eb 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -463,7 +463,7 @@ with '-virtfs' options for the host file systems listed in SHARED-FS."
" -no-reboot -net nic,model=virtio \
" #$@(map virtfs-option shared-fs) " \
-net user,$QEMU_NET_FLAGS \
- -vga std \
+ -vga virtio \
-drive file=" #$image
",if=virtio,cache=writeback,werror=report,readonly \
-m 256 $QEMU_FLAGS"))
--
2.9.0
^ permalink raw reply related [flat|nested] 49+ messages in thread
* Re: [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile.
2016-07-18 16:55 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile David Craven
` (8 preceding siblings ...)
2016-07-18 16:55 ` [PATCH 10/10] vm: Enable virtio gpu by default David Craven
@ 2016-07-21 10:15 ` Andy Wingo
2016-07-21 11:17 ` David Craven
9 siblings, 1 reply; 49+ messages in thread
From: Andy Wingo @ 2016-07-21 10:15 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Mon 18 Jul 2016 18:55, David Craven <david@craven.ch> writes:
> * gnu/system.scm (operating-system-etc-service): Remove "export" for
> 'GST_PLUGIN_PATH'.
> ---
> gnu/system.scm | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index 476720b..fe62c3e 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -433,9 +433,6 @@ fi
> # See <http://bugs.gnu.org/22650>.
> umask 022
>
> -# Allow GStreamer-based applications to find plugins.
> -export GST_PLUGIN_PATH=\"$HOME/.guix-profile/lib/gstreamer-1.0\"
> -
> if [ -n \"$BASH_VERSION\" -a -f /etc/bashrc ]
> then
> # Load Bash-specific initialization code.
What is the impact of this change on users?
Will it still be possible to install rhythmbox, then some GStreamer
plugins, and have rhythmbox recognize those plugins?
Andy
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile.
2016-07-21 10:15 ` [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile Andy Wingo
@ 2016-07-21 11:17 ` David Craven
2016-07-21 11:41 ` Vincent Legoll
0 siblings, 1 reply; 49+ messages in thread
From: David Craven @ 2016-07-21 11:17 UTC (permalink / raw)
To: Andy Wingo; +Cc: guix-devel
> What is the impact of this change on users?
>
> Will it still be possible to install rhythmbox, then some GStreamer
> plugins, and have rhythmbox recognize those plugins?
I think that to do that you'd create a custom package called my
rythmbox or something, declare rythmbox and the optional plugins as
dependencies and add a startup script that sets the correct
environment variables or something like that.
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/10] system: Do not export GST_PLUGIN_PATH in /etc/profile.
2016-07-21 11:17 ` David Craven
@ 2016-07-21 11:41 ` Vincent Legoll
2016-07-21 11:57 ` David Craven
0 siblings, 1 reply; 49+ messages in thread
From: Vincent Legoll @ 2016-07-21 11:41 UTC (permalink / raw)
To: David Craven; +Cc: guix-devel
On Thu, Jul 21, 2016 at 1:17 PM, David Craven <david@craven.ch> wrote:
>> What is the impact of this change on users?
>>
>> Will it still be possible to install rhythmbox, then some GStreamer
>> plugins, and have rhythmbox recognize those plugins?
>
> I think that to do that you'd create a custom package called my
> rythmbox or something, declare rythmbox and the optional plugins as
> dependencies and add a startup script that sets the correct
> environment variables or something like that.
Why not simply move that variable declaration to the skeleton shell
init script that is copied into $HOME/.bashrc so that everything still
works properly without having to do anything ?
--
Vincent Legoll
^ permalink raw reply [flat|nested] 49+ messages in thread