Sfoglia il codice sorgente

openal-soft: Update to 1.20.1

Forward port patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj 3 anni fa
parent
commit
a27caa2069

+ 14 - 16
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>
  CMakeLists.txt | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b80250..d6bdf8ed 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1288,11 +1288,10 @@ FILE(MAKE_DIRECTORY "${NATIVE_BIN_DIR}")
- 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"
-     VERBATIM
+@@ -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"

+ 5 - 7
meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch

@@ -6,14 +6,12 @@ Subject: [PATCH] makehrtf: Disable Wstringop-truncation
 Upstream-Status: Inappropriate [Should be fixed in code]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- utils/makehrtf.c | 2 ++
+ utils/makemhr/makemhr.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/utils/makehrtf.c b/utils/makehrtf.c
-index 0bd36849..0abe4252 100644
---- a/utils/makehrtf.c
-+++ b/utils/makehrtf.c
-@@ -862,6 +862,7 @@ static int TrReadOperator(TokenReaderT *tr, const char *op)
+--- 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.
   */
@@ -21,7 +19,7 @@ index 0bd36849..0abe4252 100644
  static int StrSubst(const char *in, const char *pat, const char *rep, const size_t maxLen, char *out)
  {
      size_t inLen, patLen, repLen;
-@@ -900,6 +901,7 @@ static int StrSubst(const char *in, const char *pat, const char *rep, const size
+@@ -199,6 +200,7 @@ static int StrSubst(const char *in, cons
      return !truncated;
  }
  

+ 1 - 2
meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb → meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb

@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e"
 
 inherit cmake pkgconfig
 
-# openal-soft-1.19.1
-SRCREV = "6761218e51699f46bf25c377e65b3e9ea5e434b9"
+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 \