From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oF5OFztrvl42ewAA0tVLHw (envelope-from ) for ; Fri, 15 May 2020 10:13:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SC4rEztrvl5XYQAAB5/wlQ (envelope-from ) for ; Fri, 15 May 2020 10:13:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C0D65940144 for ; Fri, 15 May 2020 10:13:14 +0000 (UTC) Received: from localhost ([::1]:40336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZXL7-0004pR-HM for larch@yhetil.org; Fri, 15 May 2020 06:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZXKw-0004nK-C8 for guix-patches@gnu.org; Fri, 15 May 2020 06:13:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52583) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZXKw-0001H3-2E for guix-patches@gnu.org; Fri, 15 May 2020 06:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZXKv-0005Tf-Uz for guix-patches@gnu.org; Fri, 15 May 2020 06:13:01 -0400 Subject: bug#41263: [PATCH] gnu: Add openctm Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Fri, 15 May 2020 10:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 41263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ekaitz Zarraga Cc: 41263-done@debbugs.gnu.org Mail-Followup-To: 41263@debbugs.gnu.org, ludo@gnu.org, ekaitz@elenq.tech Received: via spool by 41263-done@debbugs.gnu.org id=D41263.158953757321034 (code D ref 41263); Fri, 15 May 2020 10:13:01 +0000 Received: (at 41263-done) by debbugs.gnu.org; 15 May 2020 10:12:53 +0000 Received: from localhost ([127.0.0.1]:35895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZXKm-0005TC-Jz for submit@debbugs.gnu.org; Fri, 15 May 2020 06:12:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZXKj-0005Sw-Rd for 41263-done@debbugs.gnu.org; Fri, 15 May 2020 06:12:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59097) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZXKe-0001FM-1e; Fri, 15 May 2020 06:12:44 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=41692 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jZXKb-0005r5-SN; Fri, 15 May 2020 06:12:42 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Fri, 15 May 2020 12:12:40 +0200 In-Reply-To: (Ekaitz Zarraga's message of "Thu, 14 May 2020 15:01:32 +0000") Message-ID: <87eerltskn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: 6uEL81TrifjH --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Ekaitz Zarraga skribis: >>>From 8bbac5bccdb0b2fd5ffa8fe1e2dec25a6a359810 Mon Sep 17 00:00:00 2001 > From: Ekaitz Zarraga > 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=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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 --=-=-=--