Received: (at 73287) by debbugs.gnu.org; 8 Dec 2024 03:49:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 07 22:49:15 2024
Received: from localhost ([127.0.0.1]:49217 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tK8IE-0006Lv-Qk
for submit <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:15 -0500
Received: from layka.disroot.org ([178.21.23.139]:41100)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1tK8IA-0006LT-Es
for 73287 <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:11 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 0F7F124C9D;
Sun, 8 Dec 2024 04:49:10 +0100 (CET)
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 Wn09lc6fJTYD; Sun, 8 Dec 2024 04:49:05 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1733629745; bh=jf+7jVanQ7Gp0hvd9PbYaTxE/ATEz/gWAu99GgI6LcM=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=UGWekQinXMYkB69UlQHwTjBCwPzy1wrLdrmWWI6X0SLKdtH+NBnVa4toFJ6Lm+687
iXQo7g8UNPaJxkjA0fM4coKk3NDeGPXdymm8IrQIHyvYj/i4vshQuA5NDXClKEvoV+
CHgc8ujn3ZrmzTIA4QOAaClIaLIUfgIqn4d82CcFARIpGon4sjxbpi/7SJdQDTLOh2
hzfg08uIHe6ML1j9WJVNiRscJahV2linGXXK67eL3tik8wqvMMrOrM+izph5qZCZkF
3ZTuei/E6J+tpvEGKslUVQ5qDZMowS1Xv2Eo46SPWw14vt2wuAAKHzujxNAVrJ/f+8
guati8j0OylCA==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v4 3/3] gnu: Add trenchbroom.
Date: Sat, 7 Dec 2024 20:48:32 -0700
Message-ID: <7b762e62ff9523102189f3f3b4c251d1b38ef826.1733629326.git.jsubuntuxp@HIDDEN>
In-Reply-To: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@HIDDEN>
References: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 2aee26593c..1bc6e8fa49 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -92,12 +92,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)
@@ -105,6 +107,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-build)
@@ -123,6 +126,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)
@@ -680,6 +684,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")
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 8 Dec 2024 03:49:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 07 22:49:14 2024
Received: from localhost ([127.0.0.1]:49215 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tK8ID-0006Lo-MP
for submit <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:14 -0500
Received: from layka.disroot.org ([178.21.23.139]:41098)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1tK8I8-0006LK-Ir
for 73287 <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:10 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id E190624D36;
Sun, 8 Dec 2024 04:49:07 +0100 (CET)
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 7fAMTndrLG2B; Sun, 8 Dec 2024 04:49:03 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1733629743; bh=hob8ojuWmiTpCnClD05M5UriOdC2oYZgDKk22322+NU=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=T+igxFn4pdRgrAcuJPD3o0nNM/SnaIJZuiM10gfPOyiIdumoHnaf6MDU8YFUUHA6C
G69UKcd70uHTmVLVCoYP99xEU7QDKwgkICuFMjRET1sxIZlFOTRZu0zFnpP8owtd1U
8fD7msosh7N3GTKJ3r1EeASfbZobpe4aeHXj/CdanaBxUkED3rdlLa69he9A3w7dAY
yPD6D0spqBYwll9yEWHykzoc6ttyNDlCbtEZk7IEZJbpxJCSSRB/iQDtE+DrjM7KC/
aqcgBRzbKKdu3ge4uubN5nB8K4L+6ojx5P2kgObg9uiwWYSKZosLf9H0Ax9+UqDG18
mpZY8n/UySgVA==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v4 2/3] gnu: Add ericw-tools.
Date: Sat, 7 Dec 2024 20:48:31 -0700
Message-ID: <ef7316c859ad2bfccc2d9df51898e7bd23fc8e25.1733629326.git.jsubuntuxp@HIDDEN>
In-Reply-To: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@HIDDEN>
References: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)
* 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 | 34 +++++++
...-tools-gcc-11-pass-const-to-offsetof.patch | 90 +++++++++++++++++++
4 files changed, 194 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 a7bd32453b..5a3a762080 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -69,6 +69,7 @@
# Copyright © 2024 Fabio Natali <me@HIDDEN>
# Copyright © 2024 Noé Lopez <noelopez@HIDDEN>
# Copyright © 2024 Runciter <runciter@HIDDEN>
+# Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -1211,6 +1212,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 6be9d746c7..2aee26593c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2382,6 +2382,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..5dee955a95
--- /dev/null
+++ b/gnu/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch
@@ -0,0 +1,34 @@
+This patch is from upstream and shouldn't be needed in the next release.
+https://github.com/ericwa/ericw-tools/commit/982ef5276bb231ded12c45a686b0875594175774.patch
+
+From 982ef5276bb231ded12c45a686b0875594175774 Mon Sep 17 00:00:00 2001
+From: Bryan Haley <bryanmhaley@HIDDEN>
+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 <common/polylib.hh>
+ #include <common/bsputils.hh>
+
+-#ifdef HAVE_EMBREE
++#if defined(HAVE_EMBREE) && defined (__SSE2__)
+ #include <xmmintrin.h>
+ //#include <pmmintrin.h>
+ #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..12ec4400d7
--- /dev/null
+++ b/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch
@@ -0,0 +1,90 @@
+This patch is from upstream and shouldn't be needed in the next release.
+https://github.com/ericwa/ericw-tools/commit/c9570260fa895dde5a21272d76f9a3b05d59efdd.patch
+
+From c9570260fa895dde5a21272d76f9a3b05d59efdd Mon Sep 17 00:00:00 2001
+From: Eric Wasylishen <ewasylishen@HIDDEN>
+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<winding_t *>(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<winding_t*>(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<winding_t *>(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<winding_t *>(malloc(size));
+ memcpy(c, w, size);
+ return c;
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 8 Dec 2024 03:49:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 07 22:49:12 2024
Received: from localhost ([127.0.0.1]:49212 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tK8I9-0006LR-L5
for submit <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:12 -0500
Received: from layka.disroot.org ([178.21.23.139]:41086)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1tK8I6-0006LD-7h
for 73287 <at> debbugs.gnu.org; Sat, 07 Dec 2024 22:49:08 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id A184925185;
Sun, 8 Dec 2024 04:49:04 +0100 (CET)
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 pbMgzkzcRhD8; Sun, 8 Dec 2024 04:49:00 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1733629740; bh=TbTzgbrpcKLzd2UFUTkjt4vG2hu4R12veTsjglBYJDY=;
h=From:To:Cc:Subject:Date;
b=CydH2y1zJb8jyNAKsC1IEcliEeJG4onsY+k2td1No8zJYQhFHKLr83VZA+K1nFaoO
ptizQuqDsjbKi4ieh7Btv4cUDongulYxWqTvghVP487zSYqfxOeQmtfIxdxQXdkNlu
ODMJ97KKjv5KBFhd6eoLCSKvG1YyTc05Il1upGRawQxDrku5K8cV87oisRGByx7OiM
JF0UypuEen2UCYmFP01MXnFZhhwP7W48QiUlS2Xt8U2UDuDKwYD7yCPyj7Xtca80fv
8HtIdlA8FCXc7Pa4upb2BslYM8jr4R/4VlNDaCuIusAYRRyNKjFiclPyyHVldV1W7c
kRivFHEAMErQg==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v4 1/3] gnu: Add embree-2.
Date: Sat, 7 Dec 2024 20:48:30 -0700
Message-ID: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/graphics.scm: (embree-2): New variable.
Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea
---
gnu/packages/graphics.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f33e9d3fcb..b1df26bca5 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -38,6 +38,7 @@
;;; Copyright © 2023 Eric Bavier <bavier@HIDDEN>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
;;; Copyright © 2024 Ivan Vilata-i-Balaguer <ivan@HIDDEN>
+;;; Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -491,6 +492,30 @@ (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"))
+ (description (string-append (package-description embree) "
+
+Please note that this version requires a processor with SSE2 support."))))
+
(define-public openvdb
(package
(name "openvdb")
base-commit: bc630c5ebed27edd821ec363706f8b9cf1ee05cc
--
2.46.0
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 3 Nov 2024 12:44:20 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 03 07:44:20 2024
Received: from localhost ([127.0.0.1]:60208 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t7Zxs-0005hT-0I
for submit <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:20 -0500
Received: from layka.disroot.org ([178.21.23.139]:44318)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1t7Zxo-0005hH-Pf
for 73287 <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:18 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 61AC825245;
Sun, 3 Nov 2024 13:44:16 +0100 (CET)
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 4H8CxYe0qKIV; Sun, 3 Nov 2024 13:44:12 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1730637852; bh=eAdseQsPTrTyFmhq6LEiucYtLZA31jJVsAJnuvs+Bz0=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=lbnVtWbuYqs6QVoIvBgmA5Qop5PbqbN+4vS2OWM0wT3u35f9SFoQZHoABGoyt+PPO
IDdsknBH6MEEKCGd9Oz/VQQLID60O85e3K4M0Bm7W4omSe/Q10tXq5I86afDj0LwAA
QnnUonmrBI9NIbG/DQARIf11AR5GW0WDoSHMGp2N1XLuDfu/2ZxoAtL9uE736CRbYa
XcxUi6DJKuR2krmgc4g9RGI1HTrC7D3tJTLvD6z+JWELtQA9neNQn4X4ZiD3x7NbDo
rXSp+z1gpG3S1U7ItRj3BKPXb6vrlaOAGfDbE1DHrnOKyPetbe2Fu2FJI2hpJdye0t
JW8RW1j3mAkCA==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v3 3/3] gnu: Add trenchbroom.
Date: Sun, 3 Nov 2024 05:39:46 -0700
Message-ID: <03e5be8ee5905376f9caa04c117de8edb9a41aa8.1730611534.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1730611534.git.jsubuntuxp@HIDDEN>
References: <cover.1730611534.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 7d168151d2..1c40fac0e2 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-build)
@@ -122,6 +125,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)
@@ -679,6 +683,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")
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 3 Nov 2024 12:44:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 03 07:44:16 2024
Received: from localhost ([127.0.0.1]:60204 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t7Zxn-0005hG-Tg
for submit <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:16 -0500
Received: from layka.disroot.org ([178.21.23.139]:53226)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1t7Zxk-0005h8-Bl
for 73287 <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:14 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id EADBC251B4;
Sun, 3 Nov 2024 13:44:11 +0100 (CET)
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 BfSwNYtCONG3; Sun, 3 Nov 2024 13:44:07 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1730637847; bh=qWk4y3ZO9TadT4QLuodbwrU9T5k/kdNisY80jm0+y0M=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=VNuL0VjwMvd83yR82/1RGb+vMRTHfK8j+L1D0NfTF77+lqswr0kIToNd8MjEbSGVd
PHif8PV09FTCu+K13sFWDtl1CjEnwlaTQ8x83C5GpYJd6AemchCxv2gRUaK8pn3CwU
J5Mx14bsIPPhSAWnaIDGFUfkTtM+2DqyqJDa+CgdObG8pyYH29NyM1eSqL3gPSkQU8
7AnsXGYjawGBYsRFr3gunJ0dHF4r2gfqdQDVvTyHErcOkJzF7HKhx341kPZU3bocxO
25C/q0ehhWvY1gnnZ1Z9DwVb8QeHTEENXSnBuQAvBSP3nQiM8ClkvQ3WLEBJ26Bpla
80QVYvioMsjXQ==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v3 2/3] gnu: Add ericw-tools.
Date: Sun, 3 Nov 2024 05:39:45 -0700
Message-ID: <f35aec2d570691aac2a7074c2b39756452829f91.1730611534.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1730611534.git.jsubuntuxp@HIDDEN>
References: <cover.1730611534.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)
* 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 5b28de35f2..f2a620ffdd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -67,6 +67,7 @@
# Copyright © 2024 David Elsing <david.elsing@HIDDEN>
# Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
# Copyright © 2024 Fabio Natali <me@HIDDEN>
+# Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -1208,6 +1209,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 ee869c9cc5..7d168151d2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2399,6 +2399,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 <bryanmhaley@HIDDEN>
+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 <common/polylib.hh>
+ #include <common/bsputils.hh>
+
+-#ifdef HAVE_EMBREE
++#if defined(HAVE_EMBREE) && defined (__SSE2__)
+ #include <xmmintrin.h>
+ //#include <pmmintrin.h>
+ #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 <ewasylishen@HIDDEN>
+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<winding_t *>(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<winding_t*>(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<winding_t *>(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<winding_t *>(malloc(size));
+ memcpy(c, w, size);
+ return c;
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 3 Nov 2024 12:44:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 03 07:44:05 2024
Received: from localhost ([127.0.0.1]:60201 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1t7Zxc-0005gx-RL
for submit <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:05 -0500
Received: from layka.disroot.org ([178.21.23.139]:59952)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1t7ZxZ-0005gR-AI
for 73287 <at> debbugs.gnu.org; Sun, 03 Nov 2024 07:44:02 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id AE20825198;
Sun, 3 Nov 2024 13:43:59 +0100 (CET)
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 b48QKO6XSiuo; Sun, 3 Nov 2024 13:43:55 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1730637835; bh=q4DIVt6dL6ixvnfb9Tz64CDSmsDsJ4O6xNypy9gN7/s=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=U4N2qc1kQcV+zqQPQ+MXkHe/K+c+1KBtvwJhQJpD2FcOyhdmR9hcI2+8Rc6SWhzy/
7i8yjd736uWQh1t3HVUZsihgWyTGzpvKa1mMpnUKB4Q80tfZXB+wCd33gSka0za11Q
UdP0F8gEjI17NhjzzHJtOJ7C+jbhvuA4VRH/S/syQBLsRWaowU6W7xp0GtEYB18gQM
dQ/br2Zi803sZHymN0bVbkb47tYuS+yvLD6wtCtds7RisRrOKiSZESpb6m8T/Co5gH
WQyRq5NGlFjUnrdlXD6VK3GSB+fGMF/+AZ5WRfoCGoK0KM2Q1FHzkhHp7zEGVXtsvg
zD6kvixE45pFQ==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v3 1/3] gnu: Add embree-2.
Date: Sun, 3 Nov 2024 05:39:44 -0700
Message-ID: <d0c100ed967044d204abbdc627bb8f66d95e7304.1730611534.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1730611534.git.jsubuntuxp@HIDDEN>
References: <cover.1730611534.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/graphics.scm: (embree-2): New variable.
Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea
---
gnu/packages/graphics.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8686cac7f7..b794c14cd8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -37,6 +37,7 @@
;;; Copyright © 2023 David Thompson <dthompson2@HIDDEN>
;;; Copyright © 2023 Eric Bavier <bavier@HIDDEN>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
+;;; Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -490,6 +491,30 @@ (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"))
+ (description (string-append (package-description embree) "
+
+Please note that this version requires a processor with SSE2 support."))))
+
(define-public openvdb
(package
(name "openvdb")
--
2.46.0
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at 73287) by debbugs.gnu.org; 27 Oct 2024 14:34:40 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 27 10:34:40 2024 Received: from localhost ([127.0.0.1]:45882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1t54Ln-0001Qf-JK for submit <at> debbugs.gnu.org; Sun, 27 Oct 2024 10:34:39 -0400 Received: from layka.disroot.org ([178.21.23.139]:59552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jsubuntuxp@HIDDEN>) id 1t54Li-0001QQ-Ji for 73287 <at> debbugs.gnu.org; Sun, 27 Oct 2024 10:34:36 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 20C7524E35 for <73287 <at> debbugs.gnu.org>; Sun, 27 Oct 2024 15:33:58 +0100 (CET) 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 xumlqAZNlmFD for <73287 <at> debbugs.gnu.org>; Sun, 27 Oct 2024 15:33:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1730039637; bh=OYip/eKv42+iuAZt2JZYv0NUff+oXOC8Nie5U2Qom4k=; h=From:To:Subject:In-Reply-To:References:Date; b=c+ybmnPSG7+qSKMkOzI6iLqNK8rrf+3eZuy20r+2gJlhhdJgieqCmBp7n77uL/zqX Dq/kJuD7n4qh0rBFUXXSCUv5sq5PEaalQUwtEtIhqPp+9YIu2FV4ePC76vrTVOF9wn P8R6EGQ63PFHb6c8RQ8KC3cpedEV5fMDTrldup0DOVA0en+JTsIDq1acJHXLyM9P8s cc0IGSEn++FZzT90FUv9mgEAn6/j9Rwx2akl56WDVXHc6tPvFQ5aXlcazsCRDibdHi uoGsF1cbCA5Fh9iUMlhY125zKWFzIOq73yss+6An7JyGVYg54avVhhcwhoHk1FVqv2 U3KmpdUW/VYnA== From: James Smith <jsubuntuxp@HIDDEN> To: 73287 <at> debbugs.gnu.org Subject: Re: [PATCH 0/3] Add ericw-tools and TrenchBroom. In-Reply-To: <handler.73287.B.172645275019055.ack <at> debbugs.gnu.org> (GNU bug Tracking System's message of "Mon, 16 Sep 2024 02:13:02 +0000") References: <cover.1726445374.git.jsubuntuxp@HIDDEN> <handler.73287.B.172645275019055.ack <at> debbugs.gnu.org> Date: Sun, 27 Oct 2024 07:30:19 -0700 Message-ID: <86msipd3es.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 73287 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, I've waited about a month after sending a v2 and have gotten no responses. Are there any more changes I need to make for a v3, or do I just need to rebase onto current master? Currently, the blocker I'm aware of is Embree 2 has a hard requirement for SSE2. I'm thinking about mentioning it in the description when sending v3, but I'd like to get a second opinion. Thanks, James
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 20:39:26 2024
Received: from localhost ([127.0.0.1]:36790 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sro9m-0007Uw-5t
for submit <at> 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 <jsubuntuxp@HIDDEN>) id 1sro9h-0007UW-9o
for 73287 <at> 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==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v2 3/3] gnu: Add trenchbroom.
Date: Fri, 20 Sep 2024 17:38:36 -0700
Message-ID: <a6d105c2064d8e4a1cfd9a4c675deb00876da5ad.1726879062.git.jsubuntuxp@HIDDEN>
In-Reply-To: <eeb7a4981f3393045f781e33851101ea81b52d15.1726879062.git.jsubuntuxp@HIDDEN>
References: <eeb7a4981f3393045f781e33851101ea81b52d15.1726879062.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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")
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 20:39:24 2024
Received: from localhost ([127.0.0.1]:36788 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sro9j-0007Ul-3e
for submit <at> 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 <jsubuntuxp@HIDDEN>) id 1sro9e-0007UT-Pm
for 73287 <at> 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==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v2 2/3] gnu: Add ericw-tools.
Date: Fri, 20 Sep 2024 17:38:35 -0700
Message-ID: <a1ab67515ed40a088f8ae0fe33c1f077d6ff9692.1726879062.git.jsubuntuxp@HIDDEN>
In-Reply-To: <eeb7a4981f3393045f781e33851101ea81b52d15.1726879062.git.jsubuntuxp@HIDDEN>
References: <eeb7a4981f3393045f781e33851101ea81b52d15.1726879062.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 <david.elsing@HIDDEN>
# Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
# Copyright © 2024 Fabio Natali <me@HIDDEN>
+# Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
#
# 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 <bryanmhaley@HIDDEN>
+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 <common/polylib.hh>
+ #include <common/bsputils.hh>
+
+-#ifdef HAVE_EMBREE
++#if defined(HAVE_EMBREE) && defined (__SSE2__)
+ #include <xmmintrin.h>
+ //#include <pmmintrin.h>
+ #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 <ewasylishen@HIDDEN>
+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<winding_t *>(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<winding_t*>(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<winding_t *>(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<winding_t *>(malloc(size));
+ memcpy(c, w, size);
+ return c;
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:39:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 20:39:17 2024
Received: from localhost ([127.0.0.1]:36784 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sro9c-0007UJ-F0
for submit <at> 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 <jsubuntuxp@HIDDEN>) id 1sro9Z-0007U6-Sg
for 73287 <at> 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==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH v2 1/3] gnu: Add embree-2.
Date: Fri, 20 Sep 2024 17:38:34 -0700
Message-ID: <eeb7a4981f3393045f781e33851101ea81b52d15.1726879062.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/graphics.scm: (embree-2): New variable.
Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea
---
gnu/packages/graphics.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
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 <dthompson2@HIDDEN>
;;; Copyright © 2023 Eric Bavier <bavier@HIDDEN>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
+;;; Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
;;;
;;; 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")
base-commit: e9d903f146865db5948abd271a5c7e763681b4e9
--
2.46.0
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at 73287) by debbugs.gnu.org; 21 Sep 2024 00:36:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 20:36:02 2024 Received: from localhost ([127.0.0.1]:36780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sro6T-0007OI-Pb for submit <at> debbugs.gnu.org; Fri, 20 Sep 2024 20:36:02 -0400 Received: from layka.disroot.org ([178.21.23.139]:60394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jsubuntuxp@HIDDEN>) id 1sro6R-0007O8-9Q for 73287 <at> debbugs.gnu.org; Fri, 20 Sep 2024 20:36:00 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D520923FCC; Sat, 21 Sep 2024 02:35:37 +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 16bVscCsnNfZ; Sat, 21 Sep 2024 02:35:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726878936; bh=fQT3H46kNxS1SdKaxEIWBOZUDVy4pYy0Xhy84iAuy1s=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=Qs01rJyCkakhDUt89prHPEuYA131C+tvqkeqS7RoTNTq1Yi1/ZI4EMDkXHQgrmuFd 7dx10eaPY82S2QKRB9LiAz+SIG+c2dZofxtXjszjrUtpx163Et3bMvYprlgSswHCmw b94Ou608GFSvBzMBWnxd1S7mAfBukw3A8CjVl7igo3ng9IwSTCkitr9GSJUOSRYwMz gZCwnGxHwKXBqN0YQ3qYGYq1+H3N0bJ9Cccgjw8orkJU3vSK0DZVvcgYdqk6Xaxeet x9wvbvWNW9jEqme485b3unoqlq4vc7PxW5IKWsQ4ig/+/nWZBU+6eiyzgHPZYjBE8W mGtMskSHpQxhA== From: James Smith <jsubuntuxp@HIDDEN> To: Liliana Marie Prikler <liliana.prikler@HIDDEN> Subject: Re: [PATCH 1/3] gnu: Add embree-2. In-Reply-To: <b87c0a58d935e0a3aee802d2db745f8f4345be7f.camel@HIDDEN> (Liliana Marie Prikler's message of "Fri, 20 Sep 2024 09:58:45 +0200") References: <cover.1726445374.git.jsubuntuxp@HIDDEN> <523f56c5bce617aba865a0d6cb7497caed06d249.1726445374.git.jsubuntuxp@HIDDEN> <b87c0a58d935e0a3aee802d2db745f8f4345be7f.camel@HIDDEN> Date: Fri, 20 Sep 2024 17:35:33 -0700 Message-ID: <86r09dhmi2.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73287 Cc: 73287 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Liliana Marie Prikler <liliana.prikler@HIDDEN> writes: > Am Sonntag, dem 15.09.2024 um 19:16 -0700 schrieb James Smith: >> +=C2=A0=C2=A0=C2=A0 ;; Tries to build with SSE2 and AVX support on ARM, = so disable >> building for >> +=C2=A0=C2=A0=C2=A0 ;; those systems. > Comments should be full sentences. Also, this is a hint that it uses > SSE2 and AVX on the platforms below too =E2=80=93 we should disable them,= as > they won't work with every CPU. I've investigated on disabling them, but it seems that embree 2 (and 3 for that matter) has a hard requirement for SSE2 and have updated the comment as such. I've gone ahead and implemented your suggestions for the other patches though and will be sending them shortly. >> +=C2=A0=C2=A0=C2=A0 (supported-systems (list "i686-linux" "x86_64-linux"= )))) >> + > > Cheers
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at 73287) by debbugs.gnu.org; 20 Sep 2024 08:05:51 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 04:05:51 2024 Received: from localhost ([127.0.0.1]:33966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1srYeE-0001PO-BM for submit <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:05:51 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:57775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1srYeB-0001P9-DQ for 73287 <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:05:49 -0400 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-a9018103214so223988266b.3 for <73287 <at> debbugs.gnu.org>; Fri, 20 Sep 2024 01:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726819463; x=1727424263; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=uPlwm6xOLKy0nolChvzIOV1EBnQFXvPcq0tud0YjQXQ=; b=FKkWHqLARAE7r6htCMrEaSWbWbU5nvrx8ObqDJ9P2G97p8haqQMecqm51V9FOVDj2N EJjsW8GhbakwV/d3t4Gda6F3jo5YGGeZPm8yGa4T/tdrKyICC22K0n9PX6HhNS09zhYc Qu6cqQ5vOcDh6ZIOVijMsDTxRsJz1sZpXWqre6J+47aOdZjRw9BNJ4O/RtoIY+R6ybuy UhnrMFV3FIJPvtAa4ZG8oRoiK2E7KJ8EMJbFMH2TxOw7pqWwFMeZXf4UwC31qeK7OZpR 3jdvuLkckrsSEfGRBU11Px3oUxTmhRM6/s/Y9t46ZRQtV7XeENUvS0PEDVRrTvsz1eQ0 mMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726819463; x=1727424263; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=uPlwm6xOLKy0nolChvzIOV1EBnQFXvPcq0tud0YjQXQ=; b=jfGUXPIX+rPqX0Fi986RX2Kp/VgoITU5T7Yoot36QvQIG5wgBhCdIrtn3juMsWi452 L4DjY22afhlfDQgHAHF1tgCTr1KG5npjPkft+LyxnW3E28Qe/vgXUkmJie5tPnJOr4sT VxYjORplivUAad5ahA29IqOPgWxV4tuHueLeSrlxIzbJyIZpesCsMBODIW62hnwjd1hn WQT028MdolZUCurHXZZIghg3v35bmxlTQkyl5LlN5tlEP2xQqX+Buqf6grFwUFMGsKEh +BodYdqdpCp4JLAwN66IixXs3kEasikMld0BbwyDIlP4xb7MV0W0VRU2EGT6NpxVKMBc bRFA== X-Forwarded-Encrypted: i=1; AJvYcCWmHX8loHNgtov9IiiLRZfQTNp3pxNOi3mltAf8rIkfTxXhaRoQi3kJR8Jv/cE7WdsiPmo5Jg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzK90Z/XOutlj+JiaRYkwFCT7PGbYyzxwWvVzUkAK/LFM1buqSG ztf7PLG4a0OV5qt+9Kdj/hRalek1RJ1M2fENpLOdiu2cp80QeTp4 X-Google-Smtp-Source: AGHT+IFG0QAnlqOkfpBhQdUa1FyzHOKb2xlQTBEiZSu29hAAdA5HK3eNhH7RPtJVWjqwiE0qX76ENw== X-Received: by 2002:a17:907:c881:b0:a8a:7bed:d327 with SMTP id a640c23a62f3a-a90d5732fbamr128640266b.36.1726819462788; Fri, 20 Sep 2024 01:04:22 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610966d7sm810143166b.39.2024.09.20.01.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 01:04:22 -0700 (PDT) Message-ID: <6fe9f674e894c9cb20a51b9e60cd319f0efe3954.camel@HIDDEN> Subject: Re: [bug#73287] [PATCH 2/3] gnu: Add ericw-tools. From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: James Smith <jsubuntuxp@HIDDEN>, 73287 <at> debbugs.gnu.org Date: Fri, 20 Sep 2024 10:04:20 +0200 In-Reply-To: <77a59889d3bed9a7629b49da7b033846cb195715.1726445374.git.jsubuntuxp@HIDDEN> References: <cover.1726445374.git.jsubuntuxp@HIDDEN> <77a59889d3bed9a7629b49da7b033846cb195715.1726445374.git.jsubuntuxp@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73287 Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDE1LjA5LjIwMjQgdW0gMTk6MTYgLTA3MDAgc2NocmllYiBKYW1lcyBT bWl0aDoKPiAqIGdudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50LnNjbTogKGVyaWN3LXRvb2xz KTogTmV3IHZhcmlhYmxlLgo+ICogZ251L3BhY2thZ2VzL3BhdGNoZXMvZXJpY3ctdG9vbHMtYWRk LWNoZWNrLWZvci1zc2UyLWluLQo+IGxpZ2h0LmNjLnBhdGNoOiBOZXcgZmlsZS4KPiAqIGdudS9w YWNrYWdlcy9wYXRjaGVzL2VyaWN3LXRvb2xzLWdjYy0xMS1wYXNzLWNvbnN0LXRvLQo+IG9mZnNl dG9mLnBhdGNoOiBOZXcgZmlsZS4KPiAqIGdudS9sb2NhbC5tazogUmVnaXN0ZXIgcGF0Y2ggZmls ZXMuCj4gCj4gQ2hhbmdlLUlkOiBJODk2YjhmNzgxMDU0NDQyZTRkYjRhNzIyMGQ1MjZiOGYyODc4 ODczYwo+IC0tLQo+IMKgZ251L2xvY2FsLm1rwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHzCoCAzICsKPiDCoGdudS9wYWNr YWdlcy9nYW1lLWRldmVsb3BtZW50LnNjbcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB8IDc1ICsr KysrKysrKysrKysrKysKPiDCoC4uLnRvb2xzLWFkZC1jaGVjay1mb3Itc3NlMi1pbi1saWdodC5j Yy5wYXRjaCB8IDMxICsrKysrKysKPiDCoC4uLi10b29scy1nY2MtMTEtcGFzcy1jb25zdC10by1v ZmZzZXRvZi5wYXRjaCB8IDg3Cj4gKysrKysrKysrKysrKysrKysrKwo+IMKgNCBmaWxlcyBjaGFu Z2VkLCAxOTYgaW5zZXJ0aW9ucygrKQo+IMKgY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdl cy9wYXRjaGVzL2VyaWN3LXRvb2xzLWFkZC1jaGVjay1mb3ItCj4gc3NlMi1pbi1saWdodC5jYy5w YXRjaAo+IMKgY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2VyaWN3LXRv b2xzLWdjYy0xMS1wYXNzLQo+IGNvbnN0LXRvLW9mZnNldG9mLnBhdGNoCj4gCj4gZGlmZiAtLWdp dCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2NhbC5tawo+IGluZGV4IGZjZGYxNzQwOTkuLmJiN2Vj OTk2MGMgMTAwNjQ0Cj4gLS0tIGEvZ251L2xvY2FsLm1rCj4gKysrIGIvZ251L2xvY2FsLm1rCj4g QEAgLTY3LDYgKzY3LDcgQEAKPiDCoCMgQ29weXJpZ2h0IMKpIDIwMjQgRGF2aWQgRWxzaW5nIDxk YXZpZC5lbHNpbmdAcG9zdGVvLm5ldD4KPiDCoCMgQ29weXJpZ2h0IMKpIDIwMjQgQXNoaXNoIFNI VUtMQSA8YXNoaXNoLmlzQGxvc3RjYS5zZT4KPiDCoCMgQ29weXJpZ2h0IMKpIDIwMjQgRmFiaW8g TmF0YWxpIDxtZUBmYWJpb25hdGFsaS5jb20+Cj4gKyMgQ29weXJpZ2h0IMKpIDIwMjQgSmFtZXMg U21pdGggPGpzdWJ1bnR1eHBAZGlzcm9vdC5vcmc+Cj4gwqAjCj4gwqAjIFRoaXMgZmlsZSBpcyBw YXJ0IG9mIEdOVSBHdWl4Lgo+IMKgIwo+IEBAIC0xMjAwLDYgKzEyMDEsOCBAQCBkaXN0X3BhdGNo X0RBVEEKPiA9wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoFwKPiDCoMKgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2VwaXBoYW55LWZpeC1lbmNvZGluZy10ZXN0LnBhdGNowqDCoMKgwqDCoMKgwqDCoFwK PiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2VyZ29kb3gtZmlybXdhcmUtZml4LWpzb24tdGFy Z2V0LnBhdGNowqDCoFwKPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2VyZ29kb3gtZmlybXdh cmUtZml4LW51bXBhZC5wYXRjaMKgwqDCoMKgwqDCoMKgXAo+ICvCoCAlRCUvcGFja2FnZXMvcGF0 Y2hlcy9lcmljdy10b29scy1hZGQtY2hlY2stZm9yLXNzZTItaW4tCj4gbGlnaHQuY2MucGF0Y2jC oMKgwqDCoMKgwqDCoMKgXAo+ICvCoCAlRCUvcGFja2FnZXMvcGF0Y2hlcy9lcmljdy10b29scy1n Y2MtMTEtcGFzcy1jb25zdC10by0KPiBvZmZzZXRvZi5wYXRjaMKgXAo+IMKgwqAgJUQlL3BhY2th Z2VzL3BhdGNoZXMvZXJsYW5nLW1hbi1wYXRoLnBhdGNowqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqBcCj4gwqDCoCAlRCUvcGFja2FnZXMvcGF0Y2hlcy9lc21pbmktdXNlLXBr Z2NvbmZpZy5wYXRjaMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBcCj4gwqDCoCAlRCUvcGFj a2FnZXMvcGF0Y2hlcy9lc210cC1hZGQtbGVzbXRwLnBhdGNowqDCoMKgwqDCoMKgwqDCoMKgwqBc Cj4gZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50LnNjbSBiL2dudS9w YWNrYWdlcy9nYW1lLQo+IGRldmVsb3BtZW50LnNjbQo+IGluZGV4IGVmYmJhYmFhZjUuLmQ2MWI0 ZDYzM2EgMTAwNjQ0Cj4gLS0tIGEvZ251L3BhY2thZ2VzL2dhbWUtZGV2ZWxvcG1lbnQuc2NtCj4g KysrIGIvZ251L3BhY2thZ2VzL2dhbWUtZGV2ZWxvcG1lbnQuc2NtCj4gQEAgLTIzOTQsNiArMjM5 NCw4MSBAQCAoZGVmaW5lLXB1YmxpYyBlbnR0Cj4gwqDCoMKgwqAgKGxpY2Vuc2UgKGxpc3QgbGlj ZW5zZTpleHBhdMKgwqDCoMKgwqDCoMKgIDsgY29kZQo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIGxpY2Vuc2U6Y2MtYnk0LjApKSkpIDsgZG9jdW1lbnRhdGlvbgo+IMKg Cj4gKyhkZWZpbmUtcHVibGljIGVyaWN3LXRvb2xzCj4gK8KgIChwYWNrYWdlCj4gK8KgwqDCoCAo bmFtZSAiZXJpY3ctdG9vbHMiKQo+ICvCoMKgwqAgKHZlcnNpb24gIjAuMTguMSIpCj4gK8KgwqDC oCAoc291cmNlCj4gK8KgwqDCoMKgIChvcmlnaW4KPiArwqDCoMKgwqDCoMKgIChtZXRob2QgZ2l0 LWZldGNoKQo+ICvCoMKgwqDCoMKgwqAgKHVyaSAoZ2l0LXJlZmVyZW5jZSAodXJsCj4gImh0dHBz Oi8vZ2l0aHViLmNvbS9lcmljd2EvZXJpY3ctdG9vbHMiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjb21taXQgKHN0cmluZy1hcHBlbmQg InYiIHZlcnNpb24pKSkpCj4gK8KgwqDCoMKgwqDCoCAoZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1l IG5hbWUgdmVyc2lvbikpCj4gK8KgwqDCoMKgwqDCoCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDCoMKg IChiYXNlMzIKPiAiMTFzYXA3cXYwcmxodzhxMjVhenZoZ2pjd2lxbDN6YW0wOXEwZ2ltM2kwNGNn NmZraDB2cCIpKQo+ICvCoMKgwqDCoMKgwqAgKHBhdGNoZXMKPiArwqDCoMKgwqDCoMKgwqAgKHNl YXJjaC1wYXRjaGVzICJlcmljdy10b29scy1hZGQtY2hlY2stZm9yLXNzZTItaW4tCj4gbGlnaHQu Y2MucGF0Y2giCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgImVyaWN3LXRvb2xzLWdjYy0xMS1wYXNzLWNvbnN0LXRvLQo+IG9mZnNldG9mLnBhdGNoIikp KSkKPiArwqDCoMKgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqAg KGFyZ3VtZW50cwo+ICvCoMKgwqDCoCAobGlzdCAjOmNvbmZpZ3VyZS1mbGFncyAjfihsaXN0ICIt REVOQUJMRV9MSUdIVFBSRVZJRVc9T0ZGIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgIzpwaGFz ZXMKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgI34obW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhh c2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGFkZC1hZnRlciAndW5wYWNrICdk aXNhYmxlLWNvcHlpbmctZW1icmVlLWZpbGVzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChsYW1iZGEgXwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg OzsgVHJpZXMgdG8gY29weSBmaWxlcyBmcm9tIGVtYnJlZSwgZGlzYWJsZSBpdC4KPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAibGlnaHQvQ01ha2VM aXN0cy50eHQiCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgi aW5zdGFsbFxcXChGSUxFUyBcXCRcXHtFTUJSRUUiKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgIiNpbnN0YWxsKEZJTEVTICR7RU1CUkVFIikpKSkKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICdpbnN0YWxsICdyZW5hbWUtYmlu YXJpZXMKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBfCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBSZW5hbWUgYmluYXJpZXMgdG8g cHJldmVudCBjb2xsaXNpb25zIHdpdGgKPiBvdGhlcgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgOzsgcGFja2FnZXMuCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAocmVuYW1lLWZpbGUgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQKPiAiL2Jpbi9i c3BpbmZvIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQKPiAiL2Jpbi9xYnNwaW5m byIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHJlbmFtZS1maWxl IChzdHJpbmctYXBwZW5kICMkb3V0cHV0Cj4gIi9iaW4vYnNwdXRpbCIpCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJp bmctYXBwZW5kICMkb3V0cHV0Cj4gIi9iaW4vcWJzcHV0aWwiKSkKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChyZW5hbWUtZmlsZSAoc3RyaW5nLWFwcGVuZCAjJG91dHB1 dAo+ICIvYmluL2xpZ2h0IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQKPiAiL2Jp bi9xbGlnaHQiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChyZW5h bWUtZmlsZSAoc3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL2Jpbi92aXMiKQo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Ry aW5nLWFwcGVuZCAjJG91dHB1dAo+ICIvYmluL3F2aXMiKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ2luc3RhbGwtbGljZW5zZS1maWxlcyAnY2xlYW4tdXAt YmluLQo+IGRpcmVjdG9yeQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFt YmRhIF8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IEluc3RhbGwg dGFyZ2V0IGNvcGllcyB0ZXh0IGRvY3VtZW50cyB0bwo+ICMkb3V0cHV0L2JpbiwgbW92ZQo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgOzsgdGhlbSB0byAjJG91dHB1dC9z aGFyZS9kb2MuCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZGVsZXRl LWZpbGUgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQKPiAiL2Jpbi9ncGxfdjMudHh0IikpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAocmVuYW1lLWZpbGUKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIyRvdXRwdXQg Ii9iaW4vY2hhbmdlbG9nLnR4dCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvc2hhcmUvZG9jLyIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgIyQocGFja2FnZS1uYW1lIHRoaXMtcGFja2FnZSkgIi0iCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICMkKHBh Y2thZ2UtdmVyc2lvbiB0aGlzLXBhY2thZ2UpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIvY2hhbmdlbG9nLnR4 dCIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHJlbmFtZS1maWxl Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5k ICMkb3V0cHV0ICIvYmluL1JFQURNRS5tZCIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgIChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvc2hhcmUvZG9jLyIKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgIyQocGFja2FnZS1uYW1lIHRoaXMtcGFja2FnZSkgIi0iCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICMkKHBhY2thZ2UtdmVyc2lvbiB0aGlzLXBhY2thZ2UpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIvUkVBRE1F Lm1kIikpKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgICM6dGVzdHM/ICNmKSkgOyBObyB0ZXN0 cwo+ICvCoMKgwqAgKGlucHV0cyAobGlzdCBlbWJyZWUtMikpCj4gK8KgwqDCoCAoaG9tZS1wYWdl ICJodHRwczovL2VyaWN3YS5naXRodWIuaW8vZXJpY3ctdG9vbHMvIikKPiArwqDCoMKgIChzeW5v cHNpcyAiUXVha2UvSGV4ZW4gMiBtYXAgY29tcGlsaW5nIHRvb2xzIikKSSdkIHN3YXAgdGhhdCBh cm91bmQ6IE1hcCBjb21waWxpbmcgdG9vbHMgZm9yIFF1YWtlL0hleGVuIDIKPiArwqDCoMKgIChk ZXNjcmlwdGlvbiAiQ29sbGVjdGlvbiBvZiBjb21tYW5kIGxpbmUgdXRpbGl0aWVzIGZvciBidWls ZGluZwo+IFF1YWtlIGxldmVscwo+ICthbmQgd29ya2luZyB3aXRoIHZhcmlvdXMgUXVha2UgZmls ZSBmb3JtYXRzLsKgIEEgYnJpZWYgZGVzY3JpcHRpb24gb2YKPiB0aGUgdG9vbHMKPiArYXJlIGxp c3RlZCBiZWxvdy4KPiArCj4gK0luY2x1ZGVkIHV0aWxpdGllczoKPiArCj4gK0BpdGVtaXplIEBi dWxsZXQKPiArQGl0ZW0gcWJzcCAtIFVzZWQgZm9yIHR1cm5pbmcgYSAubWFwIGZpbGUgaW50byBh IHBsYXlhYmxlIC5ic3AgZmlsZS4KPiArQGl0ZW0gcWxpZ2h0IC0gVXNlZCBmb3IgbGlnaHRpbmcg YSBsZXZlbCBhZnRlciB0aGUgYnNwIHN0YWdlLsKgIFRoaXMKPiB1dGlsIHdhcwo+ICtwcmV2aW91 c2x5IGtub3duIGFzIFR5ckxpdGUuCj4gK0BpdGVtIHF2aXMgLSBDcmVhdGVzIHRoZSBwb3RlbnRp YWxseSB2aXNpYmxlIHNldCAoUFZTKSBmb3IgYSBic3AuCj4gK0BpdGVtIHFic3BpbmZvIC0gUHJp bnQgc3RhdHMgYWJvdXQgdGhlIGRhdGEgY29udGFpbmVkIGluIGEgYnNwIGZpbGUuCj4gK0BpdGVt IHFic3B1dGlsIC0gU2ltcGxlIHRvb2wgZm9yIG1hbmlwdWxhdGlvbiBvZiBic3AgZmlsZSBkYXRh Lgo+ICtAZW5kIGl0ZW1pemUiKQo+ICvCoMKgwqAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKykpKQpE ZXNjcmlwdGlvbnMgc2hvdWxkIGNvbnNpc3Qgb2YgY29tcGxldGUgc2VudGVuY2VzLiAgSSB0aGlu ayB0aGUKaW5jbHVkZWQgdXRpbGl0aWVzIGFyZSBiZXR0ZXIgc3VtbWFyaXplZCB0aGFuIGV4cGxh aW5lZCBidWxsZXQgcG9pbnQgYnkKYnVsbGV0IHBvaW50LCBidXQgdGhhdCdzIGp1c3QgbXkgb3du IGJpYXMuCgpDaGVlcnMK
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at 73287) by debbugs.gnu.org; 20 Sep 2024 08:03:39 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 04:03:39 2024 Received: from localhost ([127.0.0.1]:33962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1srYc6-0001Dr-Ax for submit <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:03:39 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:43328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1srYc3-0001DY-69 for 73287 <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:03:36 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5c24ebaa427so4307497a12.1 for <73287 <at> debbugs.gnu.org>; Fri, 20 Sep 2024 01:03:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726819331; x=1727424131; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=np65rx05goF4bDC8l0HGc6CszPTqy1tDauvXyA3/uk8=; b=mUZQEJUIdJIqTg2nZZ7vy7wI4Ufu4ZtnL9Si2Mdw8Be8tzvq0GpVXcLXqe9k0BSl74 GGssJU9VexHL8FzoojvDmJnxguo2raV4b6kT8+gJ6bBD2Pzfvt4LOnYfq+pRMq3d/SH1 GXYnieAabD7cBicFCe9AYrhfmZhVB2Yzh5Z2Gi28DTJXfco8TjzLpnowlA0ovX+GwwKf pMpd2ZJSjTrj0ugMMmG2vXmqmUgDIcqO7PiEd+MAauGUaR47uRvcYr5pQOj64S95x8y1 39i5TasyeYtu5kWkhxZCaKAJDqJkfPVpFFIXieRT9yrTLyDMnbfT519mwHy0lgHJl4H0 kEvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726819331; x=1727424131; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=np65rx05goF4bDC8l0HGc6CszPTqy1tDauvXyA3/uk8=; b=niet/kVZxa/e3i9g4Okw9murl8mXUvFg29gJvvwZV36KTlTupVQxi+HoHOelPk9z1k UGXG1VYsAXAq9ulKkV4RtDy2YnBHS1Qa8vVvN7L9hDYRB1arTbhxn6NMl91In9LidLx1 32b6Vb/iLrWalvg5frzTrTrBoE+3Eyw5+dkQl11TJu24kcd1VPJ/5qBhCX5MkRBKiSlg nYWRd+6M5b8sQ5TkLCzZpcTygEwY8lfZfH42uqbvqN2nd2YKElQf/q4GxtJG0YhonleN bQY1k8093E2oGvXZH+Kuy+Xy2X1OL4HI60ApKtJ4vaZsmdxVfJSE7DuOVlk60HEtobhA 2G+g== X-Forwarded-Encrypted: i=1; AJvYcCXZjO5W+tIbRgupfknbtxv27R+oHLuJR0uhnsKQlnESa1XXMKPtL1VQxnf7a2AqbEcoYKrDsw==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzPb23OmpUk4E61x0yzR2s8MspHKa1yO8zuHHHFlPcq4psDy3sE EEBhmLzugzRJsCo5PMrTf1yH8ZH8If2LNNmE5hRLPHmiDXID7Dl1 X-Google-Smtp-Source: AGHT+IH0EEY0atb+bHiXwOsHqR6AGJwGmTgdEs2qob6hvQeHOHp9Vl5ZpgRG3NCX6ggsFuYwJNw0Aw== X-Received: by 2002:a17:907:7f12:b0:a8a:6db7:665d with SMTP id a640c23a62f3a-a90d3553b3dmr208186166b.17.1726819330419; Fri, 20 Sep 2024 01:02:10 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90610f440bsm810971166b.86.2024.09.20.01.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 01:02:10 -0700 (PDT) Message-ID: <a282def5d99351584056120879fb6a000dbbb34d.camel@HIDDEN> Subject: Re: [bug#73287] [PATCH 3/3] gnu: Add trenchbroom. From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: James Smith <jsubuntuxp@HIDDEN>, 73287 <at> debbugs.gnu.org Date: Fri, 20 Sep 2024 10:02:08 +0200 In-Reply-To: <bac910d5f79fb436a1cf2a7feeea5a58dc8f5c1a.1726445374.git.jsubuntuxp@HIDDEN> References: <cover.1726445374.git.jsubuntuxp@HIDDEN> <bac910d5f79fb436a1cf2a7feeea5a58dc8f5c1a.1726445374.git.jsubuntuxp@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73287 Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDE1LjA5LjIwMjQgdW0gMTk6MTYgLTA3MDAgc2NocmllYiBKYW1lcyBT bWl0aDoKPiAqIGdudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50LnNjbTogKHRyZW5jaGJyb29t KTogTmV3IHZhcmlhYmxlLgo+IAo+IENoYW5nZS1JZDogSTUwNjkxYjFkYjIwMTBjZDhjMmM3ZjA0 YmRmZDgwMjc4YjllMTRhZWQKPiAtLS0KPiDCoGdudS9wYWNrYWdlcy9nYW1lLWRldmVsb3BtZW50 LnNjbSB8IDkzCj4gKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+IMKgMSBmaWxlIGNo YW5nZWQsIDkzIGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dh bWUtZGV2ZWxvcG1lbnQuc2NtIGIvZ251L3BhY2thZ2VzL2dhbWUtCj4gZGV2ZWxvcG1lbnQuc2Nt Cj4gaW5kZXggZDYxYjRkNjMzYS4uYWJjMTQ0ZjUzNSAxMDA2NDQKPiAtLS0gYS9nbnUvcGFja2Fn ZXMvZ2FtZS1kZXZlbG9wbWVudC5zY20KPiArKysgYi9nbnUvcGFja2FnZXMvZ2FtZS1kZXZlbG9w bWVudC5zY20KPiBAQCAtOTEsMTIgKzkxLDE0IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2Fn ZXMgZ2FtZS1kZXZlbG9wbWVudCkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdy YXBodml6KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQo+IMKgwqAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3VpbGUpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ251IHBh Y2thZ2VzIGhhc2tlbGwteHl6KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaWN1 NGMpCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBpbWFnZSkKPiDCoMKgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIGxpbnV4KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgbGx2bSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGx1YSkKPiDCoMKg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG00KQo+ICvCoCAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBtYXRocykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG1wMykKPiDC oMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG11bHRpcHJlY2lzaW9uKQo+IMKgwqAgIzp1 c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbXVzaWMpCj4gQEAgLTEwNCw2ICsxMDYsNyBAQCAoZGVm aW5lLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdhbWUtZGV2ZWxvcG1lbnQpCj4gwqDCoCAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBuZXR3b3JraW5nKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgcGNyZSkKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1jb25m aWcpCj4gK8KgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHByZXR0eS1wcmludCkKPiDCoMKg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHB1bHNlYXVkaW8pCj4gwqDCoCAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyBweXRob24pCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBweXRob24tY3J5cHRvKQo+IEBAIC0xMjEsNiArMTI0LDcgQEAgKGRlZmluZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBnYW1lLWRldmVsb3BtZW50KQo+IMKgwqAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgdGV4aW5mbykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRleHR1dGls cykKPiDCoMKgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHRscykKPiArwqAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMgdmVyc2lvbi1jb250cm9sKQo+IMKgwqAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgdmlkZW8pCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB2dWxr YW4pCj4gwqDCoCAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB3ZWIpCj4gQEAgLTY3NCw2ICs2 NzgsOTUgQEAgKGRlZmluZS1wdWJsaWMgdGlsZWQKPiDCoMKgwqDCoCA7OyB1bmRlciBCU0QtMi4K PiDCoMKgwqDCoCAobGljZW5zZSBsaWNlbnNlOmdwbDIrKSkpCj4gwqAKPiArKGRlZmluZS1wdWJs aWMgdHJlbmNoYnJvb20KPiArwqAgKHBhY2thZ2UKPiArwqDCoMKgIChuYW1lICJ0cmVuY2hicm9v bSIpCj4gK8KgwqDCoCAodmVyc2lvbiAiMjAyNC4xIikKPiArwqDCoMKgIChzb3VyY2UKPiArwqDC oMKgwqAgKG9yaWdpbgo+ICvCoMKgwqDCoMKgwqAgKG1ldGhvZCBnaXQtZmV0Y2gpCj4gK8KgwqDC oMKgwqDCoCAodXJpIChnaXQtcmVmZXJlbmNlCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo dXJsICJodHRwczovL2dpdGh1Yi5jb20vVHJlbmNoQnJvb20vVHJlbmNoQnJvb20iKQo+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikp KSkKPiArwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9u KSkKPiArwqDCoMKgwqDCoMKgIChzaGEyNTYKPiArwqDCoMKgwqDCoMKgwqAgKGJhc2UzMgo+ICIx eHlzejdya2p5MTF3cDlzc2hkcWxsbWx3OHFiNjVmMXpsbGpwdzNxMjI0ODNzend6eG5iIikpKSkK PiArwqDCoMKgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqAgKGFy Z3VtZW50cwo+ICvCoMKgwqDCoCAobGlzdCAjOmNvbmZpZ3VyZS1mbGFncwo+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoCAjfihsaXN0ICItRENNQUtFX0JVSUxEX1RZUEU9UmVsZWFzZSIgIi1HIiAiVW5p eAo+IE1ha2VmaWxlcyIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICIt RENNQUtFX1BSRUZJWF9QQVRIPWNtYWtlL3BhY2thZ2VzIgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIi1ERlJFRUlNQUdFX0lOQ0xVREVfUEFU SD0iCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAjJGZyZWVpbWFnZSAiL2luY2x1ZGUiKQo+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIi1ERlJFRUlNQUdFX0xJQlJB Ulk9Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgIyRmcmVlaW1hZ2UKPiAiL2xpYi9saWJmcmVlaW1hZ2Uuc28iKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1hcHBlbmQgIi1E ZnJlZXR5cGVfSU5DTFVERV9ESVI9Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIyRmcmVldHlwZSAiL2luY2x1ZGUv ZnJlZXR5cGUyIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdHJp bmctYXBwZW5kICItRGZyZWV0eXBlX0xJQlJBUlk9Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIyRmcmVldHlwZSAi L2xpYi9saWJmcmVldHlwZS5zbyIpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCAjOnBoYXNlcwo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICd1bnBhY2sgJ2ZpeC1i dWlsZC1zeXN0ZW0KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBf Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogIkNN YWtlTGlzdHMudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICgoInNldFxcKENNQUtFX1RPT0xDSEFJTl9GSUxFIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICIjc2V0KENNQUtFX1RPT0xDSEFJTl9GSUxFIikpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogImFwcC9DTWFr ZUxpc3RzLnR4dCIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo KCIvdXNyIikgIyRvdXRwdXQpKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGFk ZC1iZWZvcmUgJ2J1aWxkICdzZXQtZW52aXJvbm1lbnQtdmFyaWFibGVzCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgOzsgU2V0IGhvbWUgc28gZm9udGNvbmZpZyBjYW4gd3JpdGUgY2FjaGUu Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2V0ZW52ICJIT01FIiAo Z2V0ZW52ICJURU1QIikpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7 OyBTZXQgUVQgcGxhdGZvcm0gZm9yIG9mZnNjcmVlbiByZW5kZXJpbmcuCj4gK8KgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2V0ZW52ICJRVF9RUEFfUExBVEZPUk0iICJvZmZz Y3JlZW4iKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHNldGVudiAi WERHX1JVTlRJTUVfRElSIiAoZ2V0ZW52ICJURU1QIikpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAoYWRkLWFmdGVyICdpbnN0YWxsICd3cmFwLXRyZW5jaGJyb29tCj4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgKHdyYXAtcHJvZ3JhbSAoc3RyaW5nLWFwcGVuZCAjJG91dHB1 dAo+ICIvYmluL3RyZW5jaGJyb29tIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCA7OyBUcmVuY2hCcm9vbSBuZWVkcyAkWERHX0RBVEFfRElSUyBzZXQgdG8gZmlu ZAo+IGdhbWUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBj b25maWdzLgo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGAoIlhE R19EQVRBX0RJUlMiICI6IiBwcmVmaXgKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgKCwoc3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL3NoYXJlIikpKQo+ICvC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDs7IFRyZW5jaEJyb29tIGFs c28gZG9lc24ndCB3b3JrIHdlbGwgd2l0aAo+IFdheWxhbmQgYmFja2VuZC4KPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAnKCJRVF9RUEFfUExBVEZPUk0iID0gKCJ4 Y2IiKSkpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICdpbnN0 YWxsICdpbnN0YWxsLWRlc2t0b3AtZmlsZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAobGFtYmRhIF8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICht YWtlLWRlc2t0b3AtZW50cnktZmlsZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc3RyaW5nLWFwcGVuZCAjJG91dHB1dCAiL3NoYXJlL2FwcGxpY2F0aW9ucy8iCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICMkKHBhY2thZ2UtbmFtZSB0aGlzLXBhY2thZ2UpCj4gIi5kZXNrdG9wIikK PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIzpuYW1lICJUcmVuY2hC cm9vbSIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIzpjb21tZW50 ICMkKHBhY2thZ2Utc3lub3BzaXMgdGhpcy1wYWNrYWdlKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAjOmV4ZWMgIyRuYW1lCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgICM6aWNvbiAjJG5hbWUKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgIzpjYXRlZ29yaWVzICcoIkRldmVsb3BtZW50IikKPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgIzprZXl3b3JkcyAnKCJxdWFrZSIgImxl dmVsIiAiZWRpdG9yIikpKSkpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgICM6dGVzdHM/ICNmKSkg OyBObyB0ZXN0cy4KPiArwqDCoMKgIChpbnB1dHMKPiArwqDCoMKgwqAgKGxpc3QgYXNzaW1wCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgIGJhc2gtbWluaW1hbAo+ICvCoMKgwqDCoMKgwqDCoMKgwqDC oCBjYXRjaDIKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAgZm10Cj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgIGZyZWVnbHV0Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgIGZyZWVpbWFnZQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoCBmcmVldHlwZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCBnbGV3Cj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgIGdsbQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCBnbHUKPiArwqDC oMKgwqDCoMKgwqDCoMKgwqAgbGlieHhmODZ2bQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCBtZXNh Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgIG1pbml6Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgIHF0 YmFzZS01Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgIHF0c3ZnLTUKPiArwqDCoMKgwqDCoMKgwqDC oMKgwqAgdGlueXhtbDIpKQo+ICvCoMKgwqAgKG5hdGl2ZS1pbnB1dHMgKGxpc3QgZ2l0IHBhbmRv YyBweXRob24gcDd6aXApKQo+ICvCoMKgwqAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9rcmlzdGlhbmR1 c2tlLmNvbS90cmVuY2hicm9vbS8iKQo+ICvCoMKgwqAgKHN5bm9wc2lzICJDcm9zcy1wbGF0Zm9y bSBsZXZlbCBlZGl0b3IgZm9yIFF1YWtlLWVuZ2luZSBiYXNlZAo+IGdhbWVzIikKPiArwqDCoMKg IChkZXNjcmlwdGlvbiAiVHJlbmNoQnJvb20gaXMgYSBjcm9zcy1wbGF0Zm9ybSBsZXZlbCBlZGl0 b3IgZm9yCj4gUXVha2UtZW5naW5lCj4gK2Jhc2VkIGdhbWVzLsKgIEl0IHN1cHBvcnRzIFF1YWtl LCBRdWFrZSAyLCBhbmQgSGV4ZW4gMi7CoCBUcmVuY2hCcm9vbQo+IGlzIGVhc3kgYW5kCj4gK3By b3ZpZGVzIG1hbnkgc2ltcGxlIGFuZCBhZHZhbmNlZCB0b29scyB0byBjcmVhdGUgY29tcGxleCBh bmQKPiBpbnRlcmVzdGluZyBsZXZlbHMKPiArd2l0aCBlYXNlLiIpCiJFYXN5IHdpdGggZWFzZSLi gKYgbGVzcyBtYXJrZXRpbmcgc3BlZWNoIGlzIGFkdmlzYWJsZSA6KQo=
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at 73287) by debbugs.gnu.org; 20 Sep 2024 08:00:15 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 20 04:00:15 2024 Received: from localhost ([127.0.0.1]:33958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1srYYo-00010G-Jf for submit <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:00:14 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:46117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1srYYl-0000yo-Sp for 73287 <at> debbugs.gnu.org; Fri, 20 Sep 2024 04:00:13 -0400 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-42cb1e623d1so15636295e9.0 for <73287 <at> debbugs.gnu.org>; Fri, 20 Sep 2024 00:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726819127; x=1727423927; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=jDZqOPdXv+JI1bTLXaJRQM3ooSegj4JnKDMtXQ5qzu4=; b=Ls0Rqhtv+sNKoobcQ9Dcey57RG+fB4QhzLCj8VuKJRHpKTR8x6rO4GpcO6EGLidUsk cy6NMK9+j7TZaKHf32ATwvY4sIErd3faeTX8JTFm07GwbEcXVpPbyIP4eP2M2tLKxiLt qImt0Cnr4jOTq/a/FGs+agvG+lKFkWsbM9h4GxRrxSADGevD4YtGSUIUuSpwx3YPtlHQ hS4cnWIC3eiguD5Kmw+dcUpOQv84bBNBlzthSGyEiq3o4wFjC03/nHVl7q9RjbOdbef4 YmXX/lUGKMZ59JmskzH+f0OI4UjOmBMvLf7aVzXPVvJnuyeTTfEjlGPlX8aiZtBrEI9r nijA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726819127; x=1727423927; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jDZqOPdXv+JI1bTLXaJRQM3ooSegj4JnKDMtXQ5qzu4=; b=DETr/0+HJBiK0+JusqKJzsZ1dT38XIhpOE2yNIGY5rKN4qMijqk8cvkW5xxwjleXBQ GcVZDN4qi/ToEd/7pDII5Q/wkZsaPzgXIbosXYAjMZydC4rU51Ah+wOKucC9CmgmAOIz bJlNP5C+h6tHelwDzFsfrn80JuertpRZ8qcJKXAe5L/cqzrSaBgkxT4V0TagEPpfU806 +CtTU7ynR3WUoTq8zcaxokMb/YAhE84nDxbCHHK4C/z/IZPDlRjkXzJgaT5e1txGN9HC wtU+mtWUPgTMdJnI14wf88SsBwHSax1lZGJS7MtHJbnIr8kh/1sRp6BkTY6H9ck61DzW Kpig== X-Forwarded-Encrypted: i=1; AJvYcCWaZV735tc2o3XvVt30emGpdncAhNyFc3GMxVGioA1DssdReom4SzfTOYsrzMC6G5FDCdo2uw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Ywp4dxFFnf5ISAFsJtAc1oP0DAqdgA/8bseyx42GcOx5QE0kOiM pGsHSij4lGkcCfN4ScQcreyQ6up9k7gEMq/Y8gxs/1OlDfrfR33V X-Google-Smtp-Source: AGHT+IF1C54JBjXAikcePihULYyqokKa3k2Dh0npadxkpEJASWFJRLZLby+BIND96bOe2ZmfU0E52Q== X-Received: by 2002:a05:600c:1d92:b0:42c:a90c:a8a with SMTP id 5b1f17b1804b1-42e7ac4d751mr12771315e9.21.1726819127222; Fri, 20 Sep 2024 00:58:47 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e754a6d46sm42969095e9.36.2024.09.20.00.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2024 00:58:46 -0700 (PDT) Message-ID: <b87c0a58d935e0a3aee802d2db745f8f4345be7f.camel@HIDDEN> Subject: Re: [PATCH 1/3] gnu: Add embree-2. From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: James Smith <jsubuntuxp@HIDDEN>, 73287 <at> debbugs.gnu.org Date: Fri, 20 Sep 2024 09:58:45 +0200 In-Reply-To: <523f56c5bce617aba865a0d6cb7497caed06d249.1726445374.git.jsubuntuxp@HIDDEN> References: <cover.1726445374.git.jsubuntuxp@HIDDEN> <523f56c5bce617aba865a0d6cb7497caed06d249.1726445374.git.jsubuntuxp@HIDDEN> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 73287 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Am Sonntag, dem 15.09.2024 um 19:16 -0700 schrieb James Smith: > * gnu/packages/graphics.scm: (embree-2): New variable. >=20 > Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea > --- > =C2=A0gnu/packages/graphics.scm | 22 ++++++++++++++++++++++ > =C2=A01 file changed, 22 insertions(+) >=20 > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm > index 3d03802245..d893c9dfee 100644 > --- a/gnu/packages/graphics.scm > +++ b/gnu/packages/graphics.scm > @@ -37,6 +37,7 @@ > =C2=A0;;; Copyright =C2=A9 2023 David Thompson <dthompson2@HIDDEN> > =C2=A0;;; Copyright =C2=A9 2023 Eric Bavier <bavier@HIDDEN> > =C2=A0;;; Copyright =C2=A9 2023, 2024 Artyom V. Poptsov > <poptsov.artyom@HIDDEN> > +;;; Copyright =C2=A9 2024 James Smith <jsubuntuxp@HIDDEN> > =C2=A0;;; > =C2=A0;;; This file is part of GNU Guix. > =C2=A0;;; > @@ -490,6 +491,27 @@ (define-public embree-3 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (base32 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 > "1kcvz7g6j56anv9zjyd3gidxl46vipw0gg82lns12m45cd43iwxm")))))) > =C2=A0 > +(define-public embree-2 > +=C2=A0 (package/inherit embree > +=C2=A0=C2=A0=C2=A0 (version "2.17.7") > +=C2=A0=C2=A0=C2=A0 (source > +=C2=A0=C2=A0=C2=A0=C2=A0 (origin > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (method git-fetch) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (uri (git-reference (url > "https://github.com/RenderKit/embree") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0 (commit (string-append "v" version)))) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (file-name (git-file-name (package-= name embree) version)) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (sha256 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (base32 > "19v60zdfix33c772x6dzmhsarhafsns8qy7c2ysqr7a9j16whgql")))) > +=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0 (substitute-keyword-arguments (package-argument= s embree) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ((#:configure-flags configure-flags= ) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(append (list "-DEMBREE_TUT= ORIALS=3DOFF") #$configure- > flags)))) > +=C2=A0=C2=A0=C2=A0 (inputs (modify-inputs (package-inputs embree) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (replace "tbb" tbb-2020))) > +=C2=A0=C2=A0=C2=A0 ;; Tries to build with SSE2 and AVX support on ARM, s= o disable > building for > +=C2=A0=C2=A0=C2=A0 ;; those systems. Comments should be full sentences. Also, this is a hint that it uses SSE2 and AVX on the platforms below too =E2=80=93 we should disable them, a= s they won't work with every CPU. > +=C2=A0=C2=A0=C2=A0 (supported-systems (list "i686-linux" "x86_64-linux")= ))) > + Cheers
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 16 Sep 2024 02:17:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 22:17:27 2024
Received: from localhost ([127.0.0.1]:50770 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sq1Is-0005GF-Cs
for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:27 -0400
Received: from layka.disroot.org ([178.21.23.139]:43850)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1sq1Iq-0005G0-A0
for 73287 <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:25 -0400
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 2B18723D33;
Mon, 16 Sep 2024 04:17:11 +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 NWXELMUtSckp; Mon, 16 Sep 2024 04:17:10 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1726453030; bh=hxSaBjKBpH3cPYhvS7UrKapDDHOJ+e32vRCedvmA6p0=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=hZKJ/lz2UNX4OSzXKtWl8CrV1QVSRrl9siFwUVMM0DK9x57k+y6fOPLwzn0isQpGx
BTvgAkIxRTcUvK4NTza7+7LNJ2L3U19clMl8W85gGPKUExknT6qMRelx2NLAOpDtWI
ijuNAySKGWhGLMzzZxoE5d7fIZLIT4H9kzwISBMXok4ARl/amFFJtXvMIND75AT3yA
tzyjq/S1k2gBgh2X34/dzQPbkw6thvxgJf/H6jt6R3GgtZeLTycaD8mGnCwTwLF4OW
f+bPYyyR9JeWWScbIKTsQTMpZcY3/NtZj5EPwSxv4qCgtWsHwLRnAg/ZyyX4JBwBwW
bRmlM3b7LRo7g==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: Add trenchbroom.
Date: Sun, 15 Sep 2024 19:16:24 -0700
Message-ID: <bac910d5f79fb436a1cf2a7feeea5a58dc8f5c1a.1726445374.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1726445374.git.jsubuntuxp@HIDDEN>
References: <cover.1726445374.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 d61b4d633a..abc144f535 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, and Hexen 2. TrenchBroom is easy and
+provides many simple and advanced tools to create complex and interesting levels
+with ease.")
+ (license license:gpl3+)))
+
(define-public tsukundere
(package
(name "tsukundere")
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 16 Sep 2024 02:17:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 22:17:24 2024
Received: from localhost ([127.0.0.1]:50767 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sq1Ip-0005Fy-Df
for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:24 -0400
Received: from layka.disroot.org ([178.21.23.139]:43844)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1sq1Im-0005Fo-5N
for 73287 <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:21 -0400
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id CF61B23D0F;
Mon, 16 Sep 2024 04:17:06 +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 di_pjPK23c1w; Mon, 16 Sep 2024 04:17:05 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1726453025; bh=oo4ByvykCVQxcgPV092952JMt9ExE/CPUSH8p9DXlKg=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=liLZODoyfvPa9IdiREc9jCKK27VqiNFERWox2CHdBPZRYTI5bth/MRJlJc4U/YGhK
c7H8cU4+DvWQeB+z0w4dG+eYKpe6f6aetpLqVZ4XRsU0cldpf5FpmfVvwoFkxUXDfr
QCrx1LP8c7CXc9ITXFC90AMVc05Qj8LtAW+Rbrejaq7BC3R/RXxNnIaSlativ/8U7u
MUa9lNRAFScx7FunZeSLt0POFTqzETov8VEMFjFSevvYrjqTIHFxxw/KP8REDGmR+U
e19D19ER1bErM3R49ipUjdh12TZeTB1qpWvauRRMBCgy9IF3M948j7v/nfnb+nGi8L
DlOIonESm4iWA==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: Add ericw-tools.
Date: Sun, 15 Sep 2024 19:16:23 -0700
Message-ID: <77a59889d3bed9a7629b49da7b033846cb195715.1726445374.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1726445374.git.jsubuntuxp@HIDDEN>
References: <cover.1726445374.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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 | 75 ++++++++++++++++
...tools-add-check-for-sse2-in-light.cc.patch | 31 +++++++
...-tools-gcc-11-pass-const-to-offsetof.patch | 87 +++++++++++++++++++
4 files changed, 196 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 fcdf174099..bb7ec9960c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -67,6 +67,7 @@
# Copyright © 2024 David Elsing <david.elsing@HIDDEN>
# Copyright © 2024 Ashish SHUKLA <ashish.is@HIDDEN>
# Copyright © 2024 Fabio Natali <me@HIDDEN>
+# Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
#
# This file is part of GNU Guix.
#
@@ -1200,6 +1201,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 efbbabaaf5..d61b4d633a 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2394,6 +2394,81 @@ (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 "Quake/Hexen 2 map compiling tools")
+ (description "Collection of command line utilities for building Quake levels
+and working with various Quake file formats. A brief description of the tools
+are listed below.
+
+Included utilities:
+
+@itemize @bullet
+@item qbsp - Used for turning a .map file into a playable .bsp file.
+@item qlight - Used for lighting a level after the bsp stage. This util was
+previously known as TyrLite.
+@item qvis - Creates the potentially visible set (PVS) for a bsp.
+@item qbspinfo - Print stats about the data contained in a bsp file.
+@item qbsputil - Simple tool for manipulation of bsp file data.
+@end itemize")
+ (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 <bryanmhaley@HIDDEN>
+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 <common/polylib.hh>
+ #include <common/bsputils.hh>
+
+-#ifdef HAVE_EMBREE
++#if defined(HAVE_EMBREE) && defined (__SSE2__)
+ #include <xmmintrin.h>
+ //#include <pmmintrin.h>
+ #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 <ewasylishen@HIDDEN>
+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<winding_t *>(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<winding_t*>(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<winding_t *>(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<winding_t *>(malloc(size));
+ memcpy(c, w, size);
+ return c;
--
2.46.0
adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
Received: (at 73287) by debbugs.gnu.org; 16 Sep 2024 02:17:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 22:17:13 2024
Received: from localhost ([127.0.0.1]:50764 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sq1If-0005FU-16
for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:13 -0400
Received: from layka.disroot.org ([178.21.23.139]:57620)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jsubuntuxp@HIDDEN>) id 1sq1Id-0005FF-8K
for 73287 <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:17:12 -0400
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id B8E1123D59;
Mon, 16 Sep 2024 04:16:57 +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 sz0EtY_uYR-v; Mon, 16 Sep 2024 04:16:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1726453016; bh=HKd2icmq/Wf/Kid+jLeKH8w1mvnhq06rcdDXeM4zXaM=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=UFZjbuu7RFSeVyPUvW3kQoC8XJY8YWuDfXrqzxnD5hP+XG8JVIVHqaXuK9SArf/OX
Ufjsmq2GFgjWfyJB6eH9ZUXJKIwMcJBQJois1Izy5r1vvCkf9pPJiVcsvbmSP2kuNp
mGc/3B/wEKyZh0mJXyUP2wsq9eW4Bu4mvadLGZ4BIhnk0lnz8Tv+g7qK+MoILGKOkF
mjiOX4+vPzmCtk9jNhrs6qHAOgKXjpbwcGObVCRxBi8c51DB6IU3vMkwXdRmRYr8Ar
qX+7HgKb6R5U+agkCS0fj6LciTkvnNam366Vjl3AHyQky/yza8aJmnaftqFVCIvLQ4
P9V1F2Eox6VAQ==
From: James Smith <jsubuntuxp@HIDDEN>
To: 73287 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: Add embree-2.
Date: Sun, 15 Sep 2024 19:16:22 -0700
Message-ID: <523f56c5bce617aba865a0d6cb7497caed06d249.1726445374.git.jsubuntuxp@HIDDEN>
In-Reply-To: <cover.1726445374.git.jsubuntuxp@HIDDEN>
References: <cover.1726445374.git.jsubuntuxp@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 73287
Cc: James Smith <jsubuntuxp@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/graphics.scm: (embree-2): New variable.
Change-Id: I2b2143b4d93c402ba940d408280ef1b37ab552ea
---
gnu/packages/graphics.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 3d03802245..d893c9dfee 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -37,6 +37,7 @@
;;; Copyright © 2023 David Thompson <dthompson2@HIDDEN>
;;; Copyright © 2023 Eric Bavier <bavier@HIDDEN>
;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
+;;; Copyright © 2024 James Smith <jsubuntuxp@HIDDEN>
;;;
;;; 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_TUTORIALS=OFF") #$configure-flags))))
+ (inputs (modify-inputs (package-inputs embree)
+ (replace "tbb" tbb-2020)))
+ ;; Tries to build with SSE2 and AVX support on ARM, so disable building for
+ ;; those systems.
+ (supported-systems (list "i686-linux" "x86_64-linux"))))
+
(define-public openvdb
(package
(name "openvdb")
--
2.46.0
guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 16 Sep 2024 02:12:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 22:12:30 2024 Received: from localhost ([127.0.0.1]:50756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sq1E6-0004xF-B5 for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:12:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:52784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jsubuntuxp@HIDDEN>) id 1sq1E3-0004x5-5f for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 22:12:28 -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 <jsubuntuxp@HIDDEN>) id 1sq1Dp-0001p9-Oi for guix-patches@HIDDEN; Sun, 15 Sep 2024 22:12:13 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <jsubuntuxp@HIDDEN>) id 1sq1Dn-0006at-OU for guix-patches@HIDDEN; Sun, 15 Sep 2024 22:12:13 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6DC6023D57; Mon, 16 Sep 2024 04:12:08 +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 FT9ZHZ2Ej2da; Mon, 16 Sep 2024 04:12:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1726452727; bh=GqpPLPX0Q4sOyGHf14eh3X2lRvb1OVWykHwy3cBiTnM=; h=From:To:Cc:Subject:Date; b=Y4DQTOCKIs4THpj0JawlN5+UThzwt/uBSqXuxuX6hTF+ymD+ttocRanJHH0MmrD2k q7PJUma9Xupp+z+3YcWdTW4Q62riUVfdDuqUbqSRs5NiYj5qKIeDH+/x+G2dRGAkHj 19Is156q05LNLGQO3DwoqZbFsY1GcQZSdbbvIUDcHhgq5fBKv9SU5zl96XZcnF45QI nIXW2wWEFNEtqZaz/DKp/MnIPzBJ91olvgi/1EjwS9apgaOKEIG/d+INWdU6ZTk8GB FQUDGZXRtlgEluCwAVBWRpCTt5qvwhz79yNqDOYn2vjVFd5C20OFjle/mR5MAVB9tF 77L7C8WXm1hiQ== From: James Smith <jsubuntuxp@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/3] Add ericw-tools and TrenchBroom. Date: Sun, 15 Sep 2024 19:10:22 -0700 Message-ID: <cover.1726445374.git.jsubuntuxp@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN> Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=jsubuntuxp@HIDDEN; helo=layka.disroot.org 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: James Smith <jsubuntuxp@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) This series adds the TrenchBroom map editor along with ericw-tools, which is a set of map compilers that works with it. Ericw-tools does need a couple of commits backported from upstream (in the form of patches) to build, so hopefully I included the patches properly. James Smith (3): gnu: Add embree-2. gnu: Add ericw-tools. gnu: Add trenchbroom. gnu/local.mk | 3 + gnu/packages/game-development.scm | 168 ++++++++++++++++++ gnu/packages/graphics.scm | 22 +++ ...tools-add-check-for-sse2-in-light.cc.patch | 31 ++++ ...-tools-gcc-11-pass-const-to-offsetof.patch | 87 +++++++++ 5 files changed, 311 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 base-commit: 83698b6fa037aa1f3adc38f474be41bac7622ed8 -- 2.46.0
James Smith <jsubuntuxp@HIDDEN>:adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN.
Full text available.adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#73287; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.