From patchwork Tue Oct 29 01:40:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 69609 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 388C327BBEA; Tue, 29 Oct 2024 01:42:31 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 A364F27BBE2 for ; Tue, 29 Oct 2024 01:42:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5bFD-0001rh-OM; Mon, 28 Oct 2024 21:42:03 -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 1t5bFC-0001rM-Ed for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -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 1t5bFC-0007Pm-67 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=O6u5ualzQxdq4SzrkCL1le6eEf17BegnvYo1+SVR/g4Q5Yy7KJ4hYaWdnyKu6MzsBqfT+j++N94gksq0+lvfh5ijjBX3fapPgTfqLFEXXFJY9TFwJ6DrPe6wJNjHVi5kx+CkgMoJXKg58jmri5qb+kCssXK0h1l6hXDlEp48bUdrXGg2FsfZ/rASALEVoyek+SLPvsOZ/L9P/PhrBaBHcTJzMx0+PhD0L2b2RAkPdpC6ZTT3WNEBh91mTNRIEgBN1NtsP9A8au6aLYVJHH99GCgT52pfeWjJE/GwVXLki8QBLRouQwb0nCM5SugEOcU3oTWc/b2NfTgeFeDKXoQ/+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5bFB-0000WL-W4 for guix-patches@gnu.org; Mon, 28 Oct 2024 21:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74075] [PATCH v2 2/5] gnu: ogre: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 01:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74075@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 74075-submit@debbugs.gnu.org id=B74075.17301660951912 (code B ref 74075); Tue, 29 Oct 2024 01:42:01 +0000 Received: (at 74075) by debbugs.gnu.org; 29 Oct 2024 01:41:35 +0000 Received: from localhost ([127.0.0.1]:55286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEl-0000Ul-4t for submit@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:35 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:46310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5bEi-0000Uc-Va for 74075@debbugs.gnu.org; Mon, 28 Oct 2024 21:41:33 -0400 Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7205646f9ebso2835129b3a.0 for <74075@debbugs.gnu.org>; Mon, 28 Oct 2024 18:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730166032; x=1730770832; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=dpM+Y+XG0dG0fSCEoBABOzV++Kb7fx9uNpC9HfCzDLAnZAkBDZm2qkQk8JSkJ+TAdv CXHVBGoeoVEf4WE4shplvXvZFJ2rsMiFBhd+aSnhn/kPp2B+fKiZm0ji7LGFXneettdy wCvYiqrx1YFwfgHkra4hhIoUtqNWETEBsazLiEhZAX188psbWPVC+bwA8wrwnd9z98b2 X38ticm/lR3nvTaZaY5Um5xhiZrKFBOnJ0YlSq9j9Kk0qXG2x3kocFObXYXrxztNdlS4 N9wTFPN+06bB0NZznDA//1YIbAkCMcGvpDkOkhu88V0kO1do9CG7s9C9sVroG/afZx7I Ca6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730166032; x=1730770832; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t9U2RjmD868xj/uM2CLBnElIw6lgdfgN4RU7dFfcxSE=; b=U3aYfwwEdmg8ppVVLQ4cZKR/sI0QXa1O24L/IgRIhxeGQFV7dwyMf8zsN7Qlw1Ucsn 1LLXkTpWbFqciJI8UnlpByti3MDL4u35wUX8VYxyWyZuC1fGC4/NOnE7RPcBtcPYg7VJ +SQ5yqdsZ7gZ4rYZd/8FtItl0NnjIxv4KUCk2E3mGZs66pLFFYBUgoIyjSSGmc2sWB7U Pzk8qxsn+T6IYy3G2MKK9RmrVK3vfvj/n8ItOngAKlhYlRyeQOjJyLNvEPS2F30M9Hhd OqiRtK8xAz1P2znMmvHfqZTk00WT+2WvhiHTLSCN5w43avyIVuDD5p145FSrcGhzyq75 RHlA== X-Gm-Message-State: AOJu0Yx1JM+jlKciN2+PAb131SrfKW/Y59YuNgWxV16pJniZN+gWhmf8 0Jzo3oDazmua+un9lWuCVUlCTmMCggwKhPLBXqm4LCNdbNNN5PXGik7BP+YP X-Google-Smtp-Source: AGHT+IHv6owyYLbIeZIGZC+eY7b+gWPwI5eGYnL1UGoROZOTZ14+Q50V7rJRo4Xo5LLU3d6l2bh7gA== X-Received: by 2002:a05:6a00:8d2:b0:71e:795f:92f0 with SMTP id d2e1a72fcca58-72062f8304dmr15102191b3a.3.1730166031650; Mon, 28 Oct 2024 18:40:31 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7edc866906dsm6401968a12.10.2024.10.28.18.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 18:40:31 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 29 Oct 2024 10:40:05 +0900 Message-ID: <25f0b75b2224f626d7afb3e6e9e896483967884c.1730166007.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 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 (ogre) [arguments]: Use gexps. Change-Id: I0e9ebeea06769dc849e9579501ffa44fbd4ebc3b --- (no changes since v1) gnu/packages/graphics.scm | 81 ++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8686cac7f7..0e13208d80 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1188,46 +1188,47 @@ (define-public ogre (base32 "157vpfzivg2wf349glyd0cpbyaw1j3fm4nggban70pghql3x48kb")))) (build-system cmake-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'configure 'unpack-imgui - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "imgui-source") - "../imgui-source"))) - (add-before 'configure 'pre-configure - ;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As - ;; a consequence, we cannot suggest ours in configure flags. Fix - ;; it. - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("set\\(CMAKE_INSTALL_RPATH .*") ""))))) - #:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (runpath - (string-join (list (string-append out "/lib") - (string-append out "/lib/OGRE")) - ";"))) - (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) - "-DIMGUI_DIR=../imgui-source" - "-DOGRE_BUILD_DEPENDENCIES=OFF" - "-DOGRE_BUILD_TESTS=TRUE" - "-DOGRE_INSTALL_DOCS=TRUE" - "-DOGRE_INSTALL_SAMPLES=TRUE" - "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) - (native-inputs `(("doxygen" ,doxygen) - ("imgui-source" ,(package-source imgui-1.86)) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config) - ("python" ,python))) - (inputs (list freeimage - freetype - libxaw - libxrandr - libxt - mesa - pugixml - sdl2 - zlib)) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'unpack-imgui + (lambda _ + (copy-recursively #$(this-package-native-input "imgui-source") + "../imgui-source"))) + (add-before 'configure 'pre-configure + ;; CMakeLists.txt forces a CMAKE_INSTALL_RPATH value. As + ;; a consequence, we cannot suggest ours in configure flags. Fix + ;; it. + (lambda _ + (substitute* "CMakeLists.txt" + (("set\\(CMAKE_INSTALL_RPATH .*") ""))))) + #:configure-flags + #~(let ((runpath (string-join (list (string-append #$output "/lib") + (string-append #$output "/lib/OGRE")) + ";"))) + (list (string-append "-DCMAKE_INSTALL_RPATH=" runpath) + "-DIMGUI_DIR=../imgui-source" + "-DOGRE_BUILD_DEPENDENCIES=OFF" + "-DOGRE_BUILD_TESTS=TRUE" + "-DOGRE_INSTALL_DOCS=TRUE" + "-DOGRE_INSTALL_SAMPLES=TRUE" + "-DOGRE_INSTALL_SAMPLES_SOURCE=TRUE")))) + (native-inputs + `(("doxygen" ,doxygen) + ("imgui-source" ,(package-source imgui-1.86)) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + (list freeimage + freetype + libxaw + libxrandr + libxt + mesa + pugixml + sdl2 + zlib)) (synopsis "Scene-oriented, flexible 3D engine written in C++") (description "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented,