diff options
Diffstat (limited to 'meta-multimedia/recipes-multimedia/openal')
4 files changed, 23 insertions, 84 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 deleted file mode 100644 index 2bffd65c6e..0000000000 --- a/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 29217932c34d7e3368764ab64879dc6f1edab1a6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 14 Jan 2019 11:19:44 -0800 -Subject: [PATCH] Use host compiler to compile native tools - -Helps in cross compiling - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1085,11 +1085,10 @@ ELSE() - SET(BIN2H_COMMAND "${NATIVE_BIN_DIR}/bin2h") - SET(BSINCGEN_COMMAND "${NATIVE_BIN_DIR}/bsincgen") - ADD_CUSTOM_COMMAND(OUTPUT "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" -- COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" "${NATIVE_SRC_DIR}" - COMMAND ${CMAKE_COMMAND} -E remove "${BIN2H_COMMAND}" "${BSINCGEN_COMMAND}" -- COMMAND ${CMAKE_COMMAND} --build . --config "Release" -+ COMMAND gcc "${NATIVE_SRC_DIR}/bin2h.c" -o "${BIN2H_COMMAND}" -lm -+ COMMAND gcc "${NATIVE_SRC_DIR}/bsincgen.c" -o "${BSINCGEN_COMMAND}" -lm - WORKING_DIRECTORY "${NATIVE_BIN_DIR}" -- DEPENDS "${NATIVE_SRC_DIR}/CMakeLists.txt" - IMPLICIT_DEPENDS - C "${NATIVE_SRC_DIR}/bin2h.c" - 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 deleted file mode 100644 index 607ddab8d6..0000000000 --- a/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 07ef86e33ed6f7585f0dfaa1732ea17c816655a4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 14 Jan 2019 11:45:42 -0800 -Subject: [PATCH] makehrtf: Disable Wstringop-truncation - -Upstream-Status: Inappropriate [Should be fixed in code] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/makemhr/makemhr.cpp | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/utils/makemhr/makemhr.cpp -+++ b/utils/makemhr/makemhr.cpp -@@ -161,6 +161,7 @@ enum ChannelIndex : uint { - * pattern string are replaced with the replacement string. The result is - * truncated if necessary. - */ -+#pragma GCC diagnostic ignored "-Wstringop-truncation" - static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out) - { - size_t inLen, patLen, repLen; -@@ -199,6 +200,7 @@ static int StrSubst(const char *in, cons - return !truncated; - } - -+#pragma GCC diagnostic pop - - /********************* - *** Math routines *** diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb deleted file mode 100644 index e380a6f385..0000000000 --- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "OpenAL is a cross-platform 3D audio API" -HOMEPAGE = "http://kcat.strangesoft.net/openal.html" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" - -inherit cmake pkgconfig - -SRCREV = "f5e0eef34db3a3ab94b61a2f99f84f078ba947e7" -SRC_URI = "git://github.com/kcat/openal-soft \ - file://0001-Use-BUILD_CC-to-compile-native-tools.patch \ - file://0002-makehrtf-Disable-Wstringop-truncation.patch \ - " - -S = "${WORKDIR}/git" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)}" -PACKAGECONFIG[alsa] = "-DALSA=TRUE, -DALSA=FALSE, alsa-lib" -PACKAGECONFIG[pulseaudio] = "-DPULSEAUDIO=TRUE, -DPULSEAUDIO=FALSE, pulseaudio" -# currently doesn't work with libav-9 -# PKG_CHECK_MODULES(FFMPEG libavcodec>=53.61.100 libavformat>=53.32.100 libavutil>=51.35.100) -# but alffmpeg.c:418:44: error: 'AV_CH_LAYOUT_MONO' undeclared (first use in this function) -PACKAGECONFIG[examples] = "-DEXAMPLES=TRUE, -DEXAMPLES=FALSE, libav" - -FILES:${PN} += "${datadir}/openal" diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.23.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.23.1.bb new file mode 100644 index 0000000000..83745703f5 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.23.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "OpenAL is a cross-platform 3D audio API" +HOMEPAGE = "http://kcat.strangesoft.net/openal.html" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" + +inherit cmake pkgconfig + +DEPENDS = "zlib libsndfile1" + +SRCREV = "d3875f333fb6abe2f39d82caca329414871ae53b" +SRC_URI = "git://github.com/kcat/openal-soft.git;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pipewire pulseaudio', d)}" +PACKAGECONFIG[alsa] = "-DALSOFT_BACKEND_ALSA=ON,-DALSOFT_BACKEND_ALSA=OFF,alsa-lib" +PACKAGECONFIG[oss] = "-DALSOFT_BACKEND_OSS=ON,-DALSOFT_BACKEND_OSS=OFF" +PACKAGECONFIG[pulseaudio] = "-DALSOFT_BACKEND_PULSEAUDIO=ON,-DALSOFT_BACKEND_PULSEAUDIO=OFF,pulseaudio" +PACKAGECONFIG[pipewire] = "-DALSOFT_BACKEND_PIPEWIRE=ON,-DALSOFT_BACKEND_PIPEWIRE=OFF,pipewire" +PACKAGECONFIG[examples] = "-DALSOFT_EXAMPLES=ON,-DALSOFT_EXAMPLES=OFF" +PACKAGECONFIG[sdl2] = "-DALSOFT_BACKEND_SDL2=ON,-DALSOFT_BACKEND_SDL2=OFF,libsdl2 ffmpeg" + +FILES:${PN} += "${datadir}" |