modplug: add patch to remove the deprecated register keyword

MusicPlayerDaemon · Sep 26, 2023 · 101e12c · 101e12c
1 parent f382808
commit 101e12c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/python/build/libs.py b/python/build/libs.py
@@ -111,6 +111,7 @@
     [
         '--disable-shared', '--enable-static',
     ],
+    patches='src/lib/modplug/patches',
 )
 
 libopenmpt = AutotoolsProject(

diff --git a/src/lib/modplug/patches/no_register b/src/lib/modplug/patches/no_register
@@ -0,0 +1,22 @@
+Index: libmodplug-0.8.9.0/src/fastmix.cpp
+===================================================================
+--- libmodplug-0.8.9.0.orig/src/fastmix.cpp
++++ libmodplug-0.8.9.0/src/fastmix.cpp
+@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir;
+ // MIXING MACROS
+ // ----------------------------------------------------------------------------
+ #define SNDMIX_BEGINSAMPLELOOP8\
+-	register MODCHANNEL * const pChn = pChannel;\
++	MODCHANNEL * const pChn = pChannel;\
+ 	nPos = pChn->nPosLo;\
+ 	const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\
+ 	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
+@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir;
+ 	do {
+
+ #define SNDMIX_BEGINSAMPLELOOP16\
+-	register MODCHANNEL * const pChn = pChannel;\
++	MODCHANNEL * const pChn = pChannel;\
+ 	nPos = pChn->nPosLo;\
+ 	const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\
+ 	if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
diff --git a/src/lib/modplug/patches/series b/src/lib/modplug/patches/series
@@ -0,0 +1 @@
+no_register
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,6 +111,7 @@ @@
         [
             '--disable-shared', '--enable-static',
         ],
+        patches='src/lib/modplug/patches',
     )
     libopenmpt = AutotoolsProject(
@@ Expand Down @@