summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch30
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch12
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb (renamed from meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb)3
3 files changed, 20 insertions, 25 deletions
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch b/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch
index 16f123fad8..2bffd65c6e 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch
@@ -13,21 +13,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 CMakeLists.txt | 5 ++--- 13 CMakeLists.txt | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-) 14 1 file changed, 2 insertions(+), 3 deletions(-)
15 15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 39b80250..d6bdf8ed 100644
18--- a/CMakeLists.txt 16--- a/CMakeLists.txt
19+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
20@@ -1288,11 +1288,10 @@ FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}") 18@@ -1085,11 +1085,10 @@ ELSE()
21 SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}bin2h") 19 SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}/bin2h")
22 SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}bsincgen") 20 SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}/bsincgen")
23 ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" 21 ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
24- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}" 22- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}"
25 COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" 23 COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
26- COMMAND ${CMAKE_COMMAND} --build . --config "Release" 24- COMMAND ${CMAKE_COMMAND} --build . --config "Release"
27+ COMMAND gcc "${NATIVE_SRC_DIR}bin2h.c" -o "${BIN2H_COMMAND}" -lm 25+ COMMAND gcc "${NATIVE_SRC_DIR}/bin2h.c" -o "${BIN2H_COMMAND}" -lm
28+ COMMAND gcc "${NATIVE_SRC_DIR}bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm 26+ COMMAND gcc "${NATIVE_SRC_DIR}/bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm
29 WORKING_DIRECTORY "${NATIVE_BIN_DIR}" 27 WORKING_DIRECTORY "${NATIVE_BIN_DIR}"
30- DEPENDS "${NATIVE_SRC_DIR}CMakeLists.txt" 28- DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt"
31 IMPLICIT_DEPENDS C "${NATIVE_SRC_DIR}bin2h.c" 29 IMPLICIT_DEPENDS
32 C "${NATIVE_SRC_DIR}bsincgen.c" 30 C "${NATIVE_SRC_DIR}/bin2h.c"
33 VERBATIM 31 C "${NATIVE_SRC_DIR}/bsincgen.c"
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch b/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch
index 8420386e36..607ddab8d6 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch
@@ -6,14 +6,12 @@ Subject: [PATCH] makehrtf: Disable Wstringop-truncation
6Upstream-Status: Inappropriate [Should be fixed in code] 6Upstream-Status: Inappropriate [Should be fixed in code]
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- 8---
9 utils/makehrtf.c | 2 ++ 9 utils/makemhr/makemhr.cpp | 2 ++
10 1 file changed, 2 insertions(+) 10 1 file changed, 2 insertions(+)
11 11
12diff --git a/utils/makehrtf.c b/utils/makehrtf.c 12--- a/utils/makemhr/makemhr.cpp
13index 0bd36849..0abe4252 100644 13+++ b/utils/makemhr/makemhr.cpp
14--- a/utils/makehrtf.c 14@@ -161,6 +161,7 @@ enum ChannelIndex : uint {
15+++ b/utils/makehrtf.c
16@@ -862,6 +862,7 @@ static int TrReadOperator(TokenReaderT *tr, const char *op)
17 * pattern string are replaced with the replacement string. The result is 15 * pattern string are replaced with the replacement string. The result is
18 * truncated if necessary. 16 * truncated if necessary.
19 */ 17 */
@@ -21,7 +19,7 @@ index 0bd36849..0abe4252 100644
21 static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out) 19 static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out)
22 { 20 {
23 size_t inLen, patLen, repLen; 21 size_t inLen, patLen, repLen;
24@@ -900,6 +901,7 @@ static int StrSubst(const char *in, const char *pat, const char *rep, const size 22@@ -199,6 +200,7 @@ static int StrSubst(const char *in, cons
25 return !truncated; 23 return !truncated;
26 } 24 }
27 25
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb
index a9cdfac8a9..d283cb361b 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e"
5 5
6inherit cmake pkgconfig 6inherit cmake pkgconfig
7 7
8# openal-soft-1.19.1 8SRCREV = "f5e0eef34db3a3ab94b61a2f99f84f078ba947e7"
9SRCREV = "6761218e51699f46bf25c377e65b3e9ea5e434b9"
10SRC_URI = "git://github.com/kcat/openal-soft \ 9SRC_URI = "git://github.com/kcat/openal-soft \
11 file://0001-Use-BUILD_CC-to-compile-native-tools.patch \ 10 file://0001-Use-BUILD_CC-to-compile-native-tools.patch \
12 file://0002-makehrtf-Disable-Wstringop-truncation.patch \ 11 file://0002-makehrtf-Disable-Wstringop-truncation.patch \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-16 19:01:07 +0000