From 6fe808f4c3272cbf5329054aacfb1bafc302c4bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 22:05:34 +0200 Subject: gnu: mesa: Use the "release" Meson build type. * gnu/packages/gl.scm (mesa)[arguments]: Add <#:build-type>. --- gnu/packages/gl.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9ed043c7ae..f615ebd71c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -331,6 +331,11 @@ also known as DXTn or DXTC) for Mesa.") "-Dllvm=true")) ; default is x86/x86_64 only (_ '("-Ddri-drivers=nouveau,r200,r100")))) + + ;; XXX: 'debugoptimized' causes LTO link failures on some drivers. The + ;; documentation recommends using 'release' for performance anyway. + #:build-type "release" + #:modules ((ice-9 match) (srfi srfi-1) (guix build utils) -- cgit v1.2.3 From c7e31cde04f6308615734f5c6fd91de87e1a60f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 25 Apr 2019 15:46:36 +0200 Subject: gnu: ftgl: Update to 2.4.0. * gnu/packages/gl.scm (ftgl): Update to 2.4.0. [home-page]: Change to maintained fork at . [source]: Change to GIT-FETCH. [native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL. --- gnu/packages/gl.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f615ebd71c..e7d50a5b8a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -149,15 +149,16 @@ the X-Consortium license.") (define-public ftgl (package (name "ftgl") - (version "2.1.3-rc5") + (version "2.4.0") + (home-page "https://github.com/frankheckenbach/ftgl") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/ftgl/FTGL%20Source/2.1.3~rc5/" - "ftgl-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l")))) + "0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) @@ -167,8 +168,10 @@ the X-Consortium license.") ("mesa" ,mesa) ("glu" ,glu))) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "http://ftgl.sourceforge.net") + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (synopsis "Font rendering library for OpenGL applications") (description "FTGL is a font rendering library for OpenGL applications. Supported -- cgit v1.2.3 From 5c1547383f1d8fca1e46a1a3a17e90b61ece915c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 24 Sep 2019 09:44:49 +0200 Subject: gnu: Add mojoshader. * gnu/packages/gl.scm (mojoshader): New variable. --- gnu/packages/gl.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index a2658a6789..c05ce4e06a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2019 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (gnu packages xorg) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) @@ -801,3 +803,56 @@ 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+))) + +(define-public mojoshader + (let ((changeset "5887634ea695")) + (package + (name "mojoshader") + (version changeset) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.icculus.org/icculus/mojoshader/") + (changeset changeset))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ibl4z1696jiifv9j5drir7jm0b5px0vwkwckbi7cfd46p7p6wcy")))) + (arguments + ;; Tests only for COMPILER_SUPPORT=ON. + `(#:tests? #f + #:configure-flags '("-DBUILD_SHARED=ON") + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (header (string-append out "/include"))) + (install-file "libmojoshader.so" lib) + (for-each (lambda (f) + (install-file f header)) + (find-files "../source" "mojoshader.*\\.h$")) + (let ((profiles-header (string-append header "/profiles"))) + (mkdir-p profiles-header) + (rename-file (string-append header "/mojoshader_profile.h") + (string-append profiles-header "/mojoshader_profile.h")))) + #t))))) + (build-system cmake-build-system) + (home-page "https://www.icculus.org/mojoshader/") + (synopsis "Work with Direct3D shaders on alternate 3D APIs") + (description "MojoShader is a library to work with Direct3D shaders on +alternate 3D APIs and non-Windows platforms. The primary motivation is moving +shaders to OpenGL languages on the fly. The developer deals with \"profiles\" +that represent various target languages, such as GLSL or ARB_*_program. + +This allows a developer to manage one set of shaders, presumably written in +Direct3D HLSL, and use them across multiple rendering backends. This also +means that the developer only has to worry about one (offline) compiler to +manage program complexity, while MojoShader itself deals with the reduced +complexity of the bytecode at runtime. + +MojoShader provides both a simple API to convert bytecode to various profiles, +and (optionally) basic glue to rendering APIs to abstract the management of +the shaders at runtime.") + (license license:zlib)))) -- cgit v1.2.3 From 3429f5d923300675a8ffa28b2d4cb1bd66ae452e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 24 Sep 2019 11:27:31 +0200 Subject: gnu: mojoshader: Broaden feature support (viewport flipping and depth clipping). * gnu/packages/gl.scm (mojoshader)[arguments]: Build with FLIP_VIEWPORT and DEPTH_CLIPPING. --- gnu/packages/gl.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c05ce4e06a..c02d88694c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -808,7 +808,7 @@ network.") (let ((changeset "5887634ea695")) (package (name "mojoshader") - (version changeset) + (version (string-append "20190825" "-" changeset)) (source (origin (method hg-fetch) @@ -821,7 +821,9 @@ network.") (arguments ;; Tests only for COMPILER_SUPPORT=ON. `(#:tests? #f - #:configure-flags '("-DBUILD_SHARED=ON") + #:configure-flags '("-DBUILD_SHARED=ON" + "-DFLIP_VIEWPORT=ON" + "-DDEPTH_CLIPPING=ON") #:phases (modify-phases %standard-phases (replace 'install -- cgit v1.2.3 From b150e83bef766ca67a3931afce36b6cb6c7f8c10 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 24 Sep 2019 11:32:45 +0200 Subject: gnu: Add mojoshader-with-viewport-flip. * gnu/packages/gl.scm (mojoshader-with-viewport-flip): New variable. --- gnu/packages/gl.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c02d88694c..bfa80b1e13 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -858,3 +858,26 @@ MojoShader provides both a simple API to convert bytecode to various profiles, and (optionally) basic glue to rendering APIs to abstract the management of the shaders at runtime.") (license license:zlib)))) + +(define-public mojoshader-with-viewport-flip + ;; Changeset c586d4590241 replaced glProgramViewportFlip with + ;; glProgramViewportInfo. + ;; https://hg.icculus.org/icculus/mojoshader/rev/c586d4590241 + (let ((changeset "2e37299b13d8")) + (package + (inherit mojoshader) + (name "mojoshader-with-viewport-flip") + (version (string-append "20190725" "-" changeset)) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.icculus.org/icculus/mojoshader/") + (changeset changeset))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ffws7cqbskxwc3hjsnnzq4r2bbf008kdr3b11pa3kr7dsi50y6i")))) + (synopsis "Work with Direct3D shaders on alternate 3D APIs (with viewport flip)") + (description "This is the last version of the mojoshader library with +the glProgramViewportFlip before it was replaced with glProgramViewportInfo.") + (license license:zlib)))) -- cgit v1.2.3 From ccbc1c5eb2f3cc1979902b6bfd3e7b31aa66e661 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 3 Oct 2019 12:01:27 +0200 Subject: gnu: mesa: Disable faulty test on i686 also when cross-compiling. * gnu/packages/gl.scm (mesa)[arguments]: Fix 'patch-create_test_cases phase for cross-compilation. --- gnu/packages/gl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index bfa80b1e13..ec3a5d8cee 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -342,7 +342,8 @@ also known as DXTn or DXTC) for Mesa.") (substitute* "src/intel/genxml/gen_pack_header.py" (("/usr/bin/env python2") (which "python"))) #t)) - ,@(if (string-prefix? "i686" (%current-system)) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) ;; Disable new test from Mesa 19 that fails on i686. Upstream ;; report: . `((add-after 'unpack 'disable-failing-test -- cgit v1.2.3