nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: brdf-explorer: Update to 1.0.0-1.5b2cd46f3. 

* gnu/packages/graphics.scm (brdf-explorer): Update to 1.0.0-1.5b2cd46f3.
[source]: Use git-fetch method.
[arguments]: Adjust configure phase.
[native-inputs]: Replace qt with qttools.
[inputs]: Replace qt with qtbase.
This commit is contained in:
Ricardo Wurmus 2017-05-24 23:23:42 +02:00
parent ff51a87cae
commit 9b91fb32f8
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/packages/graphics.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; ;;;
@ -23,7 +23,7 @@
(define-module (gnu packages graphics) (define-module (gnu packages graphics)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix svn-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -423,19 +423,21 @@ output.")
(license (license:non-copyleft "file://LICENSE")))) (license (license:non-copyleft "file://LICENSE"))))
(define-public brdf-explorer (define-public brdf-explorer
(package
(name "brdf-explorer")
(version "17") ;svn revision
(source (origin
;; There are no release tarballs, and not even tags in the repo, ;; There are no release tarballs, and not even tags in the repo,
;; so use the latest revision. ;; so use the latest revision.
(method svn-fetch) (let ((commit "5b2cd46f38a06e47207fa7229b72d37beb945019")
(uri (svn-reference (revision "1"))
(url "https://github.com/wdas/brdf") (package
(revision (string->number version)))) (name "brdf-explorer")
(version (string-append "1.0.0-" revision "." (string-take commit 9)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/wdas/brdf.git")
(commit commit)))
(sha256 (sha256
(base32 (base32
"1458fwsqxramh0gpnp24x7brfpl9afhvr1wqg6c78xqwf32960m5")) "06vzbiajzbi2xl8jlff5d45bc9wd68i3jdndfab1f3jgfrd8bsgx"))
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -443,10 +445,8 @@ output.")
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(chdir "trunk")
(zero? (system* "qmake" (zero? (system* "qmake"
(string-append (string-append "prefix=" out))))))
"prefix=" out))))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -464,9 +464,9 @@ exec -a \"$0\" ~a/.brdf-real~%"
data bin))) data bin)))
(chmod "brdf" #o555)))))))) (chmod "brdf" #o555))))))))
(native-inputs (native-inputs
`(("qt" ,qt-4))) ;for 'qmake' `(("qttools" ,qttools))) ;for 'qmake'
(inputs (inputs
`(("qt" ,qt-4) `(("qtbase" ,qtbase)
("mesa" ,mesa) ("mesa" ,mesa)
("glew" ,glew) ("glew" ,glew)
("freeglut" ,freeglut) ("freeglut" ,freeglut)
@ -482,7 +482,7 @@ language), measured material data from the MERL database, and anisotropic
measured material data from MIT CSAIL. Graphs and visualizations update in measured material data from MIT CSAIL. Graphs and visualizations update in
real time as parameters are changed, making it a useful tool for evaluating real time as parameters are changed, making it a useful tool for evaluating
and understanding different BRDFs (and other component functions).") and understanding different BRDFs (and other component functions).")
(license license:ms-pl))) (license license:ms-pl))))
(define-public agg (define-public agg
(package (package