summaryrefslogtreecommitdiff
path: root/games-fps/gzdoom
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2025-03-10 01:49:12 +0000
committerV3n3RiX <venerix@koprulu.sector>2025-03-10 01:49:12 +0000
commit7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 (patch)
tree5cd412784dc4fb63a7f56eb252196ed9dd6980c4 /games-fps/gzdoom
parent0b832a429ecd6081aa9faa0eb262303b019d87ea (diff)
gentoo auto-resync : 10:03:2025 - 01:49:12
Diffstat (limited to 'games-fps/gzdoom')
-rw-r--r--games-fps/gzdoom/Manifest7
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch14
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch106
-rw-r--r--games-fps/gzdoom/files/gzdoom-4.14.1-gcc15.patch196
-rw-r--r--games-fps/gzdoom/gzdoom-4.14.1.ebuild (renamed from games-fps/gzdoom/gzdoom-4.10.0.ebuild)21
5 files changed, 214 insertions, 130 deletions
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index 394afb4ef929..d6734d544891 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,8 +1,7 @@
-AUX gzdoom-4.10.0-gcc-13.patch 497 BLAKE2B 400f439c3ae4e956e205357051edeb23732db9a8d43e72e8dd6f38900869f3f10d720bec6b0077f8e7a9567d7f8bd6c5204d405302802cde6bb41ecf3e36804c SHA512 22e11299121fd0f74e5b5e09c1530e3e158f50fb49402715a92397b3fdcb7d9944ce41f30efbbe8b98c57939c067f4689b7e96ddacf17d0da72059829d5f5e29
-AUX gzdoom-4.10.0-headers.patch 3999 BLAKE2B 88a024fee77f89d4a58c29b51617f2f28ba8abc914b319bf0dfbbcc6e44dbc34a3af1d79f9196b9b3dad1a72ddbad4dfde879761728aef404b9138da712a4f60 SHA512 175d6ca534e2e8e934c385b399067a55055bb5de7162a3e1e01f396c7a97c229aabddc9bde133df6db9f2ccf53eb59afc823abfb0f749cd9705429fd13cca50b
+AUX gzdoom-4.14.1-gcc15.patch 6423 BLAKE2B c4aceb83fc46bfcdabf0a91ba19d2631b942e54ab9645e3e24edd5942e348da56bbd91b33c18da5f5cef3022e8734457fe4992af3d8ab4e9e71947ee53c3cfa9 SHA512 0acb128fccc62ca1acde81b932a351bff69085e6fe957f538cd6a02931cdd66de80a8a6c06d50fc3e0e0a93b6b9f464f37992fa81fbd9778b08ea1bc5660fc26
AUX gzdoom-4.7.1-Introduce-the-BUILD_NONFREE-option.patch 1209 BLAKE2B b3cf80ab4d6328dbcb14ceb9514883ed58b8086dab02182f4cf8964140095dd8d6ac0503c68a4c7442c0f9cc92b4bb6b3e084eee026be52842413e15118a13be SHA512 a08c29fe6b867dbbe60035c99c31d1bce73c1ff37ca2c15f659e060b77366f6fcdc11d2319dee3331d9874115e92566b9c0a6364604869f3815fbb0ee7179ef6
-DIST gzdoom-4.10.0.tar.gz 24319337 BLAKE2B a683182ed1bb091d19cff127352068faa846f0a10bc0ade07f8277dca7a5367d0bc19d2828c485fba11cefdb47aa8d99224bb8babbebe3df0b99a6fde577a586 SHA512 fd2f6e34aaa59e3d153de6359211082398878dae3d396ab55fc736f94e1378d5e03193d7912a29a531cf1dc255d30af63ad1c6472784e3745db6ac4a3a9e6fe6
DIST gzdoom-4.12.2.tar.gz 25910359 BLAKE2B 3f456136cfc161d67451d8bf1f359d748d6f30f4461a3bff4ab6b02fd949e4057dcbee79eae9ebc0566e33d2f1f3f42add18417b1932e3bccf8b4d5cae9b9a38 SHA512 1e9f34af0d5bf9f3797e0cfef01f993c0b8a742ba0af53b4b13cbce9ecefa15f22949bdbbba5a09e890a01dc32af81806fcb6fc632e0dc9261494580782a5007
-EBUILD gzdoom-4.10.0.ebuild 2355 BLAKE2B 4d237936d3d12190d88ae9fbd7702c64f31f5de2d102948e7e1dfe347fd946c901d3b055029ac4f0259d61b64888c05c701ecde7f10cffbb936d49162f87a077 SHA512 3091b6292884ca3c6ad4695caf4d371dc40c87b5b9c07525f897ba6776800156629a116086807c0e461a83c8de22b6edbb7de558eb02a70a2ca0c68c49375a3e
+DIST gzdoom-4.14.1.tar.gz 25970736 BLAKE2B 49012b47288d6d4ad0806abb6b33ed2a9dbb3fffbf65135b4c37f6c7d48bf7943a81a718ab91b787b07e4d0a42853e2a21c8a3c05693e7979d42bf812a46d864 SHA512 43589366d3311ca55e595852c526eeaf24a89decb7a029ddc4363019a61459a8da7d5ca43f1edffe9bfd44189af40fec40351857956d78b57d8db920a1a84a92
EBUILD gzdoom-4.12.2.ebuild 2613 BLAKE2B 71326da1906a6c312e435b6b81dcb80d1f96de78b316582949edeeb69e49e30585c7a6cbd5e35d21535b00f677833e815bb17399a048f4a5fa09cfd7c88ff26a SHA512 beff2706f83a38fe27f01ee37e985fe192440fd1c5cacb8af800ae15013b73ffb5b09cea84bf2dadafb034fd91247cbf9275c04180faeafb665d708ce916ffc4
+EBUILD gzdoom-4.14.1.ebuild 2654 BLAKE2B c2804dfd1089eb03bf8338d2fd6cd8ba87ccfbef50bdaa4ec095042eaecb649bc9f906eabac76e73e0ecd557e11fbe1c20cfb84322a85aa26fea451ca681cff7 SHA512 26678701ced25e2fab6375f631c6bca286a6485a2161f8d91df612aeaf89e46102813692fe9980df3c1c403989b1feb8a21e96283b1c1c4a5a937ace4f0282e6
MISC metadata.xml 563 BLAKE2B e1688f34f4ba3697d48e93ef55115ff980b6655aa8bc46945fa8067556814c0d36a6e5ec9c599fdab86d216bf2d8a42f41bd7e304410ce08e1a393ae4c053fa9 SHA512 1f4759bbe4cd9208ebc1385f2cbe302774260ffff34fd2e1c2318a5a2950793f0daa0e5698b4846fb36fce818897d964408d610a445dc83a37ecf37416b65545
diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
deleted file mode 100644
index d34cb749e7f5..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.10.0-gcc-13.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/907087
-
-diff --git a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-index fd44722..7189d0e 100644
---- a/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-+++ b/src/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
-@@ -20,6 +20,8 @@
- // THE SOFTWARE.
- //
-
-+#include <cstdio>
-+
- #ifndef AMD_VULKAN_MEMORY_ALLOCATOR_H
- #define AMD_VULKAN_MEMORY_ALLOCATOR_H
diff --git a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch b/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
deleted file mode 100644
index 3a3a153b5a6e..000000000000
--- a/games-fps/gzdoom/files/gzdoom-4.10.0-headers.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From b95dbaf914618cccaeaa95c650e02be669e477f8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 1 Jul 2023 13:36:48 +0100
-Subject: [PATCH] Ensure local headers are used over system headers to avoid
- breakage
-
-types.h was being picked up from webp rather than locally due to the
-`include_directories` call for GTK (and therefore its -I arguments)
-coming before the same call for the local sources. webp can be pulled in
-via GTK -> gdk-pixbuf -> tiff -> webp.
-
-This can be avoided by specifying `SYSTEM` or `BEFORE` as appropriate
-when calling `include_directories`. I have done both for good measure.
----
- src/CMakeLists.txt | 18 ++++++++++--------
- tools/zipdir/CMakeLists.txt | 2 +-
- 2 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index cf254ad6a..b4d06f9ce 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -97,7 +97,7 @@ else()
- if( NOT DYN_GTK )
- set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK3_LIBRARIES} )
- endif()
-- include_directories( ${GTK3_INCLUDE_DIRS} )
-+ include_directories( SYSTEM ${GTK3_INCLUDE_DIRS} )
- link_directories( ${GTK3_LIBRARY_DIRS} )
- else()
- pkg_check_modules( GTK2 gtk+-2.0 )
-@@ -105,7 +105,7 @@ else()
- if( NOT DYN_GTK )
- set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${GTK2_LIBRARIES} )
- endif()
-- include_directories( ${GTK2_INCLUDE_DIRS} )
-+ include_directories( SYSTEM ${GTK2_INCLUDE_DIRS} )
- link_directories( ${GTK2_LIBRARY_DIRS} )
- else()
- set( NO_GTK ON )
-@@ -132,7 +132,7 @@ else()
- # Non-Windows version also needs SDL except native OS X backend
- if( NOT APPLE OR NOT OSX_COCOA_BACKEND )
- find_package( SDL2 REQUIRED )
-- include_directories( "${SDL2_INCLUDE_DIR}" )
-+ include_directories( SYSTEM "${SDL2_INCLUDE_DIR}" )
- set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${SDL2_LIBRARY}" )
- endif()
-
-@@ -143,7 +143,7 @@ if( NOT NO_OPENAL )
- find_package( OpenAL )
- mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR)
- if( OPENAL_INCLUDE_DIR )
-- include_directories( ${OPENAL_INCLUDE_DIR} )
-+ include_directories( SYSTEM ${OPENAL_INCLUDE_DIR} )
- mark_as_advanced(CLEAR OPENAL_LIBRARY)
- if( OPENAL_LIBRARY )
- set( PROJECT_LIBRARIES ${OPENAL_LIBRARY} ${PROJECT_LIBRARIES} )
-@@ -373,17 +373,17 @@ endif()
-
- if( VPX_FOUND )
- add_definitions( "-DUSE_LIBVPX=1" )
-- include_directories( "${VPX_INCLUDE_DIR}" )
-+ include_directories( SYSTEM "${VPX_INCLUDE_DIR}" )
- set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${VPX_LIBRARIES} )
- else()
- message( SEND_ERROR "Could not find libvpx" )
- endif()
-
--include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
-+include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}")
-
- if( ${HAVE_VM_JIT} )
- add_definitions( -DHAVE_VM_JIT )
-- include_directories( "${ASMJIT_INCLUDE_DIR}" )
-+ include_directories( SYSTEM "${ASMJIT_INCLUDE_DIR}" )
- set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ASMJIT_LIBRARIES}")
- endif()
-
-@@ -1243,7 +1243,9 @@ endif()
-
- target_link_libraries( zdoom ${PROJECT_LIBRARIES} gdtoa lzma ${ZMUSIC_LIBRARIES} )
-
--include_directories( .
-+include_directories(
-+ BEFORE
-+ .
- common/audio/sound
- common/audio/music
- common/2d
-diff --git a/tools/zipdir/CMakeLists.txt b/tools/zipdir/CMakeLists.txt
-index 65eb2fb72..762d9027f 100644
---- a/tools/zipdir/CMakeLists.txt
-+++ b/tools/zipdir/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required( VERSION 3.1.0 )
-
- if( NOT CMAKE_CROSSCOMPILING )
-- include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
-+ include_directories( SYSTEM "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
- add_executable( zipdir
- zipdir.c )
- target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
---
-2.41.0
-
diff --git a/games-fps/gzdoom/files/gzdoom-4.14.1-gcc15.patch b/games-fps/gzdoom/files/gzdoom-4.14.1-gcc15.patch
new file mode 100644
index 000000000000..249192208f5f
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.14.1-gcc15.patch
@@ -0,0 +1,196 @@
+From 71f121fe54b16f1e4b3022825dcda3cddc12e6cb Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 9 Mar 2025 12:34:44 +0000
+Subject: [PATCH] Fix building with GCC 15
+
+---
+ libraries/ZWidget/include/zwidget/window/window.h | 1 +
+ src/common/utility/r_memory.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/libraries/ZWidget/include/zwidget/window/window.h b/libraries/ZWidget/include/zwidget/window/window.h
+index 0539f773f..4cdb748d8 100644
+--- a/libraries/ZWidget/include/zwidget/window/window.h
++++ b/libraries/ZWidget/include/zwidget/window/window.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <functional>
+diff --git a/src/common/utility/r_memory.h b/src/common/utility/r_memory.h
+index d9db538ca..41abe0be5 100644
+--- a/src/common/utility/r_memory.h
++++ b/src/common/utility/r_memory.h
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+
+--
+2.48.1
+
+From 4e0e0db076d661695ae4051c06f4a784757e1db3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= <ricolvs123@gmail.com>
+Date: Sun, 9 Mar 2025 16:54:41 -0300
+Subject: [PATCH 1/2] remove K&R C function declaration bullshit from lemon.c
+
+should be enough to fix GCC15 compilation without fucking up size_t/etc
+---
+ tools/lemon/lemon.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c
+index bdc004a17db..e5fd16905a6 100644
+--- a/tools/lemon/lemon.c
++++ b/tools/lemon/lemon.c
+@@ -53,7 +53,7 @@ extern int access(char *path, int mode);
+ #endif
+
+ static int showPrecedenceConflict = 0;
+-static void *msort(void *list, void *next, int (*cmp)());
++static void *msort(void *list, void *next, int (*cmp)(void*, void*));
+
+ /*
+ ** Compilers are getting increasingly pedantic about type conversions
+@@ -359,7 +359,7 @@ struct symbol **Symbol_arrayof(void);
+
+ /* Routines to manage the state table */
+
+-int Configcmp(const char *, const char *);
++int Configcmp(void *, void *);
+ struct state *State_new(void);
+ void State_init(void);
+ int State_insert(struct state *, struct config *);
+@@ -403,10 +403,10 @@ static struct action *Action_new(void){
+ ** positive if the first action is less than, equal to, or greater than
+ ** the first
+ */
+-static int actioncmp(ap1,ap2)
+-struct action *ap1;
+-struct action *ap2;
++static int actioncmp(void *_ap1,void *_ap2)
+ {
++ struct action * ap1 = (struct action *)_ap1;
++ struct action * ap2 = (struct action *)_ap2;
+ int rc;
+ rc = ap1->sp->index - ap2->sp->index;
+ if( rc==0 ){
+@@ -1757,9 +1757,9 @@ int main(int argc, char **argv)
+ ** The "next" pointers for elements in the lists a and b are
+ ** changed.
+ */
+-static void *merge(void *a,void *b,int (*cmp)(),size_t offset)
++static void *merge(void *a,void *b,int (*cmp)(void *a, void *b),size_t offset)
+ {
+- char *ptr, *head;
++ void *ptr, *head;
+
+ if( a==0 ){
+ head = b;
+@@ -1805,11 +1805,11 @@ static void *merge(void *a,void *b,int (*cmp)(),size_t offset)
+ ** The "next" pointers for elements in list are changed.
+ */
+ #define LISTSIZE 30
+-static void *msort(void *list,void *next,int (*cmp)())
++static void *msort(void *list,void *next,int (*cmp)(void*, void*))
+ {
+ size_t offset;
+- char *ep;
+- char *set[LISTSIZE];
++ void *ep;
++ void *set[LISTSIZE];
+ int i;
+ offset = (size_t)next - (size_t)list;
+ for(i=0; i<LISTSIZE; i++) set[i] = 0;
+@@ -2714,9 +2714,7 @@ static void preprocess_input(char *z){
+ }
+ }
+
+-int strip_crlf(filebuf, filesize)
+-char *filebuf;
+-int filesize;
++int strip_crlf(char *filebuf, int filesize)
+ {
+ int i, j;
+
+@@ -5136,10 +5134,10 @@ struct symbol **Symbol_arrayof()
+ }
+
+ /* Compare two configurations */
+-int Configcmp(const char *_a,const char *_b)
++int Configcmp(void *_a,void *_b)
+ {
+- const struct config *a = (struct config *) _a;
+- const struct config *b = (struct config *) _b;
++ const struct config *a = (const struct config *) _a;
++ const struct config *b = (const struct config *) _b;
+ int x;
+ x = a->rp->index - b->rp->index;
+ if( x==0 ) x = a->dot - b->dot;
+@@ -5147,8 +5145,10 @@ int Configcmp(const char *_a,const char *_b)
+ }
+
+ /* Compare two states */
+-PRIVATE int statecmp(struct config *a, struct config *b)
++PRIVATE int statecmp(void *_a, void *_b)
+ {
++ const struct config *a = (const struct config *) _a;
++ const struct config *b = (const struct config *) _b;
+ int rc;
+ for(rc=0; rc==0 && a && b; a=a->bp, b=b->bp){
+ rc = a->rp->index - b->rp->index;
+@@ -5377,7 +5377,7 @@ int Configtable_insert(struct config *data)
+ h = ph & (x4a->size-1);
+ np = x4a->ht[h];
+ while( np ){
+- if( Configcmp((const char *) np->data,(const char *) data)==0 ){
++ if( Configcmp(np->data, data)==0 ){
+ /* An existing entry with the same key is found. */
+ /* Fail because overwrite is not allows. */
+ return 0;
+@@ -5430,7 +5430,7 @@ struct config *Configtable_find(struct config *key)
+ h = confighash(key) & (x4a->size-1);
+ np = x4a->ht[h];
+ while( np ){
+- if( Configcmp((const char *) np->data,(const char *) key)==0 ) break;
++ if( Configcmp(np->data,key)==0 ) break;
+ np = np->next;
+ }
+ return np ? np->data : 0;
+
+From c9d21a11be721e69b9180b97b203b1fa25324c59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= <ricolvs123@gmail.com>
+Date: Sun, 9 Mar 2025 16:57:28 -0300
+Subject: [PATCH 2/2] fix non-void forward declarations as well
+
+---
+ tools/lemon/lemon.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/lemon/lemon.c b/tools/lemon/lemon.c
+index e5fd16905a6..45f458d726f 100644
+--- a/tools/lemon/lemon.c
++++ b/tools/lemon/lemon.c
+@@ -72,12 +72,12 @@ static struct action *Action_new(void);
+ static struct action *Action_sort(struct action *);
+
+ /********** From the file "build.h" ************************************/
+-void FindRulePrecedences();
+-void FindFirstSets();
+-void FindStates();
+-void FindLinks();
+-void FindFollowSets();
+-void FindActions();
++void FindRulePrecedences(struct lemon *xp);
++void FindFirstSets(struct lemon *lemp);
++void FindStates(struct lemon *lemp);
++void FindLinks(struct lemon *lemp);
++void FindFollowSets(struct lemon *lemp);
++void FindActions(struct lemon *lemp);
+
+ /********* From the file "configlist.h" *********************************/
+ void Configlist_init(void);
diff --git a/games-fps/gzdoom/gzdoom-4.10.0.ebuild b/games-fps/gzdoom/gzdoom-4.14.1.ebuild
index 0d69df1faeac..291411d90842 100644
--- a/games-fps/gzdoom/gzdoom-4.10.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,6 +8,7 @@ inherit cmake desktop xdg flag-o-matic
DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
HOMEPAGE="https://zdoom.org"
SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-g${PV}"
LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
@@ -20,18 +21,16 @@ DEPEND="
media-libs/libjpeg-turbo:0=
media-libs/libsdl2[gles2?,opengl,vulkan?]
media-libs/libvpx:=
+ media-libs/libwebp
media-libs/openal
- media-libs/zmusic
+ >=media-libs/zmusic-1.1.14
sys-libs/zlib
gtk? ( x11-libs/gtk+:3 )"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-g${PV}"
-
PATCHES=(
"${FILESDIR}"/${PN}-4.7.1-Introduce-the-BUILD_NONFREE-option.patch
- "${FILESDIR}"/${P}-gcc-13.patch
- "${FILESDIR}"/${P}-headers.patch
+ "${FILESDIR}"/${P}-gcc15.patch
)
src_prepare() {
@@ -41,6 +40,16 @@ src_prepare() {
rm -rf wadsrc_bm wadsrc_extra wadsrc_widepix || die
fi
+ {
+ echo "// 0"
+ echo "// The above line prevents UpdateRevision.cmake from replacing this file."
+ echo "// This file was generated by the Gentoo ebuild."
+ echo
+ echo "#define GIT_DESCRIPTION \"g${PV}\""
+ echo "#define GIT_HASH \"0\""
+ echo "#define GIT_TIME \"\""
+ } > "${S}/src/gitinfo.h" || die
+
cmake_src_prepare
}