diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e3e346b1e9..190632436b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2538,53 +2538,52 @@ official SDK.") (define-public openctm (let ((revision 603)) - ; Previous versions don't compile, they need to link libGL and libGLU. - ; Fixed in this revision. + ;; Previous versions don't compile, they need to link libGL and libGLU. + ;; Fixed in this revision. (package (name "openctm") - (version (number->string revision)) + (version (string-append "1.0.3." (number->string revision))) (source - (origin - (method svn-fetch) - (uri - (svn-reference - (url "https://svn.code.sf.net/p/openctm/code/trunk") - (revision revision))) - (sha256 - (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) + (origin + (method svn-fetch) + (uri (svn-reference + (url "https://svn.code.sf.net/p/openctm/code/trunk") + (revision revision))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "01wb70m48xh5gwhv60a5brv4sxl0i0rh038w32cgnlxn5x86s9f1")))) (build-system gnu-build-system) (native-inputs - `(("mesa" ,mesa) - ("glu" ,glu) - ("glut" ,freeglut) - ("gtk" ,gtk+-2) - ("pkg-config" ,pkg-config))) + `(("mesa" ,mesa) + ("glu" ,glu) + ("glut" ,freeglut) + ("gtk" ,gtk+-2) + ("pkg-config" ,pkg-config))) (arguments - `(#:tests? #f - #:phases - (modify-phases - %standard-phases - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (rename-file "Makefile.linux" "Makefile") ; Use linux Makefile - (let ((out (assoc-ref outputs "out"))) - ; Create output directories - (mkdir-p (string-append out "/lib")) - (mkdir-p (string-append out "/include")) - (mkdir-p (string-append out "/bin")) - ; Fix rpath - (substitute* "tools/Makefile.linux" - (("-rpath,\\.") - (string-append "-rpath," out "/lib/")) - (("\\/usr\\/local") - out)) - ; Set right output - (substitute* "Makefile" - (("\\/usr\\/lib") - (string-append out "/lib")) - (("\\/usr\\/local") - out)))))))) + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (rename-file "Makefile.linux" "Makefile") + (let ((out (assoc-ref outputs "out"))) + ;; Create output directories. + (mkdir-p (string-append out "/lib")) + (mkdir-p (string-append out "/include")) + (mkdir-p (string-append out "/bin")) + ;; Fix rpath. + (substitute* "tools/Makefile.linux" + (("-rpath,\\.") + (string-append "-rpath," out "/lib/")) + (("/usr/local") + out)) + ;; Set right output. + (substitute* "Makefile" + (("/usr/lib") + (string-append out "/lib")) + (("\\/usr\\/local") + out)) + #t)))))) (synopsis "3D triangle mesh format and related tools and libraries") (description "OpenCTM is a file format, a software library and a tool set for compression of 3D triangle meshes. The geometry is compressed to a