From patchwork Thu May 14 15:01:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 22076 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 04AEA27BBE3; Thu, 14 May 2020 16:11:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 72E6227BBE1 for ; Thu, 14 May 2020 16:11:45 +0100 (BST) Received: from localhost ([::1]:45940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZFWT-0004zk-0a for patchwork@mira.cbaines.net; Thu, 14 May 2020 11:11:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZFN4-0004Er-FJ for guix-patches@gnu.org; Thu, 14 May 2020 11:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZFN4-0006qM-3M for guix-patches@gnu.org; Thu, 14 May 2020 11:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZFN3-0001nu-V9 for guix-patches@gnu.org; Thu, 14 May 2020 11:02:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41263] [PATCH] gnu: Add openctm Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 May 2020 15:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41263 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41263@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.15894685106311 (code B ref -1); Thu, 14 May 2020 15:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 May 2020 15:01:50 +0000 Received: from localhost ([127.0.0.1]:34429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZFMo-0001aP-RQ for submit@debbugs.gnu.org; Thu, 14 May 2020 11:01:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:33286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZFMn-0001ZR-No for submit@debbugs.gnu.org; Thu, 14 May 2020 11:01:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZFMn-0003i4-CI for guix-patches@gnu.org; Thu, 14 May 2020 11:01:45 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:24011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZFMk-0006ey-P5 for guix-patches@gnu.org; Thu, 14 May 2020 11:01:44 -0400 Date: Thu, 14 May 2020 15:01:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail; t=1589468495; bh=VVgcnJsX8Nbpi0o+9WZmGa0xxtaA44FLCeMbzZqqKRM=; h=Date:To:From:Reply-To:Subject:From; b=h7h1rv0ti9wHzghHWz3z9OoBoIeaH37a1rvqAIf9gvJpuXJhpVK3bMD6XWeNUPOip B3GzK0rNZmgObI81eP74Eh4qu3qi3/SdQb4TfHe4T2A2qxoC61Cgjktv+eVO3PX957 4J7AS2V2LhU/VDVepqf82pd3GfRV3rVcVlOWqQpk= From: Ekaitz Zarraga Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.22; envelope-from=ekaitz@elenq.tech; helo=mail2.protonmail.ch X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/14 11:01:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, Adding OpenCTM as discussed here: https://issues.guix.gnu.org/issue/40492 Regards, Ekaitz --- 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. --- gnu/packages/engineering.scm | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) -- 2.26.1 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 172f8481eb..e3e346b1e9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix monads) #:use-module (guix store) #:use-module (guix utils) @@ -2533,3 +2535,60 @@ without any changes. And programmers that are familiar with the magellan API can continue using it with a free library without the restrictions of the official SDK.") (license license:bsd-3))) + +(define-public openctm + (let ((revision 603)) + ; Previous versions don't compile, they need to link libGL and libGLU. + ; Fixed in this revision. + (package + (name "openctm") + (version (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")))) + (build-system gnu-build-system) + (native-inputs + `(("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)))))))) + (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 +fraction of comparable file formats (3DS, STL, COLLADA...), and the format is +accessible through a simple API") + (license license:zlib) + (home-page "http://openctm.sourceforge.net/"))))