From patchwork Wed Apr 10 00:12:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 62895 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 7E65827BBEA; Wed, 10 Apr 2024 01:13:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA19527BBE2 for ; Wed, 10 Apr 2024 01:13:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruLaB-0001jk-C3; Tue, 09 Apr 2024 20:12:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruLa9-0001jB-OK for guix-patches@gnu.org; Tue, 09 Apr 2024 20:12:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ruLa9-0007lS-GO for guix-patches@gnu.org; Tue, 09 Apr 2024 20:12:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruLaH-0007yO-Nl for guix-patches@gnu.org; Tue, 09 Apr 2024 20:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70319] [PATCH 1/2] gnu: Add tinygltf. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Apr 2024 00:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70319 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70319@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 70319-submit@debbugs.gnu.org id=B70319.171270796730565 (code B ref 70319); Wed, 10 Apr 2024 00:13:01 +0000 Received: (at 70319) by debbugs.gnu.org; 10 Apr 2024 00:12:47 +0000 Received: from localhost ([127.0.0.1]:51796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruLa3-0007wv-AK for submit@debbugs.gnu.org; Tue, 09 Apr 2024 20:12:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:49237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruLa0-0007vv-OY for 70319@debbugs.gnu.org; Tue, 09 Apr 2024 20:12:45 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0CFE7240027 for <70319@debbugs.gnu.org>; Wed, 10 Apr 2024 02:12:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1712707950; bh=dGvMHVnITWOEpLRy9yYnlMNmq/87dPTm6Ii+d8HQ99s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=KUoKn5LrSANtM7FJMTtTbTtCJkNT022oz5751c7kFr0vO0Sg10BqhzgQsYeyf1lnD T2tsmYasJ6FRs5UmfZ4Wwq89KN58o4kFXtqzBVB/MNeg3G+j3aRP3mNUqzxboyDRfM l9cPOkh6/iFDY+tIuVdgCzpDvE70ywMzGUH7PoS/FHmOD4WOLcwde3W46IpH1GZb48 vynWGLs6vjTwsbyf1+/pee1U50HZDDbrQ5irxWJXkK8h0nKVXwrdYWla54LswActb2 +BP8faYvobYwDVgSqAdwNHNG6p4h+RuJQi6VMnD851rDPzhEUfFGg0/lCtnktgQFhI kZBz8jNC0moMw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VDjvJ6m2sz9rwn; Wed, 10 Apr 2024 02:12:28 +0200 (CEST) From: Vinicius Monego Date: Wed, 10 Apr 2024 00:12:02 +0000 Message-Id: <769daf7ae2277aecea26723b2a8e3165aa92e146.1712707652.git.monego@posteo.net> In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/graphics.scm (tinygltf): New variable. Change-Id: I749ced85142b8dd2ebbe916533f27bf6d167bbff --- gnu/packages/graphics.scm | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a63629823a..d04fcbfd6d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2367,6 +2367,51 @@ (define-public openxr ;; Dual licensed. Either license applies. (license (list license:asl2.0 license:expat)))) +(define-public tinygltf + (package + (name "tinygltf") + (version "2.8.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/syoyo/tinygltf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14712lndwlk4y001jxf2rxhwrw0w5gbc2hyh9kpik1galdzg41ii")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ; tests are not managed by CMake + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-our-packages + ;; tinygltf ships json.hpp, stb_image.h and stb_image_write.h + ;; into the repo as common files. Delete those, and use the + ;; files from our packages instead. + (lambda* (#:key inputs #:allow-other-keys) + (for-each delete-file + (list "json.hpp" + "stb_image.h" + "stb_image_write.h")) + (symlink (search-input-file inputs "json.hpp") + "json.hpp") + (symlink (search-input-file inputs "stb_image.h") + "stb_image.h") + (symlink (search-input-file inputs "stb_image_write.h") + "stb_image_write.h"))) + (add-after 'install 'delete-static-lib + (lambda _ + (delete-file (string-append #$output + "/lib/libtinygltf.a"))))))) + (inputs (list nlohmann-json stb-image stb-image-write)) + (home-page "https://github.com/syoyo/tinygltf") + (synopsis "Header only C++11 tiny glTF 2.0 library") + (description "TinyGLTF is a header only C++11 tiny +@url{https://github.com/KhronosGroup/glTF, glTF} 2.0 library.") + (license license:expat))) + (define-public monado (package (name "monado")