diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
20 files changed, 161 insertions, 114 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.0.bb index 339c07cd9..88652a443 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.0.bb @@ -6,17 +6,14 @@ supporting the Document Object Model (DOM) Level 2 API and an optional, \ integrated mini web server for serving UPnP related documents." HOMEPAGE = "http://pupnp.sourceforge.net/" LICENSE = "BSD-3-Clause" - LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434" -PV = "1.8.4+git${SRCPV}" -# release-1.8.4 -SRCREV = "d5a01fc9895daae98a0c5a8c7d3afce46add529d" +SRCREV = "a6c3616530490ca67db41131572ec18f00d95eb0" SRC_URI = "git://github.com/mrjimenez/pupnp.git;protocol=https" S="${WORKDIR}/git" -inherit autotools +inherit autotools pkgconfig EXTRA_OECONF += "--enable-reuseaddr" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch deleted file mode 100644 index cbd76b6ab..000000000 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-allocate-space-for-buf-on-heap.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d4a405f87fc215c14e610a25b5a6b14060c1ef15 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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 - diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index 20faef047..82c2cbe08 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -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}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb index c96e4c52e..7f2674183 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.6.0.bb @@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \ " -PV = "1.3.2" -SRCREV = "42b035ea9098c02af503d6391a0ed56d973aaf23" +SRCREV = "b219e22f09e346dd048f614a01ca2cbc55edd940" S = "${WORKDIR}/git" -DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 libnsl2" +DEPENDS = "expat fmt spdlog pugixml libebml libmatroska zlib curl libupnp e2fsprogs sqlite3 libnsl2" SYSTEMD_SERVICE_${PN} = "gerbera.service" @@ -27,3 +26,5 @@ do_install_append() { } FILES_${PN} += "/root/.config/" + +SECURITY_CFLAGS_riscv64 = "${SECURITY_NOPIE_CFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 00a5c480d..c66c93ec5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -1,7 +1,7 @@ SUMMARY = "Linux libcamera framework" SECTION = "libs" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" +LICENSE = "GPL-2.0+ & LGPL-2.1+" LIC_FILES_CHKSUM = "\ file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \ @@ -18,13 +18,30 @@ PV = "202006+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native udev gnutls boost" +DEPENDS = "python3-pyyaml-native udev gnutls boost chrpath-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}" inherit meson pkgconfig python3native +do_install_append() { + chrpath -d ${D}${libdir}/libcamera.so +} + +addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata +do_recalculate_ipa_signatures_package() { + local modules + for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do + module="${module%.sign}" + if [ -f "${module}" ] ; then + modules="${modules} ${module}" + fi + done + + ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}" +} + FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" FILES_${PN} += " ${libdir}/libcamera.so" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch new file mode 100644 index 000000000..1352fdde6 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-Fix-musl-compatibility.patch @@ -0,0 +1,30 @@ +From d7d00ec681dc430192cf2192b3de7b7c30c4753d Mon Sep 17 00:00:00 2001 +From: Bart Ribbers <bribbers@disroot.org> +Date: Sat, 9 May 2020 11:42:32 +0200 +Subject: [PATCH] Fix musl compatibility + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +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 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch new file mode 100644 index 000000000..e6bf9eb2b --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic/0001-cmu_indic_lang-Make-cst_rx_not_indic-as-extern-decla.patch @@ -0,0 +1,29 @@ +From 7d38a72f9ae14a2416f7a78e28152aa33685aec7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb index b313b110c..0cac2bea5 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.2.0.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/mimic/mimic_1.3.0.1.bb @@ -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 diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index 04648a5d2..433388759 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -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" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch new file mode 100644 index 000000000..0a1e800c8 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Mark-setjmp_buffer-extern-declaration.patch @@ -0,0 +1,29 @@ +From 1c6028f5f8bbfd3fd7327a43e1bb762c2c166167 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb index 235e63e48..32f9688ea 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.16.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.19.bb @@ -8,7 +8,7 @@ inherit meson SRC_URI = " \ git://github.com/MusicPlayerDaemon/libmpdclient \ " -SRCREV = "4e8d990eb5239566ee948f1cd79b7248e008620a" +SRCREV = "27767959442ef390aabb16790494ba93fed962ef" S = "${WORKDIR}/git" PACKAGECONFIG ??= "tcp" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb index 41abe7108..dcfc3df0b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.31.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.33.bb @@ -5,12 +5,9 @@ HOMEPAGE = "https://www.musicpd.org/clients/mpc/" inherit meson -DEPENDS += " \ - libmpdclient \ -" +DEPENDS += "libmpdclient" + +SRC_URI = "git://github.com/MusicPlayerDaemon/mpc" +SRCREV = "ef16b280052ef0320cb80f79d74c8ce0324005ed" -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/mpc \ -" -SRCREV = "59875acdf34e5f0eac0c11453c49daef54f78413" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb index 0c99c7c69..ebf5d290b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.34.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.38.bb @@ -33,5 +33,5 @@ PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" SRC_URI = " \ git://github.com/MusicPlayerDaemon/ncmpc \ " -SRCREV = "79cf9905355f25bc5cc6d5a05d2846d75342f554" +SRCREV = "2c71add42152072c5e0490de2870315dfb3b71e1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch index 16f123fad..2bffd65c6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0001-Use-BUILD_CC-to-compile-native-tools.patch +++ b/meta-openembedded/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" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch index 8420386e3..607ddab8d 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft/0002-makehrtf-Disable-Wstringop-truncation.patch +++ b/meta-openembedded/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; } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb index a9cdfac8a..d283cb361 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.19.1.bb +++ b/meta-openembedded/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 \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb index 3f6dbb8e9..c775cef5a 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.12.bb @@ -8,7 +8,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=6ac22b992dde6a891f8949c3e2da8576" SRC_URI = "https://downloads.xiph.org/releases/opus/${BP}.tar.gz" -SRC_URI[md5sum] = "ab3f7d15d766f5b36b0951ee435f9ebf" -SRC_URI[sha256sum] = "48e03526ba87ef9cf5f1c47b5ebe3aa195bd89b912a57060c36184a6cd19412f" +SRC_URI[md5sum] = "45e8c62f6cd413395223c82f06bfa8ec" +SRC_URI[sha256sum] = "118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb index 228b8b654..744171663 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -7,19 +7,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" -PV = "0.0+git${SRCPV}" - -SRCREV = "b56957ac453575e91ca1b63a80c0077c2b0d011a" +SRCREV = "5b45cdd9a56ca9da35ee0f8845cb4e2603d245dc" SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https" S = "${WORKDIR}/git" -do_compile() { - ${CXX} -c guid.cpp -o guid.o ${CXXFLAGS} -std=c++11 -DGUID_LIBUUID - ${AR} rvs libcrossguid.a guid.o -} +inherit cmake do_install() { - install -D -m 0644 ${B}/libcrossguid.a ${D}${libdir}/libcrossguid.a - install -D -m 0644 ${S}/guid.h ${D}${includedir}/guid.h + install -D -m 0644 ${B}/libxg.a ${D}${libdir}/libxg.a + install -D -m 0644 ${S}/Guid.hpp ${D}${includedir}/Guid.hpp } diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb deleted file mode 100644 index 44f135a21..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libmediaart.inc - -SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" -SRC_URI[md5sum] = "0b65d64398d2f3dff89534c9dfffab4f" -SRC_URI[sha256sum] = "94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f" - -S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb new file mode 100644 index 000000000..56a7873fc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb @@ -0,0 +1,7 @@ +require libmediaart.inc + +SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" +SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4" +SRC_URI[sha256sum] = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d" + +S = "${WORKDIR}/libmediaart-${PV}" |