From patchwork Sat Sep 21 00:38:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 68214 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 928B027BBE9; Sat, 21 Sep 2024 01:40:00 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 D720127BBE2 for ; Sat, 21 Sep 2024 01:39:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sroA4-0007vU-Kl; Fri, 20 Sep 2024 20:39:44 -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 1sroA3-0007v7-1L for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:43 -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 1sroA2-0006wv-OJ for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:42 -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:Date:From:To:In-Reply-To:References:Subject; bh=SABY/HSbC/DSWL//bZN8kp4/2C4fgx0yLK8gKUijdz4=; b=u5BduadKfj2AW7FT8Om0UGHcuvHFPNH1d/HYLVxeTswDltE51Wlt7nx8jcK+v9RXzRIf6jFcKqPRHOAg/lUAoeJncad0WyfbBOsbaEi38QuMY5TPpW2cd9gcWbIxWAzF3m0Kye5USyydj5R9kT1FJ4r7anKjMxXr5z7a9GimXabmvnX5+rz2gsFDbUTiM7eRJktJ+CtT4RtxOzfZzh742bVuk8A3GEP0NgCAkT78YIMIc0w7B3zmVtrbGjlQisBOpLZXlrQSIBYC/vi49lDbFovsKLCtlQeKRaaMAUBsXqyNmFHLVqMmFt8BTbhdzQjPB06FYg612hSqTrT/EcBsTw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sroAM-0007W8-6x for guix-patches@gnu.org; Fri, 20 Sep 2024 20:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73287] [PATCH v2 1/3] gnu: Add embree-2. References: In-Reply-To: Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 00:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73287@debbugs.gnu.org Cc: James Smith Received: via spool by 73287-submit@debbugs.gnu.org id=B73287.172687915728791 (code B ref 73287); Sat, 21 Sep 2024 00:40:02 +0000 Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:17 +0000 Received: from localhost ([127.0.0.1]:36784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9c-0007UJ-F0 for submit@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:17 -0400 Received: from layka.disroot.org ([178.21.23.139]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9Z-0007U6-Sg for 73287@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:14 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CDB6523E04; Sat, 21 Sep 2024 02:38:53 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LOLQd6BXU_B3; Sat, 21 Sep 2024 02:38:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726879133; bh=oLxfwG0bZCoCErq6IHFE5MI+Mfozby/j62V0TFJxyZ0=; h=From:To:Cc:Subject:Date; b=RQZlrYbU9RV88T2FlLFjh+OnhU8eTj/SkpMGGfpqAfVZ6n1Y4tMRfLtk3UNvCsNWl uhlrSilhyNfVHpo93X9oCdWg8gt6N4brKnIoO4Bc8HyBCkyNt6peQ37oTBvoaObW/9 4ketWNzoZQjJoMCNyK7Hem/LSyUlggrAN9YznSvnwyQLEXGpDvK1PFhFZQoVdr9Nq/ R5jfMrCfdgRVlhdTrn8qWvCmYFJVO6UAcXrGD04xL5FnK/BSQW5HPMlxJjElO0QhN7 Ooh8nkx1jhV7WcZFLh+ShodyrpOSHjolg68F2Zh/gDEPfNxXfToKu34hgItR46tjoL OJ98Ck7/gQg1w== Date: Fri, 20 Sep 2024 17:38:34 -0700 Message-ID: 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: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith 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: (embree-2): New variable. Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea --- gnu/packages/graphics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) base-commit: e9d903f146865db5948abd271a5c7e763681b4e9 diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index edaa905c7a..171cbce24d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2023 David Thompson ;;; Copyright © 2023 Eric Bavier ;;; Copyright © 2023, 2024 Artyom V. Poptsov +;;; Copyright © 2024 James Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -490,6 +491,27 @@ (define-public embree-3 (base32 "1kcvz7g6j56anv9zjyd3gidxl46vipw0gg82lns12m45cd43iwxm")))))) +(define-public embree-2 + (package/inherit embree + (version "2.17.7") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/RenderKit/embree") + (commit (string-append "v" version)))) + (file-name (git-file-name (package-name embree) version)) + (sha256 + (base32 "19v60zdfix33c772x6dzmhsarhafsns8qy7c2ysqr7a9j16whgql")))) + (arguments + (substitute-keyword-arguments (package-arguments embree) + ((#:configure-flags configure-flags) + #~(append (list "-DEMBREE_MAX_ISA=NONE" "-DEMBREE_TUTORIALS=OFF") + #$configure-flags)))) + (inputs (modify-inputs (package-inputs embree) + (replace "tbb" tbb-2020))) + ;; Embree requires SSE2 support, so build only for x86-based architectures. + (supported-systems (list "i686-linux" "x86_64-linux")))) + (define-public openvdb (package (name "openvdb") From patchwork Sat Sep 21 00:38:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 68215 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 4BD0B27BBEA; Sat, 21 Sep 2024 01:40: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 B398027BBE2 for ; Sat, 21 Sep 2024 01:40:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sroA8-0007wC-BN; Fri, 20 Sep 2024 20:39:48 -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 1sroA6-0007vW-0M for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:46 -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 1sroA5-0006x3-GV for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:45 -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=6l8k8roNe0NlHapVQwJu4D46uDwWhDPm0u/fSJ9lg/E=; b=gJDgZ7kWvqIl5D2c4JcKvH89qTugO1ni9PCh9L2ZgvZoCkFZt07ryeEnqSXPnfthsZ3ZVD+tljd2GeeghhT46P+YaMXZ9ZW9DwqGStd2KOnvMDpHgV5NJStguslJdCUIYFOaTIuXrQ6hty6R+tH9APUV/nj0DGI81q+ADqUl42JRHLuvuaxjWv5IuwGAkCX9QZIKJMHgYChpgjpjbopyMh+pj/Q2SQgvztGhTTSovcrDlcJBbPz0wgF+ghz7EsQaMchfnulRsh2jbg9Qs+B8Q8dqEEDZOLwWX1pDdO3MtVIVVnMQS/GOzIUkotLerp+KXUgj2zJXWuiLwRz6T4OiKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sroAM-0007WF-Ma; Fri, 20 Sep 2024 20:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73287] [PATCH v2 2/3] gnu: Add ericw-tools. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 00:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73287@debbugs.gnu.org Cc: James Smith , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 73287-submit@debbugs.gnu.org id=B73287.172687916428822 (code B ref 73287); Sat, 21 Sep 2024 00:40:02 +0000 Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:24 +0000 Received: from localhost ([127.0.0.1]:36788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9j-0007Ul-3e for submit@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:24 -0400 Received: from layka.disroot.org ([178.21.23.139]:55314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9e-0007UT-Pm for 73287@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:22 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id CC85223E04; Sat, 21 Sep 2024 02:38:58 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Q45dYmBYQRt7; Sat, 21 Sep 2024 02:38:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726879137; bh=KifhVEW6QXf+fkerbxa3lVnkb2SL2SD75VTQzkVF0X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OPQMc8OqBIW+y/Jts6itD5y+0Jy5JIxHLYmlPz8cyL/h2suLn3sOcEvVNxaIdQFIH uwEX5FylSoOhcBPQpQCWqsolcM4R/oExltAuPx45ONB0TWh6LVA18GWgRUcQ/QCk5C h9RKUj82EInslvHfmnjUT19LcsfwKv1jgylGqUuGo+Qly4XLVMM6rmtJaIF9yVhx+a aQYWdpVSgylQ6Kus/CRB6Ov0CfYgkrCpEy0EWJNGotYE5XBeY9CXAd0OXyk1TM21f4 bkq7Z1AwMhovm1xT4+IjRD4U4gktZthg3qEq5EGv6HE/yP+TMYYWo5aamJLb7r38R/ n3jOV6KVqoG2Q== Date: Fri, 20 Sep 2024 17:38:35 -0700 Message-ID: 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: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith 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/game-development.scm: (ericw-tools): New variable. * gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch: New file. * gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch: New file. * gnu/local.mk: Register patch files. Change-Id: I896b8f781054442e4db4a7220d526b8f2878873c --- gnu/local.mk | 3 + gnu/packages/game-development.scm | 67 ++++++++++++++ ...tools-add-check-for-sse2-in-light.cc.patch | 31 +++++++ ...-tools-gcc-11-pass-const-to-offsetof.patch | 87 +++++++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch create mode 100644 gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch diff --git a/gnu/local.mk b/gnu/local.mk index a092122d22..616af50410 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -67,6 +67,7 @@ # Copyright © 2024 David Elsing # Copyright © 2024 Ashish SHUKLA # Copyright © 2024 Fabio Natali +# Copyright © 2024 James Smith # # This file is part of GNU Guix. # @@ -1201,6 +1202,8 @@ dist_patch_DATA = \ %D%/packages/patches/epiphany-fix-encoding-test.patch \ %D%/packages/patches/ergodox-firmware-fix-json-target.patch \ %D%/packages/patches/ergodox-firmware-fix-numpad.patch \ + %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch \ + %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/esmini-use-pkgconfig.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0bae7cfe11..0b3171d1a8 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2394,6 +2394,73 @@ (define-public entt (license (list license:expat ; code license:cc-by4.0)))) ; documentation +(define-public ericw-tools + (package + (name "ericw-tools") + (version "0.18.1") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/ericwa/ericw-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp")) + (patches + (search-patches "ericw-tools-add-check-for-sse2-in-light.cc.patch" + "ericw-tools-gcc-11-pass-const-to-offsetof.patch")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DENABLE_LIGHTPREVIEW=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-copying-embree-files + (lambda _ + ;; Tries to copy files from embree, disable it. + (substitute* "light/CMakeLists.txt" + (("install\\\(FILES \\$\\{EMBREE") + "#install(FILES ${EMBREE")))) + (add-after 'install 'rename-binaries + (lambda _ + ;; Rename binaries to prevent collisions with other + ;; packages. + (rename-file (string-append #$output "/bin/bspinfo") + (string-append #$output "/bin/qbspinfo")) + (rename-file (string-append #$output "/bin/bsputil") + (string-append #$output "/bin/qbsputil")) + (rename-file (string-append #$output "/bin/light") + (string-append #$output "/bin/qlight")) + (rename-file (string-append #$output "/bin/vis") + (string-append #$output "/bin/qvis")))) + (add-after 'install-license-files 'clean-up-bin-directory + (lambda _ + ;; Install target copies text documents to #$output/bin, move + ;; them to #$output/share/doc. + (delete-file (string-append #$output "/bin/gpl_v3.txt")) + (rename-file + (string-append #$output "/bin/changelog.txt") + (string-append #$output "/share/doc/" + #$(package-name this-package) "-" + #$(package-version this-package) + "/changelog.txt")) + (rename-file + (string-append #$output "/bin/README.md") + (string-append #$output "/share/doc/" + #$(package-name this-package) "-" + #$(package-version this-package) + "/README.md"))))) + #:tests? #f)) ; No tests + (inputs (list embree-2)) + (home-page "https://ericwa.github.io/ericw-tools/") + (synopsis "Map compiling tools for Quake/Hexen 2") + (description "A collection of command line utilities used for building +Quake maps as well as working with various Quake file formats. The utilities +include @command{qbsp} for building the geometry, @command{qvis} for +calculating visibility, @command{qlight} for lighting, @command{bspinfo} for +getting information, and @command{bsputil} for basic editing of data in a map +file.") + (license license:gpl2+))) + (define-public eureka (package (name "eureka") diff --git a/gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch b/gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch new file mode 100644 index 0000000000..4c95b8570d --- /dev/null +++ b/gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch @@ -0,0 +1,31 @@ +From 982ef5276bb231ded12c45a686b0875594175774 Mon Sep 17 00:00:00 2001 +From: Bryan Haley +Date: Mon, 28 Mar 2022 22:05:28 -0700 +Subject: [PATCH] Add check for SSE2 in light.cc (#328) + +--- + light/light.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/light/light.cc b/light/light.cc +index 7e23d040f..c00844643 100644 +--- a/light/light.cc ++++ b/light/light.cc +@@ -33,7 +33,7 @@ + #include + #include + +-#ifdef HAVE_EMBREE ++#if defined(HAVE_EMBREE) && defined (__SSE2__) + #include + //#include + #endif +@@ -255,7 +255,7 @@ LightThread(void *arg) + { + const mbsp_t *bsp = (const mbsp_t *)arg; + +-#ifdef HAVE_EMBREE ++#if defined(HAVE_EMBREE) && defined (__SSE2__) + _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); + // _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); + #endif diff --git a/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch b/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch new file mode 100644 index 0000000000..6da4179a9e --- /dev/null +++ b/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch @@ -0,0 +1,87 @@ +From c9570260fa895dde5a21272d76f9a3b05d59efdd Mon Sep 17 00:00:00 2001 +From: Eric Wasylishen +Date: Sun, 30 May 2021 23:12:17 -0600 +Subject: [PATCH] gcc 11: pass constant to offsetof + +--- + common/polylib.cc | 5 ++++- + qbsp/util.cc | 5 ++++- + qbsp/winding.cc | 4 +++- + vis/vis.cc | 10 ++++++++-- + 4 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/common/polylib.cc b/common/polylib.cc +index 6397b3107..c8e1afbff 100644 +--- a/common/polylib.cc ++++ b/common/polylib.cc +@@ -230,7 +230,10 @@ polylib::CopyWinding(const winding_t * w) + int size; + winding_t *c; + +- size = offsetof(winding_t, p[w->numpoints]); ++ //size = offsetof(winding_t, p[w->numpoints]); ++ size = offsetof(winding_t, p[0]); ++ size += w->numpoints * sizeof(w->p[0]); ++ + c = static_cast(malloc(size)); + memcpy(c, w, size); + return c; +diff --git a/qbsp/util.cc b/qbsp/util.cc +index e8baf7205..16c9077f1 100644 +--- a/qbsp/util.cc ++++ b/qbsp/util.cc +@@ -53,7 +53,10 @@ AllocMem(int Type, int cElements, bool fZero) + if (cElements > MAX_POINTS_ON_WINDING) + Error("Too many points (%d) on winding (%s)", cElements, __func__); + +- cSize = offsetof(winding_t, points[cElements]) + sizeof(int); ++ //cSize = offsetof(winding_t, points[cElements]) + sizeof(int); ++ cSize = offsetof(winding_t, points[0]); ++ cSize += cElements * sizeof(static_cast(nullptr)->points[0]); ++ cSize += sizeof(int); + + // Set cElements to 1 so bookkeeping works OK + cElements = 1; +diff --git a/qbsp/winding.cc b/qbsp/winding.cc +index 1af1d096c..6e286c387 100644 +--- a/qbsp/winding.cc ++++ b/qbsp/winding.cc +@@ -106,7 +106,9 @@ CopyWinding(const winding_t *w) + winding_t *c; + + c = (winding_t *)AllocMem(WINDING, w->numpoints, false); +- size = offsetof(winding_t, points[w->numpoints]); ++ //size = offsetof(winding_t, points[w->numpoints]); ++ size = offsetof(winding_t, points[0]); ++ size += w->numpoints * sizeof(w->points[0]); + memcpy(c, w, size); + + return c; +diff --git a/vis/vis.cc b/vis/vis.cc +index 9fb0ea9ea..ec43a8a5f 100644 +--- a/vis/vis.cc ++++ b/vis/vis.cc +@@ -127,7 +127,10 @@ NewWinding(int points) + if (points > MAX_WINDING) + Error("%s: %i points", __func__, points); + +- size = offsetof(winding_t, points[points]); ++ //size = offsetof(winding_t, points[points]); ++ size = offsetof(winding_t, points[0]); ++ size += points * sizeof(w->points[0]); ++ + w = static_cast(malloc(size)); + memset(w, 0, size); + +@@ -178,7 +181,10 @@ CopyWinding(const winding_t * w) + int size; + winding_t *c; + +- size = offsetof(winding_t, points[w->numpoints]); ++ //size = offsetof(winding_t, points[w->numpoints]); ++ size = offsetof(winding_t, points[0]); ++ size += w->numpoints * sizeof(w->points[0]); ++ + c = static_cast(malloc(size)); + memcpy(c, w, size); + return c; From patchwork Sat Sep 21 00:38:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 68216 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 0F38C27BBEA; Sat, 21 Sep 2024 01:40:12 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 3F20E27BBE2 for ; Sat, 21 Sep 2024 01:40:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sroA7-0007vs-3Q; Fri, 20 Sep 2024 20:39:47 -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 1sroA6-0007vV-0R for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:46 -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 1sroA5-0006x4-Iv for guix-patches@gnu.org; Fri, 20 Sep 2024 20:39:45 -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=v8vNJTASynHsgnyeg3fVPSw58bVfOqpIvtkl/d82sa0=; b=AlMVVRaTRFk2Hja4+MWjZ9dtzrTDFeMCflyin/mfMM473HWeIj0IloWYeRz0cEAsTo/Wdki1m8Y087c/YGopsY5zKnjfK+/HRcfygrEQ2DpYOiCwvayB9eGoiZ3UUoTdtTThHc9XwbINSBcp/XhJWqNaf4vntgictLVJU7v2ytcSX+Sx79zfhOejYXVLIaaqE1YqxFtxobnPfsfoIuq8AIamBrc8Lg8XQHhPmeWFeR2fF8mwOiAD9p9gGI/tTaHrc13RFUFw09FHsblwF8boey7lOETuRk3/JERtV2VRDwAZhS8xjBudvUbjez2SyQxVdT5oGEJGIf615CGroSQp5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sroAN-0007WM-3W; Fri, 20 Sep 2024 20:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73287] [PATCH v2 3/3] gnu: Add trenchbroom. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 21 Sep 2024 00:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73287@debbugs.gnu.org Cc: James Smith , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 73287-submit@debbugs.gnu.org id=B73287.172687916628831 (code B ref 73287); Sat, 21 Sep 2024 00:40:03 +0000 Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:26 +0000 Received: from localhost ([127.0.0.1]:36790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9m-0007Uw-5t for submit@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:26 -0400 Received: from layka.disroot.org ([178.21.23.139]:55320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sro9h-0007UW-9o for 73287@debbugs.gnu.org; Fri, 20 Sep 2024 20:39:22 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3FC9A23F58; Sat, 21 Sep 2024 02:39:01 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gk1SROpeSduf; Sat, 21 Sep 2024 02:39:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726879140; bh=ORohfkQGwZMDd2HzpDDUXtUETX9yxN6c3TLVhWnY23w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Hs8PVJ5NDlnbiWT2w4QSxEuhCcnNf+VJ+lvhV/2eXvjJu1Y19XDzDoSeguD+Ltd0o WCmrpIxqgSHapVyf3eqVQQM1s7P7sR2ZRFTc2Q51J02vArwtJV3c5DpkhGZ17MsZ1g 6p0Nfg+OS/45FwVOoymPEBJDYOIpIyVodkF0HE684betigjkFykhOFFLYksPhbJc4n atbfoLX/YULy19K+95ge1epS7myri1rc/17mnQM55g/Axp9WSOmuiGEaD+rIk2OnQf X8i+n9Zs+6FguIwffuVjEa1XEFU2Exe8R+wfrhwrwElOuE28L0Mp9SrtPUtyhMTrrF 6U9RoB8UY6sZA== Date: Fri, 20 Sep 2024 17:38:36 -0700 Message-ID: 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: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith 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/game-development.scm: (trenchbroom): New variable. Change-Id: I50691b1db2010cd8c2c7f04bdfd80278b9e14aed --- gnu/packages/game-development.scm | 93 +++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 0b3171d1a8..4e03734072 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -91,12 +91,14 @@ (define-module (gnu packages game-development) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages m4) + #:use-module (gnu packages maths) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages music) @@ -104,6 +106,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages networking) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) @@ -121,6 +124,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) @@ -674,6 +678,95 @@ (define-public tiled ;; under BSD-2. (license license:gpl2+))) +(define-public trenchbroom + (package + (name "trenchbroom") + (version "2024.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TrenchBroom/TrenchBroom") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xysz7rkjy11wp9sshdqllmlw8qb65f1zlljpw3q22483szwzxnb")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DCMAKE_BUILD_TYPE=Release" "-G" "Unix Makefiles" + "-DCMAKE_PREFIX_PATH=cmake/packages" + (string-append "-DFREEIMAGE_INCLUDE_PATH=" + #$freeimage "/include") + (string-append "-DFREEIMAGE_LIBRARY=" + #$freeimage "/lib/libfreeimage.so") + (string-append "-Dfreetype_INCLUDE_DIR=" + #$freetype "/include/freetype2") + (string-append "-Dfreetype_LIBRARY=" + #$freetype "/lib/libfreetype.so")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build-system + (lambda _ + (substitute* "CMakeLists.txt" + (("set\\(CMAKE_TOOLCHAIN_FILE") + "#set(CMAKE_TOOLCHAIN_FILE")) + (substitute* "app/CMakeLists.txt" + (("/usr") #$output)))) + (add-before 'build 'set-environment-variables + (lambda _ + ;; Set home so fontconfig can write cache. + (setenv "HOME" (getenv "TEMP")) + ;; Set QT platform for offscreen rendering. + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "XDG_RUNTIME_DIR" (getenv "TEMP")))) + (add-after 'install 'wrap-trenchbroom + (lambda _ + (wrap-program (string-append #$output "/bin/trenchbroom") + ;; TrenchBroom needs $XDG_DATA_DIRS set to find game + ;; configs. + `("XDG_DATA_DIRS" ":" prefix + (,(string-append #$output "/share"))) + ;; TrenchBroom also doesn't work well with Wayland backend. + '("QT_QPA_PLATFORM" = ("xcb"))))) + (add-after 'install 'install-desktop-file + (lambda _ + (make-desktop-entry-file + (string-append #$output "/share/applications/" + #$(package-name this-package) ".desktop") + #:name "TrenchBroom" + #:comment #$(package-synopsis this-package) + #:exec #$name + #:icon #$name + #:categories '("Development") + #:keywords '("quake" "level" "editor"))))) + #:tests? #f)) ; No tests. + (inputs + (list assimp + bash-minimal + catch2 + fmt + freeglut + freeimage + freetype + glew + glm + glu + libxxf86vm + mesa + miniz + qtbase-5 + qtsvg-5 + tinyxml2)) + (native-inputs (list git pandoc python p7zip)) + (home-page "https://kristianduske.com/trenchbroom/") + (synopsis "Cross-platform level editor for Quake-engine based games") + (description "TrenchBroom is a cross-platform level editor for +Quake-engine based games. It supports Quake, Quake 2, Hexen 2, as well as +other games. TrenchBroom provides many simple and advanced tools to create +complex and interesting levels.") + (license license:gpl3+))) + (define-public tsukundere (package (name "tsukundere")