* [bug#29517] [PATCH] gnu: gl: Add virtualgl. @ 2017-12-01 7:26 Rutger Helling 2017-12-07 8:14 ` [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) Rutger Helling 0 siblings, 1 reply; 6+ messages in thread From: Rutger Helling @ 2017-12-01 7:26 UTC (permalink / raw) To: 29517 [-- Attachment #1.1: Type: text/plain, Size: 38 bytes --] Hey Guix, this patch adds VirtualGL. [-- Attachment #1.2: Type: text/html, Size: 231 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-gl-Add-virtualgl.patch --] [-- Type: text/x-diff; name=0001-gnu-gl-Add-virtualgl.patch, Size: 2575 bytes --] From 379ef9da3864fa7441f291e5e69cca39ca8c57db Mon Sep 17 00:00:00 2001 From: Rutger Helling <rhelling@mykolab.com> Date: Fri, 1 Dec 2017 08:22:21 +0100 Subject: [PATCH] gnu: gl: Add virtualgl. * gnu/packages/gl.scm (virtualgl): New variable. --- gnu/packages/gl.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 50c327156..0ff909aae 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -676,3 +678,34 @@ mixed vector/bitmap output.") (license (list license:lgpl2.0+ (license:fsf-free "http://www.geuz.org/gl2ps/COPYING.GL2PS" "GPL-incompatible copyleft license"))))) + +(define-public virtualgl + (package + (name "virtualgl") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/VirtualGL/virtualgl/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) + (arguments + `(#:tests? #f ;; no tests are available + #:configure-flags '("-DVGL_USESSL=1"))) ;; use OpenSSL + (build-system cmake-build-system) + (inputs `(("glu" ,glu) + ("libjpeg-turbo" ,libjpeg-turbo) + ("mesa" ,mesa) + ("openssl" ,openssl))) + (native-inputs `(("pkg-config", pkg-config))) + (home-page "https://www.virtualgl.org") + (synopsis "Redirects 3D commands from an OpenGL application onto a 3D +graphics card") + (description "VirtualGL is a free software program that redirects the 3D +rendering commands from Unix and Linux OpenGL applications to 3D accelerator +hardware in a dedicated server and displays the rendered output interactively to +a thin client located elsewhere on the network.") + (license license:lgpl2.1))) -- 2.15.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) 2017-12-01 7:26 [bug#29517] [PATCH] gnu: gl: Add virtualgl Rutger Helling @ 2017-12-07 8:14 ` Rutger Helling 2017-12-08 9:21 ` Ludovic Courtès 0 siblings, 1 reply; 6+ messages in thread From: Rutger Helling @ 2017-12-07 8:14 UTC (permalink / raw) To: 29517 [-- Attachment #1.1: Type: text/plain, Size: 94 bytes --] Here's a second version of the patch that also makes sure the libraries are installed in /lib. [-- Attachment #1.2: Type: text/html, Size: 281 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-gl-Add-virtualgl-v2.patch --] [-- Type: text/x-diff; name=0001-gnu-gl-Add-virtualgl-v2.patch, Size: 2726 bytes --] From d2b7f7243a8831542538bad5bab14fba0693a4fc Mon Sep 17 00:00:00 2001 From: Rutger Helling <rhelling@mykolab.com> Date: Thu, 7 Dec 2017 09:11:08 +0100 Subject: [PATCH] gnu: gl: Add virtualgl. * gnu/packages/gl.scm (virtualgl): New variable. --- gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 50c327156..b99f063f7 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -676,3 +678,36 @@ mixed vector/bitmap output.") (license (list license:lgpl2.0+ (license:fsf-free "http://www.geuz.org/gl2ps/COPYING.GL2PS" "GPL-incompatible copyleft license"))))) + +(define-public virtualgl + (package + (name "virtualgl") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/VirtualGL/virtualgl/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) + (arguments + `(#:tests? #f ;; no tests are available + #:configure-flags (list "-DVGL_USESSL=1" ;; use OpenSSL + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib")))) + (build-system cmake-build-system) + (inputs `(("glu" ,glu) + ("libjpeg-turbo" ,libjpeg-turbo) + ("mesa" ,mesa) + ("openssl" ,openssl))) + (native-inputs `(("pkg-config", pkg-config))) + (home-page "https://www.virtualgl.org") + (synopsis "Redirects 3D commands from an OpenGL application onto a 3D +graphics card") + (description "VirtualGL is a free software program that redirects the 3D +rendering commands from Unix and Linux OpenGL applications to 3D accelerator +hardware in a dedicated server and displays the rendered output interactively to +a thin client located elsewhere on the network.") + (license license:lgpl2.1))) -- 2.15.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) 2017-12-07 8:14 ` [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) Rutger Helling @ 2017-12-08 9:21 ` Ludovic Courtès 2017-12-08 10:38 ` Rutger Helling 0 siblings, 1 reply; 6+ messages in thread From: Ludovic Courtès @ 2017-12-08 9:21 UTC (permalink / raw) To: Rutger Helling; +Cc: 29517 Hi, Rutger Helling <rhelling@mykolab.com> skribis: > From d2b7f7243a8831542538bad5bab14fba0693a4fc Mon Sep 17 00:00:00 2001 > From: Rutger Helling <rhelling@mykolab.com> > Date: Thu, 7 Dec 2017 09:11:08 +0100 > Subject: [PATCH] gnu: gl: Add virtualgl. > > * gnu/packages/gl.scm (virtualgl): New variable. LGTM, with a few minor issues: > + (home-page "https://www.virtualgl.org") > + (synopsis "Redirects 3D commands from an OpenGL application onto a 3D > +graphics card") > + (description "VirtualGL is a free software program that redirects the 3D s/free software// (Everything’s free software in Guix. :-)) > +rendering commands from Unix and Linux OpenGL applications to 3D accelerator s/Unix and Linux//g > +hardware in a dedicated server and displays the rendered output interactively to > +a thin client located elsewhere on the network.") > + (license license:lgpl2.1))) Source code headers read this: * This library is free software and may be redistributed and/or modified under * the terms of the wxWindows Library License, Version 3.1 or (at your option) * any later version. The full license is in the LICENSE.txt file included * with this distribution. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * wxWindows Library License for more details. We don’t have that license in (guix licenses) yet. Could you add it and send updated patches? Thanks, Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) 2017-12-08 9:21 ` Ludovic Courtès @ 2017-12-08 10:38 ` Rutger Helling 2017-12-08 14:00 ` Ludovic Courtès 2017-12-08 14:04 ` bug#29517: " Ludovic Courtès 0 siblings, 2 replies; 6+ messages in thread From: Rutger Helling @ 2017-12-08 10:38 UTC (permalink / raw) To: ludo; +Cc: 29517 [-- Attachment #1.1: Type: text/plain, Size: 1754 bytes --] Hi Ludo, thanks for the review! Here are updated patches based on your feedback. On 2017-12-08 10:21, ludo@gnu.org wrote: > Hi, > > Rutger Helling <rhelling@mykolab.com> skribis: > >> From d2b7f7243a8831542538bad5bab14fba0693a4fc Mon Sep 17 00:00:00 2001 >> From: Rutger Helling <rhelling@mykolab.com> >> Date: Thu, 7 Dec 2017 09:11:08 +0100 >> Subject: [PATCH] gnu: gl: Add virtualgl. >> >> * gnu/packages/gl.scm (virtualgl): New variable. > > LGTM, with a few minor issues: > >> + (home-page "https://www.virtualgl.org") >> + (synopsis "Redirects 3D commands from an OpenGL application onto a 3D >> +graphics card") >> + (description "VirtualGL is a free software program that redirects the 3D > > s/free software// > > (Everything's free software in Guix. :-)) > >> +rendering commands from Unix and Linux OpenGL applications to 3D accelerator > > s/Unix and Linux//g > >> +hardware in a dedicated server and displays the rendered output interactively to >> +a thin client located elsewhere on the network.") >> + (license license:lgpl2.1))) > > Source code headers read this: > > * This library is free software and may be redistributed and/or modified under > * the terms of the wxWindows Library License, Version 3.1 or (at your option) > * any later version. The full license is in the LICENSE.txt file included > * with this distribution. > * > * This library is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > * wxWindows Library License for more details. > > We don't have that license in (guix licenses) yet. Could you add it and > send updated patches? > > Thanks, > Ludo'. [-- Attachment #1.2: Type: text/html, Size: 3101 bytes --] [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-guix-licenses-Add-wxWindows-3.1-license.patch --] [-- Type: text/x-diff; name=0001-guix-licenses-Add-wxWindows-3.1-license.patch, Size: 1333 bytes --] From c593bd89f7f991cc8d9a19e1d06f0439f16d7805 Mon Sep 17 00:00:00 2001 From: Rutger Helling <rhelling@mykolab.com> Date: Fri, 8 Dec 2017 11:31:57 +0100 Subject: [PATCH] guix: licenses: Add wxWindows 3.1 license. * guix/licenses.scm: Add wxWindows 3.1 license. --- guix/licenses.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/guix/licenses.scm b/guix/licenses.scm index b07d80076..8fa121fd4 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,6 +92,7 @@ zlib fsf-free wtfpl2 + wxwindows3.1 fsdg-compatible)) (define-record-type <license> @@ -581,6 +583,11 @@ at URI, which may be a file:// URI pointing the package's tree." "http://www.wtfpl.net" "http://www.wtfpl.net/about/")) +(define wxwindows3.1 + (license "wxWindows 3.1" + "https://wxwidgets.org" + "https://wxwidgets.org/about/licence")) + (define x11 (license "X11" "http://directory.fsf.org/wiki/License:X11" -- 2.15.1 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #3: 0002-gnu-gl-Add-virtualgl.patch --] [-- Type: text/x-diff; name=0002-gnu-gl-Add-virtualgl.patch, Size: 2684 bytes --] From 3039ed703888a50cc7f5552578a2c4073a77b829 Mon Sep 17 00:00:00 2001 From: Rutger Helling <rhelling@mykolab.com> Date: Fri, 8 Dec 2017 11:33:54 +0100 Subject: [PATCH] gnu: gl: Add virtualgl. * gnu/packages/gl.scm (virtualgl): New variable. --- gnu/packages/gl.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 50c327156..d74362727 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -676,3 +678,36 @@ mixed vector/bitmap output.") (license (list license:lgpl2.0+ (license:fsf-free "http://www.geuz.org/gl2ps/COPYING.GL2PS" "GPL-incompatible copyleft license"))))) + +(define-public virtualgl + (package + (name "virtualgl") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/VirtualGL/virtualgl/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rnid3hwrry9d5d4m7sygq00xxx976rgk00a3557m9r5kxbmy476")))) + (arguments + `(#:tests? #f ;; no tests are available + #:configure-flags (list "-DVGL_USESSL=1" ;; use OpenSSL + (string-append "-DCMAKE_INSTALL_LIBDIR=" + (assoc-ref %outputs "out") "/lib")))) + (build-system cmake-build-system) + (inputs `(("glu" ,glu) + ("libjpeg-turbo" ,libjpeg-turbo) + ("mesa" ,mesa) + ("openssl" ,openssl))) + (native-inputs `(("pkg-config", pkg-config))) + (home-page "https://www.virtualgl.org") + (synopsis "Redirects 3D commands from an OpenGL application onto a 3D +graphics card") + (description "VirtualGL redirects the 3D rendering commands from OpenGL +applications to 3D accelerator hardware in a dedicated server and displays the +rendered output interactively to a thin client located elsewhere on the +network.") + (license license:wxwindows3.1))) -- 2.15.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) 2017-12-08 10:38 ` Rutger Helling @ 2017-12-08 14:00 ` Ludovic Courtès 2017-12-08 14:04 ` bug#29517: " Ludovic Courtès 1 sibling, 0 replies; 6+ messages in thread From: Ludovic Courtès @ 2017-12-08 14:00 UTC (permalink / raw) To: Rutger Helling; +Cc: 29517 [-- Attachment #1: Type: text/plain, Size: 536 bytes --] Rutger Helling <rhelling@mykolab.com> skribis: > From c593bd89f7f991cc8d9a19e1d06f0439f16d7805 Mon Sep 17 00:00:00 2001 > From: Rutger Helling <rhelling@mykolab.com> > Date: Fri, 8 Dec 2017 11:31:57 +0100 > Subject: [PATCH] guix: licenses: Add wxWindows 3.1 license. > > * guix/licenses.scm: Add wxWindows 3.1 license. I adjusted the commit log and made these changes (reflect the “or any later version” with ‘+’, have the first field be the URI of the license and the second be the comments about the license): [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: Type: text/x-patch, Size: 839 bytes --] diff --git a/guix/licenses.scm b/guix/licenses.scm index 8fa121fd4..269d97c72 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -92,7 +92,7 @@ zlib fsf-free wtfpl2 - wxwindows3.1 + wxwindows3.1+ fsdg-compatible)) (define-record-type <license> @@ -583,10 +583,10 @@ at URI, which may be a file:// URI pointing the package's tree." "http://www.wtfpl.net" "http://www.wtfpl.net/about/")) -(define wxwindows3.1 - (license "wxWindows 3.1" - "https://wxwidgets.org" - "https://wxwidgets.org/about/licence")) +(define wxwindows3.1+ + (license "wxWindows 3.1+" + "https://wxwidgets.org/about/licence" + "https://www.gnu.org/licenses/license-list.html#Wxwind")) (define x11 (license "X11" [-- Attachment #3: Type: text/plain, Size: 12 bytes --] Ludo’. ^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#29517: [PATCH] gnu: gl: Add virtualgl. (v2) 2017-12-08 10:38 ` Rutger Helling 2017-12-08 14:00 ` Ludovic Courtès @ 2017-12-08 14:04 ` Ludovic Courtès 1 sibling, 0 replies; 6+ messages in thread From: Ludovic Courtès @ 2017-12-08 14:04 UTC (permalink / raw) To: Rutger Helling; +Cc: 29517-done Rutger Helling <rhelling@mykolab.com> skribis: > From 3039ed703888a50cc7f5552578a2c4073a77b829 Mon Sep 17 00:00:00 2001 > From: Rutger Helling <rhelling@mykolab.com> > Date: Fri, 8 Dec 2017 11:33:54 +0100 > Subject: [PATCH] gnu: gl: Add virtualgl. > > * gnu/packages/gl.scm (virtualgl): New variable. I adjusted the ‘license’ field to add ‘+’ and pushed. Thanks! Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-08 14:05 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-12-01 7:26 [bug#29517] [PATCH] gnu: gl: Add virtualgl Rutger Helling 2017-12-07 8:14 ` [bug#29517] [PATCH] gnu: gl: Add virtualgl. (v2) Rutger Helling 2017-12-08 9:21 ` Ludovic Courtès 2017-12-08 10:38 ` Rutger Helling 2017-12-08 14:00 ` Ludovic Courtès 2017-12-08 14:04 ` bug#29517: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).