Re: [PR PATCH] [Updated] gzdoom: update to version 4.12.1.

[SpidFightFR <SpidFightFR@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 733 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/50022

gzdoom: update to version 4.12.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**



#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/50022.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-50022.patch --]
[-- Type: text/x-diff, Size: 4984 bytes --]

From 7afdaede60168512cbb86c68bb937e395a71e6dc Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight@swisscows.email>
Date: Wed, 24 Apr 2024 20:53:23 +0200
Subject: [PATCH] gzdoom: update to version 4.12.1.

---
 .../patches/gzdoom-musl-fix-build.patch       | 110 ++++++++++++++++++
 srcpkgs/gzdoom/template                       |   8 +-
 2 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/gzdoom/patches/gzdoom-musl-fix-build.patch

diff --git a/srcpkgs/gzdoom/patches/gzdoom-musl-fix-build.patch b/srcpkgs/gzdoom/patches/gzdoom-musl-fix-build.patch
new file mode 100644
index 00000000000000..edbfed395f6ae6
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/gzdoom-musl-fix-build.patch
@@ -0,0 +1,110 @@
+diff --git a/libraries/lzma/C/Threads.c b/libraries/lzma/C/Threads.c
+index cf52bd3..86a5cee 100644
+--- a/libraries/lzma/C/Threads.c
++++ b/libraries/lzma/C/Threads.c
+@@ -67,12 +67,12 @@ WRes Thread_Create(CThread *p, THREAD_FUNC_TYPE func, LPVOID param)
+ 
+   DWORD threadId;
+   *p = CreateThread(NULL, 0, func, param, 0, &threadId);
+-  
++
+   #else
+-  
++
+   unsigned threadId;
+   *p = (HANDLE)(_beginthreadex(NULL, 0, func, param, 0, &threadId));
+-  
++
+   #endif
+ 
+   /* maybe we must use errno here, but probably GetLastError() is also OK. */
+@@ -86,9 +86,9 @@ WRes Thread_Create_With_Affinity(CThread *p, THREAD_FUNC_TYPE func, LPVOID param
+ 
+   UNUSED_VAR(affinity)
+   return Thread_Create(p, func, param);
+-  
++
+   #else
+-  
++
+   /* Windows Me/98/95: threadId parameter may not be NULL in _beginthreadex/CreateThread functions */
+   HANDLE h;
+   WRes wres;
+@@ -245,7 +245,7 @@ WRes Thread_Create_With_CpuSet(CThread *p, THREAD_FUNC_TYPE func, LPVOID param,
+     if (cpuSet)
+     {
+       #ifdef Z7_AFFINITY_SUPPORTED
+-      
++
+       /*
+       printf("\n affinity :");
+       unsigned i;
+@@ -265,13 +265,13 @@ WRes Thread_Create_With_CpuSet(CThread *p, THREAD_FUNC_TYPE func, LPVOID param,
+       */
+ 
+       // ret2 =
+-      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
++      pthread_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
+       // if (ret2) ret = ret2;
+       #endif
+     }
+-    
++
+     ret = pthread_create(&p->_tid, &attr, func, param);
+-    
++
+     if (!ret)
+     {
+       p->_created = 1;
+@@ -324,7 +324,7 @@ WRes Thread_Close(CThread *p)
+   int ret;
+   if (!p->_created)
+     return 0;
+-    
++
+   ret = pthread_detach(p->_tid);
+   p->_tid = 0;
+   p->_created = 0;
+@@ -384,7 +384,7 @@ WRes Event_Reset(CEvent *p)
+   p->_state = False;
+   return pthread_mutex_unlock(&p->_mutex);
+ }
+- 
++
+ WRes Event_Wait(CEvent *p)
+ {
+   RINOK(pthread_mutex_lock(&p->_mutex))
+diff --git a/libraries/lzma/C/Threads.h b/libraries/lzma/C/Threads.h
+index 4028464..86b0687 100644
+--- a/libraries/lzma/C/Threads.h
++++ b/libraries/lzma/C/Threads.h
+@@ -4,6 +4,10 @@
+ #ifndef ZIP7_INC_THREADS_H
+ #define ZIP7_INC_THREADS_H
+ 
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE /* Required for musl to expose cpu_set_t */
++#endif
++
+ #ifdef _WIN32
+ #include "7zWindows.h"
+ 
+@@ -108,15 +112,15 @@ typedef UInt64 CCpuSet;
+    But only root function main() contains instructions that
+    set 16-byte alignment for stack pointer. And another functions
+    just keep alignment, if it was set in some parent function.
+-   
++
+    The problem:
+     if we create new thread in MinGW (GCC) 32-bit x86 via _beginthreadex() or CreateThread(),
+        the root function of thread doesn't set 16-byte alignment.
+        And stack frames in all child functions also will be unaligned in that case.
+-   
++
+    Here we set (force_align_arg_pointer) attribute for root function of new thread.
+    Do we need (force_align_arg_pointer) also for another systems?  */
+-  
++
+   #define THREAD_FUNC_ATTRIB_ALIGN_ARG __attribute__((force_align_arg_pointer))
+   // #define THREAD_FUNC_ATTRIB_ALIGN_ARG // for debug : bad alignment in SSE functions
+ #else
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 04384125d64029..b8745bc9ed785b 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,7 +1,7 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.11.3
-revision=2
+version=4.12.2
+revision=1
 archs="x86_64* aarch64*"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
@@ -14,8 +14,8 @@ homepage="https://www.zdoom.org"
 # WARNING: watch out for new submodules
 distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz
  https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb"
-checksum="5943dba50da20ff94f1fcc415132672d42a15917c571b1c2b7ceefe14935f5d5
- 4c544d243dc15fc22000a3b6eabd83fd70f87ea63205a14ff04254c092f74642"
+checksum="864c5a1ec976dd6068f9cd93f92c5404c662824996101f1411ddb25a54afc732
+ c173bcbf8a3e6a4885b6f5d75173160af3a2344c290bc342a3542dcc0a283475"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes