summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-01-14 10:58:04 -0800
committerKhem Raj <raj.khem@gmail.com>2019-01-14 11:53:54 -0800
commit6fc561ce106dfb00631043f274345443d124e6ae (patch)
treea5e1694cd2ca7212c477d14e9bc3659a1127c290 /meta-multimedia
parenteb6cf36865da9e3363479d93b5b5a1085bb8d2fa (diff)
downloadmeta-openembedded-6fc561ce106dfb00631043f274345443d124e6ae.tar.gz
openal-soft: Upgrade to 1.19.1
License-Update: Removed sections that are not needed see https://github.com/kcat/openal-soft/commit/4c61103e34b190c53f0669cb341355d031044571#diff-7116ef0705885343c9e1b2171a06be0e Switch to github for SRC_URI Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch33
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch31
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb (renamed from meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb)15
3 files changed, 74 insertions, 5 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
new file mode 100644
index 000000000..16f123fad
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch
@@ -0,0 +1,33 @@
1From 29217932c34d7e3368764ab64879dc6f1edab1a6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Jan 2019 11:19:44 -0800
4Subject: [PATCH] Use host compiler to compile native tools
5
6Helps in cross compiling
7
8Upstream-Status: Inappropriate [OE-Specific]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 CMakeLists.txt | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 39b80250..d6bdf8ed 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -1288,11 +1288,10 @@ FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}")
21 SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}bin2h")
22 SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}bsincgen")
23 ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
24- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}"
25 COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}"
26- COMMAND ${CMAKE_COMMAND} --build . --config "Release"
27+ COMMAND gcc "${NATIVE_SRC_DIR}bin2h.c" -o "${BIN2H_COMMAND}" -lm
28+ COMMAND gcc "${NATIVE_SRC_DIR}bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm
29 WORKING_DIRECTORY "${NATIVE_BIN_DIR}"
30- DEPENDS "${NATIVE_SRC_DIR}CMakeLists.txt"
31 IMPLICIT_DEPENDS C "${NATIVE_SRC_DIR}bin2h.c"
32 C "${NATIVE_SRC_DIR}bsincgen.c"
33 VERBATIM
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
new file mode 100644
index 000000000..8420386e3
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch
@@ -0,0 +1,31 @@
1From 07ef86e33ed6f7585f0dfaa1732ea17c816655a4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Jan 2019 11:45:42 -0800
4Subject: [PATCH] makehrtf: Disable Wstringop-truncation
5
6Upstream-Status: Inappropriate [Should be fixed in code]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 utils/makehrtf.c | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/utils/makehrtf.c b/utils/makehrtf.c
13index 0bd36849..0abe4252 100644
14--- a/utils/makehrtf.c
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
18 * truncated if necessary.
19 */
20+#pragma GCC diagnostic ignored "-Wstringop-truncation"
21 static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out)
22 {
23 size_t inLen, patLen, repLen;
24@@ -900,6 +901,7 @@ static int StrSubst(const char *in, const char *pat, const char *rep, const size
25 return !truncated;
26 }
27
28+#pragma GCC diagnostic pop
29
30 /*********************
31 *** Math routines ***
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb
index e0f1a26de..a9cdfac8a 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb
@@ -1,13 +1,18 @@
1SUMMARY = "OpenAL is a cross-platform 3D audio API" 1SUMMARY = "OpenAL is a cross-platform 3D audio API"
2HOMEPAGE = "http://kcat.strangesoft.net/openal.html" 2HOMEPAGE = "http://kcat.strangesoft.net/openal.html"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=facc3a8f452930083bbb95d82b989c35" 4LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e"
5 5
6inherit cmake 6inherit cmake pkgconfig
7 7
8SRC_URI = "http://kcat.strangesoft.net/openal-releases/${BP}.tar.bz2" 8# openal-soft-1.19.1
9SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71" 9SRCREV = "6761218e51699f46bf25c377e65b3e9ea5e434b9"
10SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056" 10SRC_URI = "git://github.com/kcat/openal-soft \
11 file://0001-Use-BUILD_CC-to-compile-native-tools.patch \
12 file://0002-makehrtf-Disable-Wstringop-truncation.patch \
13 "
14
15S = "${WORKDIR}/git"
11 16
12PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" 17PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}"
13PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" 18PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib"