summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-17 11:34:42 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-21 10:02:01 -0800
commit2d21f07004d9455fec12db6b44435395bffa7099 (patch)
tree6a7b00d68db07e21fc21d39eaa9a055ef8ad764c /meta-oe/recipes-multimedia
parentceceffcb1e3ef4f9ba7708f77c27e30a7aea61e5 (diff)
downloadmeta-openembedded-2d21f07004d9455fec12db6b44435395bffa7099.tar.gz
libmodplug: Fix build with c++17
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch38
-rw-r--r--meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb5
2 files changed, 41 insertions, 2 deletions
diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch
new file mode 100644
index 000000000..dfdaf810d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch
@@ -0,0 +1,38 @@
1From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 Jan 2023 11:32:59 -0800
4Subject: [PATCH] fastmix: Drop 'register' storage class keyword
5
6It has been dropped from laters C/C++ standards ( c++17 and newer )
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/fastmix.cpp | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/fastmix.cpp b/src/fastmix.cpp
15index d693d20..aa51c4a 100644
16--- a/src/fastmix.cpp
17+++ b/src/fastmix.cpp
18@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir;
19 // MIXING MACROS
20 // ----------------------------------------------------------------------------
21 #define SNDMIX_BEGINSAMPLELOOP8\
22- register MODCHANNEL * const pChn = pChannel;\
23+ MODCHANNEL * const pChn = pChannel;\
24 nPos = pChn->nPosLo;\
25 const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\
26 if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
27@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir;
28 do {
29
30 #define SNDMIX_BEGINSAMPLELOOP16\
31- register MODCHANNEL * const pChn = pChannel;\
32+ MODCHANNEL * const pChn = pChannel;\
33 nPos = pChn->nPosLo;\
34 const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\
35 if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\
36--
372.39.0
38
diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb
index 144c737e7..e04e76377 100644
--- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb
+++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb
@@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net"
4LICENSE = "PD" 4LICENSE = "PD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" 5LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" 7SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \
8SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" 8 file://0001-fastmix-Drop-register-storage-class-keyword.patch"
9
9SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" 10SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de"
10 11
11inherit autotools pkgconfig 12inherit autotools pkgconfig