From: "Ludovic Courtès" <ludo@gnu.org>
To: Ekaitz Zarraga <ekaitz@elenq.tech>
Cc: 41263-done@debbugs.gnu.org
Subject: bug#41263: [PATCH] gnu: Add openctm
Date: Fri, 15 May 2020 12:12:40 +0200 [thread overview]
Message-ID: <87eerltskn.fsf@gnu.org> (raw)
In-Reply-To: <bKZAOAq-6m4jrMZ2n9srov0UyzxMkvTsXGb-uYqvZ5MeRohC6CuHxbVgysKWrjPVFlXLivv8y_z6m2NdHLRyEAQTW3lBaRybgx9p1Kj29RE=@elenq.tech> (Ekaitz Zarraga's message of "Thu, 14 May 2020 15:01:32 +0000")
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Hi,
Ekaitz Zarraga <ekaitz@elenq.tech> skribis:
>>From 8bbac5bccdb0b2fd5ffa8fe1e2dec25a6a359810 Mon Sep 17 00:00:00 2001
> From: Ekaitz Zarraga <ekaitz@elenq.tech>
> Date: Thu, 14 May 2020 16:55:32 +0200
> Subject: [PATCH] gnu: Add openctm
>
> * gnu/packages/engineering.scm (openctm): New Variable.
Applied with the cosmetic changes below, mostly indentation (consider
running ./etc/indent-code.el as mentioned in the manual).
Thanks!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 4080 bytes --]
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
next prev parent reply other threads:[~2020-05-15 10:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 15:01 [bug#41263] [PATCH] gnu: Add openctm Ekaitz Zarraga
2020-05-15 10:12 ` Ludovic Courtès [this message]
2020-05-15 17:44 ` Ekaitz Zarraga
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eerltskn.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=41263-done@debbugs.gnu.org \
--cc=ekaitz@elenq.tech \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).