openal-soft: Update to 1.20.1
PATCH 1/4 openal-soft: Update to 1.20.1
Forward port patches
Signed-off-by Khem Raj <[email protected]>
---
...Use-BUILD_CC-to-compile-native-tools.patch | 30 +++++++++----------
...akehrtf-Disable-Wstringop-truncation.patch | 12 ++++----
...l-soft_1.19.1.bb => openal-soft_1.20.1.bb} | 3 +-
3 files changed, 20 insertions(+), 25 deletions(-)
rename meta-multimedia/recipes-multimedia/openal/{openal-soft_1.19.1.bb => openal-soft_1.20.1.bb} (93%)meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch +14 -16
@@ -13,21 +13,19 @@ Signed-off-by: Khem Raj <[email protected]> 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"
meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch +5 -7
@@ -6,14 +6,12 @@ Subject: [PATCH] makehrtf: Disable Wstringop-truncation Upstream-Status: Inappropriate [Should be fixed in code] Signed-off-by: Khem Raj <[email protected]> --- - 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; }
meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb renamed from meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb +1 -2
@@ -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 \
Signature · 1 line
2.28.0
PATCH 2/4 mimic: Upgrade to 1.3.0.1
Add a patch to fix build with -fno-common
Backport a patch to fix build with musl
Signed-off-by Khem Raj <[email protected]>
---
.../mimic/0001-Fix-musl-compatibility.patch | 30 +++++++++++++++++++
...ake-cst_rx_not_indic-as-extern-decla.patch | 29 ++++++++++++++++++
.../{mimic_1.2.0.2.bb => mimic_1.3.0.1.bb} | 11 ++++---
3 files changed, 66 insertions(+), 4 deletions(-)
create mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch
create mode 100644 meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch
rename meta-multimedia/recipes-multimedia/mimic/{mimic_1.2.0.2.bb => mimic_1.3.0.1.bb} (67%)meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch new file +30 -0
@@ -0,0 +1,30 @@ +From d7d00ec681dc430192cf2192b3de7b7c30c4753d Mon Sep 17 00:00:00 2001 +From: Bart Ribbers <[email protected]> +Date: Sat, 9 May 2020 11:42:32 +0200 +Subject: [PATCH] Fix musl compatibility + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Backport [https://github.com/MycroftAI/mimic1/commit/5282ff075091c3d1a635fb20f2b8a35a377f4b42.patch] +--- + src/hts/hts_engine_API/lib/HTS_misc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/hts/hts_engine_API/lib/HTS_misc.c b/src/hts/hts_engine_API/lib/HTS_misc.c +index 72306cb..afcaaec 100644 +--- a/src/hts/hts_engine_API/lib/HTS_misc.c ++++ b/src/hts/hts_engine_API/lib/HTS_misc.c +@@ -247,8 +247,10 @@ size_t HTS_ftell(HTS_File * fp) + fgetpos((FILE *) fp->pointer, &pos); + #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) + return (size_t) pos; +-#else ++#elif defined(__GLIBC__) + return (size_t) pos.__pos; ++#else ++ return (size_t) ftell(fp->pointer); + #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ + } else if (fp->type == HTS_DATA) { + HTS_Data *d = (HTS_Data *) fp->pointer; +-- +2.28.0 +
meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 7d38a72f9ae14a2416f7a78e28152aa33685aec7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Aug 2020 16:47:27 -0700 +Subject: [PATCH] cmu_indic_lang: Make cst_rx_not_indic as extern declaration + +Fixes build with gcc-10 which has -fno-common turned on by default + +Upstream-Status: Submitted [https://github.com/MycroftAI/mimic1/pull/211] +Signed-off-by: Khem Raj <[email protected]> +--- + lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h +index 75ee46c..83e2afa 100644 +--- a/lang/cmu_indic_lang/cmu_indic_lang.h ++++ b/lang/cmu_indic_lang/cmu_indic_lang.h +@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); + extern const cst_phoneset cmu_indic_phoneset; + extern const cst_cart cmu_indic_phrasing_cart; + +-const cst_regex * const cst_rx_not_indic; ++extern const cst_regex * const cst_rx_not_indic; + + #ifdef __cplusplus + } /* extern "C" */ +-- +2.28.0 +
meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb renamed from meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb +7 -4
@@ -15,12 +15,15 @@ LICENSE = "MIT-X & \ BellBird & \ Apache-2.0 \ " -LIC_FILES_CHKSUM = "file://COPYING;md5=416ef1ca5167707fe381d7be33664a33" +LIC_FILES_CHKSUM = "file://COPYING;md5=a2c2c7371b58b9cdeae0dc68846fe9f1" -DEPENDS = "curl-native icu" +DEPENDS = "curl-native libpcre2" -SRCREV = "67e43bf0fa56008276b878ec3790aa5f32eb2a16" -SRC_URI = "git://github.com/MycroftAI/mimic.git" +SRCREV = "adf655da0399530ac1b586590257847eb61be232" +SRC_URI = "git://github.com/MycroftAI/mimic1.git \ + file://0001-Fix-musl-compatibility.patch \ + file://0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch \ + " inherit autotools
Signature · 1 line
2.28.0
PATCH 3/4 minidlna: Fix build with -fno-common
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- .../recipes-multimedia/minidlna/minidlna.inc | 1 + ...ark-setjmp_buffer-extern-declaration.patch | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch
meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna.service \ file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ + file://0001-Mark-setjmp_buffer-extern-declaration.patch \ " S = "${WORKDIR}/git"
meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Aug 2020 18:10:54 -0700 +Subject: [PATCH] Mark setjmp_buffer extern declaration + +Fixes build with -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + metadata.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/metadata.c b/metadata.c +index 8a10c77..c114091 100644 +--- a/metadata.c ++++ b/metadata.c +@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name) + } + + /* For libjpeg error handling */ +-jmp_buf setjmp_buffer; ++extern jmp_buf setjmp_buffer; + static void + libjpeg_error_handler(j_common_ptr cinfo) + { +-- +2.28.0 +
Signature · 1 line
2.28.0
PATCH 4/4 tvheadend: Update to latest tip
In reply to Khem RajDrop 0001-allocate-space-for-buf-on-heap.patch this is already fixed upstream
Signed-off-by Khem Raj <[email protected]>
--- .../0001-allocate-space-for-buf-on-heap.patch | 46 ------------------- .../recipes-dvb/tvheadend/tvheadend_git.bb | 3 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch
meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch deleted +0 -46
@@ -1,46 +0,0 @@ -From d4a405f87fc215c14e610a25b5a6b14060c1ef15 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 25 Dec 2019 13:53:52 -0800 -Subject: [PATCH] allocate space for buf on heap - -Avoids -| src/epggrab/module/xmltv.c:204:47: error: '%s' directive output may be truncated writing between 2 and 2147483645 bytes into a region of size 115 [-Werror=format-truncation=] -| 204 | snprintf(buf, sizeof(buf)-1, "ddprogid://%s/%s", mod->id, s); -| | ^~ - -Upstream-Status: Submitted [https://github.com/tvheadend/tvheadend/pull/1324] -Signed-off-by: Khem Raj <[email protected]> ---- - src/epggrab/module/xmltv.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/epggrab/module/xmltv.c b/src/epggrab/module/xmltv.c -index 34ab05bdb..b1a956614 100644 ---- a/src/epggrab/module/xmltv.c -+++ b/src/epggrab/module/xmltv.c -@@ -197,11 +197,12 @@ static void parse_xmltv_dd_progid - (epggrab_module_t *mod, const char *s, char **uri, char **suri, - epg_episode_num_t *epnum) - { -- char buf[128]; - if (strlen(s) < 2) return; - -+ char* buf = (char *)malloc(strlen(s) + strlen(mod->id) + 13); -+ buf[strlen(s) + strlen(mod->id) + 12] = '\0'; - /* Raw URI */ -- snprintf(buf, sizeof(buf)-1, "ddprogid://%s/%s", mod->id, s); -+ snprintf(buf, strlen(s) + strlen(mod->id) + 12, "ddprogid://%s/%s", mod->id, s); - - /* SH - series without episode id so ignore */ - if (strncmp("SH", s, 2)) -@@ -219,6 +220,7 @@ static void parse_xmltv_dd_progid - if (buf[e+1]) sscanf(&buf[e+1], "%hu", &(epnum->e_num)); - } - } -+ free(buf); - } - - /** --- -2.24.1 -
meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +1 -2
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9cae5acac2e9ee2fc3aec01ac88ce5db" SRC_URI = "git://github.com/tvheadend/tvheadend.git \ file://0001-adjust-for-64bit-time_t.patch \ - file://0001-allocate-space-for-buf-on-heap.patch \ " -SRCREV = "fda89e85e0b6ae796d8a09e178d3937aa7869270" +SRCREV = "ce09077056f9c6558c188d135cec3be85cc9c200" PV = "4.3+git${SRCPV}" PKGV = "4.3+git${GITPKGV}"
Signature · 1 line
2.28.0