From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kF4xOo8XVWcgMAEAqHPOHw:P1 (envelope-from ) for ; Sun, 08 Dec 2024 03:50:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id kF4xOo8XVWcgMAEAqHPOHw (envelope-from ) for ; Sun, 08 Dec 2024 04:50:40 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Yj9xsb39; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=T+igxFn4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733629839; a=rsa-sha256; cv=none; b=rWdrPkRa29EpHw0DFCsAl5tvhOO0ZppLMzJ+WbeAw66MnD25vug9yeXeUaaDS3AbRzlAbl ZjtoZjxcyJ41f66sVlW1Dtz6fRx/b1tWhot5G0B0yQxnv0FJ4x8gUs4rcJSKnHacAYF2+N JkAwnfGYZK3Dg5bZXg8yaPA1W2+XYLTyFzfglQUCecO7Pue5g5bVH+6CYcNAhcKQu4lTq5 6+/UkbOScqZ6/3ObyXxzDVD8IY+FKk/zFkdlUqkFQ+BpczjtR5rdDq84jMo5rS70UJag2I 6oe2i/d9vsgOEpKLlaUzHUhjdS4tCUue6jax0yf1cf3+LE5wQv+BDzybIbLgww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Yj9xsb39; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=T+igxFn4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733629839; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=88VVQIOBvZiq7K3ZuCQ9JVxHzzYzd//Qbe5W3iPTgvs=; b=sbaqdDrWYOvAWmm4ZG5fMEWtREpVfSLbv1oq1J36ht/ifGCRmOu5QZLi8l0vTNLK+SKL0X 0gj9ChYTuq7etX2LDjvE23LNLmkXot7LtGahP+UIrlVLAGyxFOx6kBEsvujKcHw2tx5sbY dGpaXNkPt/nlwd+rMNsXy3ST07C67n+P+onUGC182HmpyfolRy1ZzrX7LGBQFRVeEIgGu/ HivEr6BaSpSit2FdAqaok/S40SyJhGuaZDi48OrqwGbBOfs/AlVNQ3Y8luxvfo5W5iln0R w8rrKpAA1SmZz6NwO5AXooisPQ+7VPA65WRaellXZBdgN+H8adUWbd8RxoOjew== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B85615524 for ; Sun, 08 Dec 2024 04:50:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tK8J5-00024X-8t; Sat, 07 Dec 2024 22:50:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tK8J2-000236-Tz for guix-patches@gnu.org; Sat, 07 Dec 2024 22:50:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tK8J2-000417-LJ for guix-patches@gnu.org; Sat, 07 Dec 2024 22:50:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=88VVQIOBvZiq7K3ZuCQ9JVxHzzYzd//Qbe5W3iPTgvs=; b=Yj9xsb39sPRkHNuy2ho/umt5D90W4D9cFNKFWpjdVxVzbR0iL2Wt/WdBZ/vi6nlIAfqnD4JvqhsFD20gKXQxsj8bWSdsmG6ksqoB9+xV+j9FRv6DlQnnrn+GJ7qZc80Lk9o3OMhrTjbGIOKFxcsI+Q5Jn8ixuk+f0n358ngp20B1Cw0Q8hu3hWDjY8ILcya01LT2dAlV3huz+6TTqKY9IBw45pMWEl+66Dt3xyAOxtRdJ97udA18f5+J839kV/e4RYm8qL06Hzb3X2z1KactelWWqHiVuAQv+/wzBu/TLHBAp8gY7n9qMpvozlds184FWAGOPfEY7/PtabuQO4KPOw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tK8J0-0006NY-QW; Sat, 07 Dec 2024 22:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#73287] [PATCH v4 2/3] gnu: Add ericw-tools. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 08 Dec 2024 03:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73287@debbugs.gnu.org Cc: James Smith , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 73287-submit@debbugs.gnu.org id=B73287.173362975424426 (code B ref 73287); Sun, 08 Dec 2024 03:50:02 +0000 Received: (at 73287) by debbugs.gnu.org; 8 Dec 2024 03:49:14 +0000 Received: from localhost ([127.0.0.1]:49215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tK8ID-0006Lo-MP for submit@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 ) id 1tK8I8-0006LK-Ir for 73287@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== Date: Sat, 7 Dec 2024 20:48:31 -0700 Message-ID: In-Reply-To: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@disroot.org> References: <1358ec328b7c9a2452e2dd139d8cf203a83d6184.1733629326.git.jsubuntuxp@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches From: James Smith via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: B85615524 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -1.95 X-Spam-Score: -1.95 X-TUID: lo/i0ONLdiI/ * 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 # Copyright © 2024 Noé Lopez # Copyright © 2024 Runciter +# Copyright © 2024 James Smith # # 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 +Date: Mon, 28 Mar 2022 22:05:28 -0700 +Subject: [PATCH] Add check for SSE2 in light.cc (#328) + +--- + light/light.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/light/light.cc b/light/light.cc +index 7e23d040f..c00844643 100644 +--- a/light/light.cc ++++ b/light/light.cc +@@ -33,7 +33,7 @@ + #include + #include + +-#ifdef HAVE_EMBREE ++#if defined(HAVE_EMBREE) && defined (__SSE2__) + #include + //#include + #endif +@@ -255,7 +255,7 @@ LightThread(void *arg) + { + const mbsp_t *bsp = (const mbsp_t *)arg; + +-#ifdef HAVE_EMBREE ++#if defined(HAVE_EMBREE) && defined (__SSE2__) + _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); + // _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); + #endif diff --git a/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch b/gnu/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch new file mode 100644 index 0000000000..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 +Date: Sun, 30 May 2021 23:12:17 -0600 +Subject: [PATCH] gcc 11: pass constant to offsetof + +--- + common/polylib.cc | 5 ++++- + qbsp/util.cc | 5 ++++- + qbsp/winding.cc | 4 +++- + vis/vis.cc | 10 ++++++++-- + 4 files changed, 19 insertions(+), 5 deletions(-) + +diff --git a/common/polylib.cc b/common/polylib.cc +index 6397b3107..c8e1afbff 100644 +--- a/common/polylib.cc ++++ b/common/polylib.cc +@@ -230,7 +230,10 @@ polylib::CopyWinding(const winding_t * w) + int size; + winding_t *c; + +- size = offsetof(winding_t, p[w->numpoints]); ++ //size = offsetof(winding_t, p[w->numpoints]); ++ size = offsetof(winding_t, p[0]); ++ size += w->numpoints * sizeof(w->p[0]); ++ + c = static_cast(malloc(size)); + memcpy(c, w, size); + return c; +diff --git a/qbsp/util.cc b/qbsp/util.cc +index e8baf7205..16c9077f1 100644 +--- a/qbsp/util.cc ++++ b/qbsp/util.cc +@@ -53,7 +53,10 @@ AllocMem(int Type, int cElements, bool fZero) + if (cElements > MAX_POINTS_ON_WINDING) + Error("Too many points (%d) on winding (%s)", cElements, __func__); + +- cSize = offsetof(winding_t, points[cElements]) + sizeof(int); ++ //cSize = offsetof(winding_t, points[cElements]) + sizeof(int); ++ cSize = offsetof(winding_t, points[0]); ++ cSize += cElements * sizeof(static_cast(nullptr)->points[0]); ++ cSize += sizeof(int); + + // Set cElements to 1 so bookkeeping works OK + cElements = 1; +diff --git a/qbsp/winding.cc b/qbsp/winding.cc +index 1af1d096c..6e286c387 100644 +--- a/qbsp/winding.cc ++++ b/qbsp/winding.cc +@@ -106,7 +106,9 @@ CopyWinding(const winding_t *w) + winding_t *c; + + c = (winding_t *)AllocMem(WINDING, w->numpoints, false); +- size = offsetof(winding_t, points[w->numpoints]); ++ //size = offsetof(winding_t, points[w->numpoints]); ++ size = offsetof(winding_t, points[0]); ++ size += w->numpoints * sizeof(w->points[0]); + memcpy(c, w, size); + + return c; +diff --git a/vis/vis.cc b/vis/vis.cc +index 9fb0ea9ea..ec43a8a5f 100644 +--- a/vis/vis.cc ++++ b/vis/vis.cc +@@ -127,7 +127,10 @@ NewWinding(int points) + if (points > MAX_WINDING) + Error("%s: %i points", __func__, points); + +- size = offsetof(winding_t, points[points]); ++ //size = offsetof(winding_t, points[points]); ++ size = offsetof(winding_t, points[0]); ++ size += points * sizeof(w->points[0]); ++ + w = static_cast(malloc(size)); + memset(w, 0, size); + +@@ -178,7 +181,10 @@ CopyWinding(const winding_t * w) + int size; + winding_t *c; + +- size = offsetof(winding_t, points[w->numpoints]); ++ //size = offsetof(winding_t, points[w->numpoints]); ++ size = offsetof(winding_t, points[0]); ++ size += w->numpoints * sizeof(w->points[0]); ++ + c = static_cast(malloc(size)); + memcpy(c, w, size); + return c; -- 2.46.0