From patchwork Fri Jan 13 21:44:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 46094 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 9DC0927BBED; Fri, 13 Jan 2023 21:45:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 0CDE127BBE9 for ; Fri, 13 Jan 2023 21:45:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGRrF-0004CH-6g; Fri, 13 Jan 2023 16:45:05 -0500 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 1pGRrC-0004AB-Nq for guix-patches@gnu.org; Fri, 13 Jan 2023 16:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGRrB-0007qE-Uy for guix-patches@gnu.org; Fri, 13 Jan 2023 16:45:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGRrB-0005ca-NX for guix-patches@gnu.org; Fri, 13 Jan 2023 16:45:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60790] [PATCH] gnu: Add cl-assimp. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 21:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60790@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167364625621515 (code B ref -1); Fri, 13 Jan 2023 21:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jan 2023 21:44:16 +0000 Received: from localhost ([127.0.0.1]:52549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRqR-0005av-O3 for submit@debbugs.gnu.org; Fri, 13 Jan 2023 16:44:16 -0500 Received: from lists.gnu.org ([209.51.188.17]:33050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGRqP-0005an-Fa for submit@debbugs.gnu.org; Fri, 13 Jan 2023 16:44:14 -0500 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 1pGRqP-0003r0-9j for guix-patches@gnu.org; Fri, 13 Jan 2023 16:44:13 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGRqN-0007mq-DS for guix-patches@gnu.org; Fri, 13 Jan 2023 16:44:13 -0500 Received: by mail-wm1-x32f.google.com with SMTP id f25-20020a1c6a19000000b003da221fbf48so1967242wmc.1 for ; Fri, 13 Jan 2023 13:44:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=L3sctxu6G8cXu+LLP7A7axSoZ73GSTFgq4qQx0qwzPA=; b=SuBWRAoYVDA4QylUXffA11Lsefz/2N6AV7fRIV9IAjb41LpMXda7fCd/5+0200tx77 PKp4pfXEWcL1hlnNp6AzoCRD3k2Yv1koi9IIDHZ7aKbfGuEQGq+cgR3k3bI+MRTzFqCM VTiCVVLp+gshi3P0qYQiQwR9J6SbZYwP7MUHznAc+3GVlH8gFxnvqvKn8UKLfcs0JEuj 1muiVrkSTnk9lIamHw62EA8ApMrxzPSnq+i8KAK/YWBzGnp9ySCHbAiABJKAhGeB7E8V S6MKdqcgK5+SR6hBIKMCOTEerTCSU4ocFmbWUSr/I79es0QThUz+C1/EnXBdGsnu+nXm tNPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=L3sctxu6G8cXu+LLP7A7axSoZ73GSTFgq4qQx0qwzPA=; b=mq8bAxoa2wNMvBMoTKQg+ohWKl3NI3l3HMYaDZjt4PPiUE35AoFtV4o76jHSeNtM1u cKqOOGvMFxUc2JKzdTGnoqcpbUUVbNS7MTHOswolPjTjwmjboSgS06gqngupCK8Gyphf ELPIK5Cbk97obEJ1ZEg14oHQG0PkGAbdDhZTQy7FMV9NmauR9SXFoDuEiCSepcD5WqiW pfRDOW1RMzbMgpR9upMFuqw4vXxga6cCBPI12ov0aVmLE+ZMRK7z5I0ttGx0QT+QTYP6 KyHYxfSsG2Y9SGYJM9LgVhmq2fmSSXvJflMpuFNvAbKVtwobQ8RUdeRNf9mtRlO+rwmO EHqA== X-Gm-Message-State: AFqh2kofCxLOn3P9RzVjmvGVM1vyjyU08vCsubRHLdiJnSTjTbyBuQHG unL1o5SVVu52NIRxspB9G4Fwc8IOkZM= X-Google-Smtp-Source: AMrXdXvw0GmwAlYMmYViniUjW0BIpL8UqWmrJz7JgLb0JB0MrvPBhTGNXqKFBsMpI1wtglT2DPOSqg== X-Received: by 2002:a05:600c:35d6:b0:3da:17f5:57b9 with SMTP id r22-20020a05600c35d600b003da17f557b9mr5766531wmq.5.1673646249298; Fri, 13 Jan 2023 13:44:09 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id m1-20020a5d6241000000b002bbdaf21744sm16873137wrv.113.2023.01.13.13.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 13:44:08 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 13 Jan 2023 21:44:06 +0000 Message-Id: <20230113214406.2451-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=sharlatanus@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: , 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 The latest upstream commit of classimp does not support assimp library higher than 5.0. - https://github.com/3b/classimp/issues/18 * gnu/packages/graphics.scm (assimp-5.0): New variable. * gnu/packages/lisp-xyz.scm (cl-classimp, sbcl-classimp): New variables. --- gnu/packages/graphics.scm | 15 ++++++++++++ gnu/packages/lisp-xyz.scm | 48 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f23fad7c50..421522b7e0 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Tobias Kortkamp ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 dan +;;; Copyright © 2023 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -594,6 +595,20 @@ (define-public assimp more.") (license license:bsd-3))) +(define-public assimp-5.0 + (package + (inherit assimp) + (version "5.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/assimp/assimp") + (commit (string-append "v" version)))) + (file-name (git-file-name "assimp" version)) + (sha256 + (base32 + "1w2484lg823bql7lpfq84vnsfsnag5v65qrbphslj866z9ia68l7")))))) + (define-public mikktspace ;; The latest commit is used as there is no release. (let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409") diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index db20ad00c0..55ed4b21b4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2020 Dimakis Dimakakos ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Adam Kandur -;;; Copyright © 2020, 2021, 2022 Sharlatan Hellseher +;;; Copyright © 2020-2023 Sharlatan Hellseher ;;; Copyright © 2021, 2022 Aurora ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021, 2022, 2023 André A. Gomes @@ -85,6 +85,7 @@ (define-module (gnu packages lisp-xyz) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -10284,6 +10285,51 @@ (define-public cl-async (define-public ecl-cl-async (sbcl-package->ecl-package sbcl-cl-async)) +(define-public sbcl-classimp + (let ((commit "d82a14c59bc733f89a1ea0b3447ebedddce5756e") + (revision "0")) + (package + (name "sbcl-classimp") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/classimp") + (commit commit))) + (file-name (git-file-name "classimp" version)) + (sha256 + (base32 "0pbnz6cf1zb2ayk4kbw0gphjb8nflnjns2rwhv86jz0kf0z1hqha")))) + (build-system asdf-build-system/sbcl) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-assimp-lib-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "library.lisp" + (("libassimp.so.5" _) + (search-input-file inputs "/lib/libassimp.so.5.0.0")))))))) + (inputs + (list assimp-5.0 + sbcl-cffi + sbcl-split-sequence)) + (home-page "https://github.com/3b/classimp") + (synopsis "Common Lisp CFFI bindings for Open Asset Import Library") + (description + "This package provides CFFI bindings to @acronym{ASSIMP, Asset Import} library +for Common Lisp.") + (license license:expat)))) + +(define-public cl-classimp + (sbcl-package->cl-source-package sbcl-classimp)) + +;; FIXME: (Sharlatan-20230113T213459+0000): It tries to link with the current +;; latest assimp library from which assimp-5.0 was inherited. +;; +;; (define-public ecl-classimp +;; (sbcl-package->ecl-package sbcl-classimp)) + (define-public sbcl-blackbird (let ((commit "d361f81c1411dec07f6c2dcb11c78f7aea9aaca8") (revision "1"))