diff options
Diffstat (limited to 'meta-openembedded/meta-multimedia')
61 files changed, 293 insertions, 875 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb index ad99bbffa3..f2e27622cc 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb @@ -6,22 +6,23 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582" +SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446" GTKDOC_MESON_OPTION = 'gtk_doc' DEPENDS = " \ glib-2.0 \ - libsoup-2.4 \ + libsoup-3.0 \ " -inherit meson pkgconfig gobject-introspection vala gtk-doc features_check +inherit gnomebase pkgconfig gobject-introspection vala gi-docgen features_check + +# manpages require pandoc-native +EXTRA_OEMESON += "-Dmanpages=false" SNIFFER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "gnome-layer", "sniffer", "", d)}" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', "${SNIFFER}", "", d)}" - PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk4," REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'sniffer', 'opengl', '', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb index 48de5868de..2a5c0808ee 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb @@ -11,4 +11,4 @@ inherit meson pkgconfig gobject-introspection vala SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz \ file://0001-all-Drop-xmlRecoverMemory.patch \ " -SRC_URI[sha256sum] = "20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156" +SRC_URI[sha256sum] = "b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb index 49cd8d8318..d8dbc262cd 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb @@ -3,11 +3,10 @@ LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" -DEPENDS = "glib-2.0 gssdp gupnp sqlite3" +DEPENDS = "glib-2.0 gssdp gupnp" -SRC_URI = "http://download.gnome.org/sources/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1" +inherit gnomebase pkgconfig gtk-doc gobject-introspection -GTKDOC_MESON_OPTION = "gtk_doc" +SRC_URI[archive.sha256sum] = "4099978339ab22126d4968f2a332b6d094fc44c78797860781f1fc2f11771b74" -inherit meson pkgconfig gtk-doc gobject-introspection +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch deleted file mode 100644 index 5c13ce0bd5..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools/0001-build-Fix-wrap-file-syntax.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 4c86f814fbe17eb5774055d69102408bbfc1cd63 Mon Sep 17 00:00:00 2001 -From: Jens Georg <mail@jensge.org> -Date: Sun, 9 Jul 2023 21:47:48 +0200 -Subject: [PATCH] build: Fix wrap file syntax - -No idea why it worked in the first place - -Fixes #26 - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2] ---- - subprojects/gssdp-1.2.wrap | 4 ++-- - subprojects/gupnp-1.2.wrap | 4 ++-- - subprojects/gupnp-av-1.0.wrap | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap -index 34d9b0b..f78d2fa 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = master - depth = 1 - --[provides] --dependency_name = gssdp-1.2 -+[provide] -+dependency_names = gssdp-1.2 - -diff --git a/subprojects/gupnp-1.2.wrap b/subprojects/gupnp-1.2.wrap -index c345910..f92c055 100644 ---- a/subprojects/gupnp-1.2.wrap -+++ b/subprojects/gupnp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp.git - revision = master - depth = 1 - --[provides] --dependency_name = gupnp-1.2 -+[provide] -+dependency_names = gupnp-1.2 - -diff --git a/subprojects/gupnp-av-1.0.wrap b/subprojects/gupnp-av-1.0.wrap -index 967e6d3..8c3b490 100644 ---- a/subprojects/gupnp-av-1.0.wrap -+++ b/subprojects/gupnp-av-1.0.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gupnp-av.git - revision = master - depth = 1 - --[provides] --dependency_name = gupnp-av-1.0 -+[provide] -+dependency_names = gupnp-av-1.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb deleted file mode 100644 index 9731ede274..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tools for GUPnP" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" - -DEPENDS = "gupnp gupnp-av gtk+3 glib-2.0-native intltool-native" - -inherit features_check meson pkgconfig gettext gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ - file://0001-build-Fix-wrap-file-syntax.patch \ -" -SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" - -RRECOMMENDS:${PN} = "adwaita-icon-theme" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb new file mode 100644 index 0000000000..4f6ff3fb97 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Tools for GUPnP" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gupnp gssdp gtk+3 libsoup-3.0 libxml2 glib-2.0 " + +inherit gnomebase features_check pkgconfig gettext gtk-icon-cache + +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +SRC_URI[archive.sha256sum] = "53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba" + +PACKAGECONFIG ??= "av-tools" +PACKAGECONFIG[av-tools] = "-Dav-tools=true,-Dav-tools=false,gupnp-av" +PACKAGECONFIG[gtksourceview] = ",,gtksourceview4" + +CFLAGS += "-Wno-deprecated-declarations" + +RRECOMMENDS:${PN} = "adwaita-icon-theme" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch deleted file mode 100644 index a3941f345f..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001 -From: Jens Georg <mail@jensge.org> -Date: Thu, 4 May 2023 19:14:29 +0200 -Subject: [PATCH] all: Drop xmlRecoverMemory - -use xmlReadMemory, also use NONET flat - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] ---- - libgupnp/gupnp-control-point.c | 7 +++++-- - libgupnp/gupnp-service-info.c | 7 +++++-- - libgupnp/gupnp-service-proxy-action.c | 7 +++++-- - libgupnp/gupnp-service-proxy.c | 7 +++++-- - libgupnp/gupnp-service.c | 7 +++++-- - 5 files changed, 25 insertions(+), 10 deletions(-) - -diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c -index dc04732..99ebda5 100644 ---- a/libgupnp/gupnp-control-point.c -+++ b/libgupnp/gupnp-control-point.c -@@ -608,8 +608,11 @@ got_description_url (SoupSession *session, - xmlDoc *xml_doc; - - /* Parse response */ -- xml_doc = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ xml_doc = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (xml_doc) { - doc = gupnp_xml_doc_new (xml_doc); - -diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c -index 9a9f4de..d468801 100644 ---- a/libgupnp/gupnp-service-info.c -+++ b/libgupnp/gupnp-service-info.c -@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, - if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { - xmlDoc *scpd; - -- scpd = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ scpd = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (scpd) { - introspection = gupnp_service_introspection_new (scpd); - -diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c -index 4d9336c..ef8a808 100644 ---- a/libgupnp/gupnp-service-proxy-action.c -+++ b/libgupnp/gupnp-service-proxy-action.c -@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, - } - - /* Parse response */ -- response = xmlRecoverMemory (action->msg->response_body->data, -- action->msg->response_body->length); -+ response = xmlReadMemory (action->msg->response_body->data, -+ action->msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - - if (!response) { - if (action->msg->status_code == SOUP_STATUS_OK) { -diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c -index 25d5ef6..af2fd46 100644 ---- a/libgupnp/gupnp-service-proxy.c -+++ b/libgupnp/gupnp-service-proxy.c -@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, - } - - /* Parse the actual XML message content */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - /* Failed */ - g_warning ("Failed to parse NOTIFY message body"); -diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c -index 67b3d43..0ebfb26 100644 ---- a/libgupnp/gupnp-service.c -+++ b/libgupnp/gupnp-service.c -@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server, - *end = '\0'; - - /* Parse action_node */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch deleted file mode 100644 index 66f07094c5..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Sun, 9 Jul 2023 03:30:47 +0000 -Subject: [PATCH] build: properly spell [provide] in *.wrap files - -meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1] ---- - subprojects/gssdp-1.2.wrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap -index 469c75d..466b83b 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = gssdp-1.4 - depth = 1 - --[provides] -+[provide] - dependency_name = gssdp-1.2 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index efeb66f28f..f1628d82ee 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -3,15 +3,11 @@ DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for cr LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" +DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2" -inherit meson pkgconfig vala gobject-introspection +inherit gnomebase pkgconfig vala gobject-introspection -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ - file://0001-all-Drop-xmlRecoverMemory.patch \ - file://0001-build-properly-spell-provide-in-.wrap-files.patch \ -" -SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" +SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" @@ -22,4 +18,4 @@ gupnp_sysroot_preprocess () { FILES:${PN}-dev += "${bindir}/gupnp-binding-tool*" -RDEPENDS:${PN}-dev = "python3 python3-xml" +RDEPENDS:${PN}-dev += "python3-core python3-xml" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch deleted file mode 100644 index ee78196779..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 343a3b724225d3c87af0b268da14d3acb7a5b9a1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 May 2021 15:38:43 -0700 -Subject: [PATCH] ithread: Use - pthread_mutexattr_gettype/pthread_mutexattr_settype on linux - -_np variants are not recommended anymore, and glibc 2.34+ will have -these removed - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - upnp/inc/ithread.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h -index f6800ea9..1d0f9dba 100644 ---- a/upnp/inc/ithread.h -+++ b/upnp/inc/ithread.h -@@ -304,7 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) - * Returns EINVAL if the kind is not supported. - * See man page for pthread_mutexattr_setkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ -+ || defined (__linux__) - #define ithread_mutexattr_setkind_np pthread_mutexattr_settype - #else - #define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np -@@ -329,7 +330,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void) - * Always returns 0. - * See man page for pthread_mutexattr_getkind_np - *****************************************************************************/ --#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) -+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) \ -+ || defined (__linux__) - #define ithread_mutexattr_getkind_np pthread_mutexattr_gettype - #else - #define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np --- -2.31.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb index 81b42da412..5b15d18096 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.14.18.bb @@ -8,9 +8,8 @@ HOMEPAGE = "http://pupnp.sourceforge.net/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=394a0f17b97f33426275571e15920434" -SRCREV = "cef2b23fb36baac091b0c7d41136b4c1d9549c6d" +SRCREV = "c540ce2431bdeac73359029d4592b45790e1d154" SRC_URI = "git://github.com/pupnp/pupnp.git;protocol=https;branch=branch-1.14.x \ - file://0001-ithread-Use-pthread_mutexattr_gettype-pthread_mutexa.patch \ " S="${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb index 8bc8767d8f..9662296399 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.40.4.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.4.bb @@ -9,27 +9,26 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 \ - gstreamer1.0-plugins-base libgee libsoup-2.4 libmediaart-2.0 \ + gstreamer1.0-plugins-base libgee libsoup libmediaart-2.0 \ libunistring sqlite3 intltool-native gst-editing-services" RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS:${PN} = "rygel-plugin-media-export" -inherit gnomebase features_check vala gobject-introspection gettext systemd meson +inherit gnomebase features_check vala gobject-introspection gettext systemd # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "736d8adbe8615f6cbc8fcfff9845dc985fd10e16629da236b4b52dbedf0a348b" +SRC_URI[archive.sha256sum] = "6310dfaa2d332b66119b9b020fad6a4bd27d9bc61faf780ca5ca0b62813303f7" -GNOMEBASEBUILDCLASS = "meson" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' EXTRA_OEMESON = "-Dengines=gstreamer -Dplugins=${@strip_comma('${RYGEL_PLUGINS}')}" PACKAGECONFIG:append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" -PACKAGECONFIG ?= "external mpris ruih media-export gst-launch" +PACKAGECONFIG ?= "external mpris ruih gst-launch" PACKAGECONFIG[external] = "" PACKAGECONFIG[mpris] = "" @@ -50,7 +49,7 @@ RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'media-export', ',m RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'tracker3', ',tracker3', '', d)}" RYGEL_PLUGINS:append ="${@bb.utils.contains('PACKAGECONFIG', 'playbin', ',playbin', '', d)}" -LIBV = "2.6" +LIBV = "2.8" CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch deleted file mode 100644 index a01c7544b6..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch +++ /dev/null @@ -1,57 +0,0 @@ -Use LD and obey LDFLAGS - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Pending - -diff --git a/make/linux/Makefile b/make/linux/Makefile -index 391b6e3..a2ac13e 100644 ---- a/make/linux/Makefile -+++ b/make/linux/Makefile -@@ -64,6 +64,7 @@ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) - WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow - COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) - DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) -+LINKFLAGS=$(LDFLAGS) - - ifeq (Darwin,$(shell uname -s)) - all: staticlib -@@ -91,7 +92,7 @@ $(LIBRARY): $(objects) - $(RANLIB) $@ - - $(LIBRARY_SO): $(objects_so) -- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -+ $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) - -diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile -index e5986ef..6ca16aa 100644 ---- a/make/mingw32/Makefile -+++ b/make/mingw32/Makefile -@@ -18,6 +18,7 @@ DEBUGFLAGS=-g -DDEBUG - endif - CROSS = - CXX = $(CROSS)g++ -+LD = $(CXX) - CC = $(CROSS)gcc - WINDRES = $(CROSS)windres - RANLIB = $(CROSS)ranlib -@@ -33,6 +34,7 @@ LIBS = libebml.a - endif - INCS = -I"$(shell pwd)/../.." - COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS) -+LINKFLAGS = $(LDFLAGS) - - .PHONY: all all-before all-after clean clean-custom - -@@ -54,7 +56,7 @@ libebml.a: $(OBJ) - $(RANLIB) $@ - - libebml.dll: $(OBJ) -- $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) -+ $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) - - depend: - @echo Calculating dependecies: --- -2.8.0 diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch deleted file mode 100644 index 57eb3450d6..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch +++ /dev/null @@ -1,42 +0,0 @@ -Allow override of the 'uname -s' for cross-compilation - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Pending - -diff --git a/make/linux/Makefile b/make/linux/Makefile -index a2ac13e..4188bee 100644 ---- a/make/linux/Makefile -+++ b/make/linux/Makefile -@@ -9,9 +9,11 @@ - # 'make DEBUG=yes'. - # - -+TARGET_OS ?= $(shell uname -s) -+ - # Paths - # BeOS wants the libs and headers in /boot/home/config --ifeq (BeOS,$(shell uname -s)) -+ifeq (BeOS,$(TARGET_OS)) - prefix=/boot/home/config - else - prefix=/usr/local -@@ -66,7 +68,7 @@ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) - DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) - LINKFLAGS=$(LDFLAGS) - --ifeq (Darwin,$(shell uname -s)) -+ifeq (Darwin,$(TARGET_OS)) - all: staticlib - else - all: staticlib sharedlib -@@ -116,7 +118,7 @@ depend: - $(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \ - done - --ifeq (Darwin,$(shell uname -s)) -+ifeq (Darwin,$(TARGET_OS)) - install: install_staticlib install_headers - else - install: install_staticlib install_sharedlib install_headers --- -2.8.0 diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb deleted file mode 100644 index 744486fa2a..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "libebml is a C++ libary to parse EBML files" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI = "\ - http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2 \ - file://ldflags.patch \ - file://override-uname.patch \ -" -SRC_URI[md5sum] = "efec729bf5a51e649e1d9d1f61c0ae7a" -SRC_URI[sha256sum] = "83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" - -inherit dos2unix - -LIBEBML_OS = "Unknown" -LIBEBML_OS_linux = "Linux" -LIBEBML_OS:darwin = "Darwin" -LIBEBML_OS:mingw32 = "Windows" - -EXTRA_OEMAKE = "\ - 'TARGET_OS=${LIBEBML_OS}' \ - \ - 'CXX=${CXX}' \ - 'LD=${CXX}' \ - 'AR=${AR}' \ - 'RANLIB=${RANLIB}' \ - \ - 'DEBUGFLAGS=' \ - 'CPPFLAGS=${CPPFLAGS}' \ - 'CXXFLAGS=${CXXFLAGS}' \ - 'LDFLAGS=${LDFLAGS}' \ - \ - 'prefix=${prefix}' \ - 'libdir=${libdir}' \ - 'includedir=${includedir}/ebml' \ -" - -do_compile () { - oe_runmake -C make/linux -} - -do_install() { - cd ${S}/make/linux - - install -d ${D}${libdir} - install -m 0644 libebml.a ${D}${libdir} - install -m 0755 libebml.so.* ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v libebml.so ${D}${libdir} - - install -d ${D}${includedir}/ebml - for i in ../../ebml/*.h; do - install -m 0644 $i ${D}${includedir}/ebml - done - - install -d ${D}${includedir}/ebml/c - for i in ../../ebml/c/*.h; do - install -m 0644 $i ${D}${includedir}/ebml/c - done -} diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.4.4.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.4.4.bb new file mode 100644 index 0000000000..3e37e7d2df --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.4.4.bb @@ -0,0 +1,14 @@ +SUMMARY = "C++ library to parse EBML files" +HOMEPAGE = "https://github.com/Matroska-Org/libebml" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://github.com/Matroska-Org/libebml.git;branch=v1.x;protocol=https" +SRCREV = "8330b222fec992b295c8b2149cf70f9ff648ce4a" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake dos2unix + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch deleted file mode 100644 index f7656913b5..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f0c879097c331d1dabe6ee92b583a8badb62ea6d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 18 Mar 2017 08:26:35 -0700 -Subject: [PATCH] Makefile: Use LINKFLAGS during link step - -Adds much needed GNU_HASH section into the .so - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - make/linux/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/make/linux/Makefile b/make/linux/Makefile -index 3ca7b0f..b5c9645 100644 ---- a/make/linux/Makefile -+++ b/make/linux/Makefile -@@ -104,7 +104,7 @@ $(LIBRARY): $(objects) - $(RANLIB) $@ - - $(LIBRARY_SO): $(objects_so) -- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml -+ $(CXX) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml - rm -f $(LIBRARY_SO) - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) - --- -2.12.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb deleted file mode 100644 index 890be69269..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "libmatroska is a C++ libary to parse Matroska files (.mkv and .mka)" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libebml" - -SRC_URI = "http://dl.matroska.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-Makefile-Use-LINKFLAGS-during-link-step.patch \ - " -SRC_URI[md5sum] = "f61b2e5086f4bb9d24a43cc8af43a719" -SRC_URI[sha256sum] = "086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile() { - cd ${S}/make/linux - oe_runmake CROSS="${TARGET_PREFIX}" -} - -do_install() { - cd ${S}/make/linux - - install -d ${D}${libdir} - install -m 0644 libmatroska.a ${D}${libdir} - install -m 0755 libmatroska.so.* ${D}${libdir} - cp -R --no-dereference --preserve=mode,links -v libmatroska.so ${D}${libdir} - - install -d ${D}${includedir}/matroska - for i in ../../matroska/*.h; do - install -m 0644 $i ${D}${includedir}/matroska - done - - install -d ${D}${includedir}/matroska/c - for i in ../../matroska/c/*.h; do - install -m 0644 $i ${D}${includedir}/matroska/c - done -} diff --git a/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb new file mode 100644 index 0000000000..16862e690e --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.7.1.bb @@ -0,0 +1,16 @@ +SUMMARY = "C++ library to parse and create Matroska files(.mkv and .mka)" +HOMEPAGE = "https://github.com/Matroska-Org/libmatroska" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libebml" + +SRC_URI = "git://github.com/Matroska-Org/libmatroska.git;branch=v1.x;protocol=https" +SRCREV = "f5315fddda2d434e47035c038549a808d8b8eac7" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +#Static library enabled by default. It has been added in case you want to use it dynamically. +#EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.7.0.bb index 45dd487f30..776dfa8783 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.6.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/aom/aom_3.7.0.bb @@ -5,7 +5,7 @@ LICENSE = "BSD-2-Clause & AOM-Patent-License-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ea91368c1bbdf877159435572b931f5 \ file://PATENTS;md5=a111d47497d3bb49e04eef71377eb8ba \ " -SRCREV = "7ade96172b95adc91a5d85bf80c90989cd543ee8" +SRCREV = "6054fae218eda6e53e1e3b4f7ef0fff4877c7bf1" SRC_URI = "git://aomedia.googlesource.com/aom;protocol=https;branch=main \ file://0001-subpel_variance_neon-Provide-prototypes-for-missing-.patch" @@ -20,8 +20,8 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=1 -DENABLE_TESTS=0 \ " CMAKE_VERBOSE = "VERBOSE=1" CFLAGS:append:libc-musl = " -D_GNU_SOURCE" -EXTRA_OECMAKE:append:arm = " ${@bb.utils.contains("TUNE_FEATURES","neon","-DENABLE_NEON=ON","-DENABLE_NEON=OFF",d)}" +EXTRA_OECMAKE:append:arm = " -DENABLE_NEON=OFF" do_generate_toolchain_file:append() { - echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake + echo "set(AOM_AS_FLAGS --debug-prefix-map ${S}=${TARGET_DBGSRC_DIR})" >> ${WORKDIR}/toolchain.cmake } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.3.0.bb index 5d43921b03..2d5049b9ae 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.3.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" -SRCREV = "676a864a11af2c0522e1f992e770589543894686" +SRCREV = "48035599cdd4e4415732e408c407e0c1cd1c7444" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb index 033854f19e..bed5af9bf3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb @@ -16,3 +16,5 @@ inherit autotools pkgconfig FILES:${PN} += "${libdir}/dleyna-1.0/connectors/*.so" FILES:${PN}-dev += "${libdir}/dleyna-1.0/connectors/*.la" FILES:${PN}-dbg += "${libdir}/dleyna-1.0/connectors/.debug/*.so" + +SKIP_RECIPE[dleyna-connector-dbus] ?= "Upstream is dead moreover needs porting to work with latest gupnp >= 1.2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb index eafbb50db4..8aaab7893e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb @@ -11,10 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0 gupnp" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https" SRCREV = "1c6853f5bc697dc0a8774fd70dbc915c4dbe7c5b" S = "${WORKDIR}/git" inherit autotools pkgconfig + +SKIP_RECIPE[dleyna-core] ?= "Upstream is dead moreover needs porting to work with latest gupnp >= 1.2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb index e7f918333a..a385a50de7 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb @@ -23,3 +23,5 @@ CFLAGS += " -I${S}" FILES:${PN} += "${datadir}/dbus-1" FILES:${PN}-dev += "${libdir}/${BPN}/*.so" + +SKIP_RECIPE[dleyna-renderer] ?= "Upstream is dead moreover needs porting to work with latest gupnp >= 1.2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index 071379758c..719aecede1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -20,3 +20,5 @@ inherit autotools pkgconfig FILES:${PN} += "${datadir}/dbus-1" FILES:${PN}-dev += "${libdir}/${BPN}/*.so" + +SKIP_RECIPE[dleyna-server] ?= "Upstream is dead moreover needs porting to work with latest gupnp >= 1.2" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.2.bb index c499119c6f..55475b40f1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.2.bb @@ -12,7 +12,7 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875" SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=https;branch=master" -SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec" +SRCREV = "801f67f671929311e0c9952c5f92d6e147c7b003" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb index a1083af56d..dc05832e80 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb @@ -4,19 +4,18 @@ SECTION = "libs/multimedia" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc178bcd425090939a8b634d1d6a9594" -SRC_URI = "git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https" -SRCREV = "4d8fe638e1a48660a4c843d493f69a86579e12f0" -S = "${WORKDIR}/git" -PV = "2.3.2" - -inherit cmake pkgconfig lib_package - DEPENDS = "glib-2.0" -SRC_URI += " \ +SRC_URI = " \ + git://github.com/FluidSynth/fluidsynth.git;branch=master;protocol=https \ file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \ file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \ " +SRCREV = "5ecdc4568e45123216c6888892caad07918ef127" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package EXTRA_OECMAKE = "-Denable-floats=ON -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch deleted file mode 100644 index bb8e438304..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera/0001-Fix-build-with-fmt-9.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 -From: Felix Yan <felixonmars@archlinux.org> -Date: Fri, 19 Aug 2022 15:22:10 +0300 -Subject: [PATCH] Fix build with fmt 9.0 - -Fixes #2681 -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/database/sql_format.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/database/sql_format.h b/src/database/sql_format.h -index 32dc00ef..e4e1909a 100644 ---- a/src/database/sql_format.h -+++ b/src/database/sql_format.h -@@ -42,7 +42,7 @@ struct SQLIdentifier { - template <> - struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> { - template <typename FormatContext> -- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) -+ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) - { - return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); - } -@@ -61,7 +61,7 @@ struct ColumnUpdate { - template <> - struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> { - template <typename FormatContext> -- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) -+ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) - { - return format_to(ctx.out(), "{} = {}", a.column, a.value); - } --- -2.38.0.rc1.362.ged0d419d3c-goog - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb index 2a6d328711..89cc51e0ea 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.11.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_1.12.1.bb @@ -4,11 +4,10 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master \ - file://0001-Fix-build-with-fmt-9.0.patch \ file://0001-Fix-build-against-fmt-10.patch \ " -SRCREV = "d73d8c1346213d784753c02ea771970500e0df2a" +SRCREV = "559e1d1a92f5977ce8cff7393aa85330dbf2d1d6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb index 4e50897de6..8a839e0d10 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gst-shark_0.8.1.bb @@ -2,35 +2,33 @@ SUMMARY = "Gst-Shark Tracers" DESCRIPTION = "Benchmarks and profiling tools for GStreamer" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=GstShark" SECTION = "multimedia" -LICENSE = "GPL-2.0-or-later" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=e1caa368743492879002ad032445fa97" DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad " SRCBRANCH ?= "master" -PV = "0.7.3.1" - -SRCREV_base = "5413ef5475e5b70476c2480a75ca3746d91d4caf" +SRCREV = "09ba05865dacd2824b5b40ab75a4b9545fcc1366" SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0" -SRCREV_FORMAT = "base_common" +SRCREV_FORMAT = "default_common" SRC_URI = " \ - git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH};name=base \ - git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;destsuffix=git/common;name=common;;branch=master \ + git://github.com/RidgeRun/gst-shark.git;protocol=https;branch=${SRCBRANCH} \ + git://gitlab.freedesktop.org/gstreamer/common.git;protocol=https;branch=master;destsuffix=git/common;name=common \ file://0001-tracers-Fix-buffer-overflow.patch \ - " +" S = "${WORKDIR}/git" EXTRA_OECONF += " \ - --disable-graphviz \ - --enable-gtk-doc=no \ + --disable-graphviz \ + --enable-gtk-doc=no \ " FILES:${PN} += "\ - ${libdir}/gstreamer-1.0/libgstsharktracers.so \ - ${libdir}/gstreamer-1.0/libgstsharktracers.la \ + ${libdir}/gstreamer-1.0/libgstsharktracers.so \ + ${libdir}/gstreamer-1.0/libgstsharktracers.la \ " inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch deleted file mode 100644 index 64fd578a96..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From eaf51d6420c63713f62025583681007c3502d387 Mon Sep 17 00:00:00 2001 -From: Carlos <carlos.rodriguez@ridgerun.com> -Date: Fri, 15 Dec 2017 10:14:05 -0600 -Subject: [PATCH] gstd:yocto compatibility - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - gstd/Makefile.am | 2 +- - 3 files changed, 9 insertions(+), 3 deletions(-) - ---- a/gstd/Makefile.am -+++ b/gstd/Makefile.am -@@ -74,7 +74,7 @@ gstd_CFLAGS = $(GST_CFLAGS) \ - -DGSTD_LOG_STATE_DIR=\"$(gstdlogstatedir)\" \ - -DGSTD_RUN_STATE_DIR=\"$(gstdrunstatedir)\" - --gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) -Wl,-rpath -Wl,$(libdir) -+gstd_LDFLAGS = $(GST_LIBS) $(GIO_LIBS) $(GIO_UNIX_LIBS) $(GJSON_LIBS) $(LIBD_LIBS) - gstd_LDADD = libgstd-core.la - - gstdincludedir = $(includedir)/gstd diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb index 38fafe82e4..88acdb190e 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_git.bb @@ -2,26 +2,27 @@ DESCRIPTION = "Gstreamer Daemon" SUMMARY = "GStreamer framework for controlling audio and video streaming using TCP connection messages" HOMEPAGE = "https://developer.ridgerun.com/wiki/index.php?title=Gstd-1.0" SECTION = "multimedia" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=c71b653a0f608a58cdc5693ae57126bc" -DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon jansson" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-rtsp-server json-glib libdaemon libsoup-2.4 jansson" SRCBRANCH ?= "master" -SRCREV = "a6621a5778b234651aa2adbbe304d906a3fa64d1" -SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH} \ - file://0001-gstd-yocto-compatibility.patch \ - " +SRCREV = "a011affa67f240cbc7aaff5b00fdfd6124bdaece" +SRC_URI = "git://git@github.com/RidgeRun/gstd-1.x.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" # Remove the +really when upstream version is > 1.0 -PV = "1.0+really0.8.0" +PV = "1.0+really0.15.0" -inherit autotools pkgconfig gettext gtk-doc +GTKDOC_MESON_OPTION = "enable-gtk-doc" + +inherit meson pkgconfig gettext gtk-doc systemd python3native python3-dir python3targetconfig do_install:append() { - rmdir ${D}${localstatedir}/run/${BPN} ${D}${localstatedir}/run \ - ${D}${localstatedir}/log/${BPN} ${D}${localstatedir}/log + rmdir ${D}${root_prefix}${localstatedir}/run/${BPN} ${D}${root_prefix}${localstatedir}/run \ + ${D}${root_prefix}${localstatedir}/log/${BPN} ${D}${root_prefix}${localstatedir}/log \ + ${D}${root_prefix}${localstatedir} rm -f ${D}${bindir}/gst-client ${D}${bindir}/gstd-client if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -33,3 +34,9 @@ do_install:append() { ln -sf gst-client-1.0 ${D}${bindir}/gst-client ln -sf gst-client-1.0 ${D}${bindir}/gstd-client } +PACKAGES =+ "${PN}-python" + +FILES:${PN} += "${systemd_user_unitdir}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" + +SYSTEMD_SERVICE:${PN} = "gstd.service" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc index feb3564633..b60cba1dd6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc @@ -18,7 +18,8 @@ DEPENDS:append:libc-musl = " libexecinfo" SRCREV = "2f980209cc4091a4490bb1bafc5d530f16834e58" BRANCH = "master" SRC_URI = "git://github.com/WeAreROLI/JUCE.git;protocol=https;branch=${BRANCH} \ -" + file://0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch \ + " S = "${WORKDIR}/git" PV = "6.1.6" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch new file mode 100644 index 0000000000..3efef247ae --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer/0001-StandardHeader-Include-utility-for-GCC-12-compatibil.patch @@ -0,0 +1,21 @@ +From 85822fcb87dd531d5e8ed1c8230c67bddb56f66d Mon Sep 17 00:00:00 2001 +From: reuk <reuk@users.noreply.github.com> +Date: Wed, 6 Apr 2022 15:43:09 +0100 +Subject: [PATCH] StandardHeader: Include <utility> for GCC 12 compatibility + +Upstream-Status: Backport [https://github.com/juce-framework/JUCE/commit/ce8aff22c31c4d932a8414bc6f6185381dc970db] +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + modules/juce_core/system/juce_StandardHeader.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/modules/juce_core/system/juce_StandardHeader.h ++++ b/modules/juce_core/system/juce_StandardHeader.h +@@ -64,6 +64,7 @@ + #include <typeindex>
+ #include <unordered_map>
+ #include <unordered_set>
++#include <utility>
+ #include <vector>
+ #include <set>
+
diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libavif/libavif_0.11.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libavif/libavif_1.0.1.bb index f01024e8aa..885758b6a4 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libavif/libavif_0.11.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libavif/libavif_1.0.1.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c528b75b07425b5c1d2e34de98c397b5" -SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=main" +SRC_URI = "git://github.com/AOMediaCodec/libavif.git;protocol=https;branch=v1.0.x" S = "${WORKDIR}/git" -SRCREV = "6ab53189045e7a6fe0bd93d14977b2a4f8efa5e9" +SRCREV = "d1c26facaf5a8a97919ceee06814d05d10e25622" DEPENDS = "dav1d" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.7.bb index 952ba603ba..8cac780d64 100755 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_2.2.7.bb @@ -14,8 +14,7 @@ DEPENDS += "libusb1 libraw1394 libsdl \ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://install_examples.patch \ " -SRC_URI[md5sum] = "9fad67bbff08fe2818d5ec81802ec89f" -SRC_URI[sha256sum] = "2b905fc9aa4eec6bdcf6a2ae5f5ba021232739f5be047dec8fe8dd6049c10fed" +SRC_URI[sha256sum] = "537ceb78dd3cef271a183f4a176191d1cecf85f025520e6bd3758b0e19e6609f" inherit autotools pkgconfig EXTRA_OECONF += "--disable-doxygen-doc --disable-examples" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.12.bb index d0ecd04f16..3c9f899491 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.12.bb @@ -8,8 +8,10 @@ LICENSE = "LGPL-3.0-only & MIT" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=695b556799abb2435c97a113cdca512f" -SRC_URI = "https://github.com/strukturag/libde265/releases/download/v${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "e3f277d8903408615a5cc34718b391b83c97c646faea4f41da93bac5ee08a87f" +SRC_URI = "git://github.com/strukturag/libde265.git;branch=master;protocol=https" +SRCREV = "a267c84707ab264928fa9b86de2ee749c48c318c" + +S = "${WORKDIR}/git" EXTRA_OECONF = "--disable-sherlock265 --disable-dec265" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.3.bb index 5ca146792c..719fbf91e6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.3.bb @@ -6,7 +6,6 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://download.videolan.org/pub/libdvbpsi/${PV}/libdvbpsi-${PV}.tar.bz2" -SRC_URI[md5sum] = "2b217039a1299000c39423441f77e76a" -SRC_URI[sha256sum] = "a2fed1d11980662f919bbd1f29e2462719e0f6227e1a531310bd5a706db0a1fe" +SRC_URI[sha256sum] = "02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112" inherit autotools diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb index 47173d71d5..92f33da899 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.6.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb @@ -7,15 +7,15 @@ HOMEPAGE = "https://lib.openmpt.org/libopenmpt/" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae09d6164bdecb499183479fd32b66fb" +LIC_FILES_CHKSUM = "file://LICENSE;md5=59f6e21f42e49919617267ff13a0b232" DEPENDS = "virtual/libiconv" SRC_URI = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${PV}+release.autotools.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "d21fb799695cbe10a1e9aeaea23ed708" -SRC_URI[sha256sum] = "50c0d62ff2d9afefa36cce9f29042cb1fb8d4f0b386b81a0fc7734f35e21e6b6" + +SRC_URI[sha256sum] = "2cf8369b7916b09264f3f14b9fb6cef35a6e9bee0328dec4f49d98211ccfd722" S = "${WORKDIR}/libopenmpt-${PV}+release.autotools" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.7.bb index 464b1dc23e..b1572b32ac 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libuvc/libuvc_0.0.7.bb @@ -3,11 +3,11 @@ HOMEPAGE = "https://github.com/libuvc/libuvc.git" SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f1963e0bb88c93463af750daf9ba0c2" + DEPENDS = "libusb jpeg" SRC_URI = "git://github.com/libuvc/libuvc.git;branch=master;protocol=https" -SRCREV = "ad6c72a4e390367f0d2be81aac00cfc0b6680d74" -PV = "v0.0.6+git${SRCPV}" +SRCREV = "68d07a00e11d1944e27b7295ee69673239c00b4b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch deleted file mode 100644 index 37aa448e95..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2fbfeeb9c4ff7aa9ba4b95604ee0fb14ecec763 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 17 May 2023 17:54:09 -0700 -Subject: [PATCH] SndfileDecoderPlugin: Fix type mismatch for std::span - -Fixes -../git/src/decoder/plugins/SndfileDecoderPlugin.cxx:231:25: error: non-constant-expression cannot be narrowed from type 'sf_count_t' (aka 'long long') to 'size_type' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] - std::span{buffer, num_frames * frame_size}, - ^~~~~~~~~~~~~~~~~~~~~~~ -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/decoder/plugins/SndfileDecoderPlugin.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx -index ad3908847..a3cb87ca9 100644 ---- a/src/decoder/plugins/SndfileDecoderPlugin.cxx -+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx -@@ -228,7 +228,7 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is) - break; - - cmd = client.SubmitAudio(is, -- std::span{buffer, num_frames * frame_size}, -+ std::span{buffer, static_cast<std::size_t>(num_frames * frame_size)}, - 0); - if (cmd == DecoderCommand::SEEK) { - sf_count_t c = client.GetSeekFrame(); diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch new file mode 100644 index 0000000000..b2dea331ef --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch @@ -0,0 +1,26 @@ +From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 20 Nov 2023 17:49:59 +0100 +Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898] +--- + src/decoder/plugins/FfmpegIo.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx +index 572f1a86a..3e2347fec 100644 +--- a/src/decoder/plugins/FfmpegIo.cxx ++++ b/src/decoder/plugins/FfmpegIo.cxx +@@ -25,6 +25,7 @@ + #include "input/InputStream.hxx" + + extern "C" { ++#include <libavutil/error.h> + #include <libavutil/mem.h> + } + +-- +2.42.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch deleted file mode 100644 index ebbea2b358..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/fix-build-error-when-fmt-updated.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/MPD/commit/181b96dd2d71bc8f2668776719d344466f258b5d] - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> - -From 181b96dd2d71bc8f2668776719d344466f258b5d Mon Sep 17 00:00:00 2001 -From: Max Kellermann <max.kellermann@gmail.com> -Date: Mon, 15 May 2023 20:52:21 +0200 -Subject: [PATCH] command/player, SongPrint: use AudioFormatFormatter() - -libfmt version 10 apparently doesn't know how to format a -`StringBuffer`, failing the MPD build. Since we have a formatter -specialization for `AudioFormat`, let's use that - it's better and -easier to use. - -Closes https://github.com/MusicPlayerDaemon/MPD/issues/1807 ---- - src/SongPrint.cxx | 5 +++-- - src/command/PlayerCommands.cxx | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/SongPrint.cxx b/src/SongPrint.cxx -index 98d544cc38..835669d276 100644 ---- a/src/SongPrint.cxx -+++ b/src/SongPrint.cxx -@@ -8,6 +8,7 @@ - #include "TagPrint.hxx" - #include "client/Response.hxx" - #include "fs/Traits.hxx" -+#include "lib/fmt/AudioFormatFormatter.hxx" - #include "time/ChronoUtil.hxx" - #include "util/StringBuffer.hxx" - #include "util/UriUtil.hxx" -@@ -77,7 +78,7 @@ song_print_info(Response &r, const LightSong &song, bool base) noexcept - time_print(r, "Last-Modified", song.mtime); - - if (song.audio_format.IsDefined()) -- r.Fmt(FMT_STRING("Format: {}\n"), ToString(song.audio_format)); -+ r.Fmt(FMT_STRING("Format: {}\n"), song.audio_format); - - tag_print_values(r, song.tag); - -@@ -100,7 +101,7 @@ song_print_info(Response &r, const DetachedSong &song, bool base) noexcept - time_print(r, "Last-Modified", song.GetLastModified()); - - if (const auto &f = song.GetAudioFormat(); f.IsDefined()) -- r.Fmt(FMT_STRING("Format: {}\n"), ToString(f)); -+ r.Fmt(FMT_STRING("Format: {}\n"), f); - - tag_print_values(r, song.GetTag()); - -diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx -index 5108b9d3c4..0b5a917020 100644 ---- a/src/command/PlayerCommands.cxx -+++ b/src/command/PlayerCommands.cxx -@@ -13,6 +13,7 @@ - #include "Partition.hxx" - #include "Instance.hxx" - #include "IdleFlags.hxx" -+#include "lib/fmt/AudioFormatFormatter.hxx" - #include "util/StringBuffer.hxx" - #include "util/ScopeExit.hxx" - #include "util/Exception.hxx" -@@ -170,7 +171,7 @@ handle_status(Client &client, [[maybe_unused]] Request args, Response &r) - - if (player_status.audio_format.IsDefined()) - r.Fmt(FMT_STRING(COMMAND_STATUS_AUDIO ": {}\n"), -- ToString(player_status.audio_format)); -+ player_status.audio_format); - } - - #ifdef ENABLE_DATABASE diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch deleted file mode 100644 index 0c9d979107..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/minor-fixup-for-libfmt10.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Backport -[https://github.com/MusicPlayerDaemon/MPD/commit/f869593ac8913e52c711e974257bd6dc0d5dbf26] - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> - -From f869593ac8913e52c711e974257bd6dc0d5dbf26 Mon Sep 17 00:00:00 2001 -From: Max Kellermann <max.kellermann@gmail.com> -Date: Mon, 15 May 2023 20:59:58 +0200 -Subject: [PATCH] TimePrint: minor fixup for libfmt 10 - -libfmt version 10 has difficulties formatting a `StringBuffer`, and we -need to help it by explicitly invoking the `c_str()` method. ---- - src/TimePrint.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/src/TimePrint.cxx b/src/TimePrint.cxx -index 5bf05f6238..d47f3178bb 100644 ---- a/src/TimePrint.cxx -+++ b/src/TimePrint.cxx -@@ -20,5 +20,5 @@ time_print(Response &r, const char *name, - return; - } - -- r.Fmt(FMT_STRING("{}: {}\n"), name, s); -+ r.Fmt(FMT_STRING("{}: {}\n"), name, s.c_str()); - } diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb index 0c309ded00..a762fc8322 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.12.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb @@ -19,12 +19,10 @@ DEPENDS += " \ " SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ + file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \ file://mpd.conf.in \ - file://minor-fixup-for-libfmt10.patch \ - file://fix-build-error-when-fmt-updated.patch \ - file://0001-SndfileDecoderPlugin-Fix-type-mismatch-for-std-span.patch \ " -SRCREV = "b1422fbda40a1831d397fb161e7a555443c2a072" +SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch deleted file mode 100644 index 92094af1f2..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc/0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2e8dc2c28c0938dbbb85ebbac2b9a60be9ccd9f3 Mon Sep 17 00:00:00 2001 -From: Max Kellermann <max@musicpd.org> -Date: Wed, 23 Nov 2022 12:25:50 +0100 -Subject: [PATCH] SearchPage: use regular integer to fix -Wenum-constexpr-conversion - -Upstream-Status: Backport [https://github.com/MusicPlayerDaemon/ncmpc/commit/ddd1757907f0376b5843f707bf182b7827ff6591] ---- - src/SearchPage.cxx | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/SearchPage.cxx b/src/SearchPage.cxx -index 2fa5edbc..3f91c4fe 100644 ---- a/src/SearchPage.cxx -+++ b/src/SearchPage.cxx -@@ -81,7 +81,7 @@ search_get_tag_id(const char *name) - } - - struct SearchMode { -- enum mpd_tag_type table; -+ int table; - const char *label; - }; - -@@ -89,8 +89,8 @@ static constexpr SearchMode mode[] = { - { MPD_TAG_TITLE, N_("Title") }, - { MPD_TAG_ARTIST, N_("Artist") }, - { MPD_TAG_ALBUM, N_("Album") }, -- { (enum mpd_tag_type)SEARCH_URI, N_("Filename") }, -- { (enum mpd_tag_type)SEARCH_ARTIST_TITLE, N_("Artist + Title") }, -+ { SEARCH_URI, N_("Filename") }, -+ { SEARCH_ARTIST_TITLE, N_("Artist + Title") }, - { MPD_TAG_COUNT, nullptr } - }; - --- -2.39.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb index 44046912ed..d93c054f45 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.47.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/ncmpc_0.49.bb @@ -32,9 +32,6 @@ PACKAGECONFIG[lyrics_screen] = "-Dlyrics_screen=true,-Dlyrics_screen=false" PACKAGECONFIG[outputs_screen] = "-Doutputs_screen=true,-Doutputs_screen=false" PACKAGECONFIG[chat_screen] = "-Dchat_screen=true,-Dchat_screen=false" -SRC_URI = " \ - git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https \ - file://0001-SearchPage-use-regular-integer-to-fix-Wenum-constexp.patch \ -" -SRCREV = "fc8de01c71acdf10ad07c7aae756dc522b848124" +SRC_URI = "git://github.com/MusicPlayerDaemon/ncmpc;branch=master;protocol=https" +SRCREV = "f81f875fc5785383d24f54fb9bd3cf06efd915a4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.0.16.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.1.14.0.bb index 4bff4f24b7..36885f29e2 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.0.16.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/nv-codec-headers/nv-codec-headers_12.1.14.0.bb @@ -7,7 +7,7 @@ SRC_URI = " \ git://git.videolan.org/git/ffmpeg/nv-codec-headers.git;branch=master;protocol=https \ file://0001-Makefile-add-clean-target.patch \ " -SRCREV = "c5e4af74850a616c42d39ed45b9b8568b71bf8bf" +SRCREV = "1889e62e2d35ff7aa9baca2bceb14f053785e6f1" S = "${WORKDIR}/git" EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${baselib}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.20.1.bb deleted file mode 100644 index ad70005721..0000000000 --- a/meta-openembedded/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 = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=0f159f19f9377e1895fbb477d5a7953e" - -inherit cmake pkgconfig - -SRCREV = "f5e0eef34db3a3ab94b61a2f99f84f078ba947e7" -SRC_URI = "git://github.com/kcat/openal-soft;branch=master;protocol=https \ - 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-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.23.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.23.1.bb new file mode 100644 index 0000000000..83745703f5 --- /dev/null +++ b/meta-openembedded/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}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.6.bb index ab5813ebe9..be7977308b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.6.bb @@ -4,10 +4,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd2c2486aca02190153cf399e508c7e7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dd2c2486aca02190153cf399e508c7e7" SRC_URI = "${SOURCEFORGE_MIRROR}/opencore-amr/${BP}.tar.gz" -SRC_URI[md5sum] = "09d2c5dfb43a9f6e9fec8b1ae678e725" -SRC_URI[sha256sum] = "106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385" +SRC_URI[md5sum] = "03de025060a4f16c4c44218f65e13e95" +SRC_URI[sha256sum] = "483eb4061088e2b34b358e47540b5d495a96cd468e361050fae615b1809dc4a1" inherit autotools diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index fddfd720da..b18ad6ad1b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -25,9 +25,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ bluealsa \ caps \ cdparanoia \ - dleyna-connector-dbus \ - dleyna-renderer \ - dleyna-server \ dvb-apps \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "faac mpd", "", d)} \ gerbera \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.85.bb index 2a3699f93e..883d02d51b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.81.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.85.bb @@ -2,7 +2,6 @@ SUMMARY = "Multimedia processing server for Linux" DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" HOMEPAGE = "https://pipewire.org/" BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" -AUTHOR = "Wim Taymans <wtaymans@redhat.com>" SECTION = "multimedia" LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" @@ -13,7 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "181fbfee6d3fcc3afd3c93613f126a8346dad586" +SRCREV = "7db1e7f643a454056327999b2d8e35d8097b5593" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch deleted file mode 100644 index 6f9c39996b..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fe4f3c2a37a81201f463ff962364f014f50c9896 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 16 Dec 2019 22:58:41 -0800 -Subject: [PATCH] Use CMAKE_INSTALL_<path> instead of hardcoding bin/lib/ - install paths - -Helps fix build/packaging issues on machines where default libdir is not -lib but say lib64 - -Upstream-Status: Submitted [https://github.com/tinyalsa/tinyalsa/pull/143] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb31c58..1cc4a85 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,12 +41,20 @@ add_util("tinymix" "utils/tinymix.c") - install(FILES ${HDRS} - DESTINATION "include/tinyalsa") - -+if(NOT DEFINED CMAKE_INSTALL_LIBDIR) -+ set(CMAKE_INSTALL_LIBDIR lib) -+endif() -+ -+if(NOT DEFINED CMAKE_INSTALL_BINDIR) -+ set(CMAKE_INSTALL_BINDIR bin) -+endif() -+ - install(TARGETS "tinyalsa" - "tinyplay" - "tinycap" - "tinymix" - "tinypcminfo" -- RUNTIME DESTINATION "bin" -- ARCHIVE DESTINATION "lib" -- LIBRARY DESTINATION "lib") -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - --- -2.24.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch new file mode 100644 index 0000000000..64ebdb19c9 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa/0001-fixed-compilation-error-caused-by-strncpy.patch @@ -0,0 +1,69 @@ +From 639650dd64e483074dd7c3c7ea6dc1b1bd542743 Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Sun, 12 Nov 2023 20:16:55 +0300 +Subject: [PATCH] fixed compilation error caused by strncpy + +Issue: + https://github.com/tinyalsa/tinyalsa/issues/219 + +Fix: + https://github.com/tinyalsa/tinyalsa/pull/220 + https://github.com/tinyalsa/tinyalsa/pull/221 + +Upstream-Status: Submitted + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + src/mixer_plugin.c | 8 +++++--- + src/pcm_plugin.c | 9 ++++++--- + 2 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/src/mixer_plugin.c b/src/mixer_plugin.c +index 34117a9..f608563 100644 +--- a/src/mixer_plugin.c ++++ b/src/mixer_plugin.c +@@ -82,7 +82,8 @@ static int mixer_plug_get_elem_id(struct mixer_plug_data *plug_data, + id->iface = ctl->iface; + + strncpy((char *)id->name, (char *)ctl->name, +- sizeof(id->name)); ++ sizeof(id->name) - 1); ++ ((char *)id->name)[sizeof(id->name) - 1] = '\0'; + + return 0; + } +@@ -100,8 +101,9 @@ static int mixer_plug_info_enum(struct snd_control *ctl, + + strncpy(einfo->value.enumerated.name, + val->texts[einfo->value.enumerated.item], +- sizeof(einfo->value.enumerated.name)); +- ++ sizeof(einfo->value.enumerated.name) - 1); ++ einfo->value.enumerated.name[sizeof(einfo->value.enumerated.name) - 1] = '\0'; ++ + return 0; + } + +diff --git a/src/pcm_plugin.c b/src/pcm_plugin.c +index 15bfc80..47bf4a5 100644 +--- a/src/pcm_plugin.c ++++ b/src/pcm_plugin.c +@@ -153,9 +153,12 @@ static int pcm_plug_info(struct pcm_plug_data *plug_data, + return ret; + } + +- strncpy((char *)info->id, name, sizeof(info->id)); +- strncpy((char *)info->name, name, sizeof(info->name)); +- strncpy((char *)info->subname, name, sizeof(info->subname)); ++ strncpy((char *)info->id, name, sizeof(info->id) - 1); ++ ((char *)info->id)[sizeof(info->id) - 1] = '\0'; ++ strncpy((char *)info->name, name, sizeof(info->name) - 1); ++ ((char *)info->name)[sizeof(info->name) - 1] = '\0'; ++ strncpy((char *)info->subname, name, sizeof(info->subname) - 1); ++ ((char *)info->subname)[sizeof(info->subname) - 1] = '\0'; + + info->subdevices_count = 1; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb index 68cf8795a6..e261611afd 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_2.0.0.bb @@ -4,13 +4,12 @@ HOMEPAGE = "https://github.com/tinyalsa/tinyalsa" SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://NOTICE;md5=dbdefe400d894b510a9de14813181d0b" +LIC_FILES_CHKSUM = "file://NOTICE;md5=e04cd6fa58488e016f7fb648ebea1db4" -SRCREV = "8449529c7e50f432091539ba7b438e79b04059b5" +SRCREV = "1c5fb68ced57d838f2b7ecd0c00bc1fefc9ab60d" SRC_URI = "git://github.com/tinyalsa/tinyalsa;branch=master;protocol=https \ - file://0001-Use-CMAKE_INSTALL_-path-instead-of-hardcoding-bin-li.patch \ + file://0001-fixed-compilation-error-caused-by-strncpy.patch \ " -PV = "1.1.1+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb index 0b472b81d9..42c771e0ff 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.4.3.bb @@ -9,5 +9,4 @@ inherit autotools EXTRA_OECONF = " --disable-doc " -SRC_URI[md5sum] = "7b74f2e142b13c9de6dc8d807ab912d4" -SRC_URI[sha256sum] = "78c2ed77ec9c0d8fbed7bf7d3abc82068b8864be494cfad165821377ff3f2575" +SRC_URI[sha256sum] = "233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.15.bb index 6f93b443d2..5a180d1e07 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.14.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.4.15.bb @@ -1,7 +1,6 @@ SUMMARY = "Session / policy manager implementation for PipeWire" HOMEPAGE = "https://gitlab.freedesktop.org/pipewire/wireplumber" BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/wireplumber/issues" -AUTHOR = "George Kiagiadakis <george.kiagiadakis@collabora.com>" SECTION = "multimedia" LICENSE = "MIT" @@ -11,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ " -SRCREV = "6d0c7f7b7f484b3cd2aaf2e2b3cc902c095b4946" +SRCREV = "d67b48e595cb4612fd7fd47f97df6b8883ef7f60" SRC_URI = " \ git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ @@ -133,7 +132,7 @@ CONFFILES:${PN} += " \ # itself to become a daemon, in practice, the PipeWire daemon is used. RRECOMMENDS:${PN} += "pipewire ${PN}-scripts ${PN}-modules-meta" -FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir}" +FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir}/zsh" FILES:libwireplumber = " \ ${libdir}/libwireplumber-*.so.* \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb index 250af58e17..2d4f389e34 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/x265/x265_3.2.1.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b5 inherit lib_package pkgconfig cmake do_generate_toolchain_file:append() { - echo "set(CMAKE_ASM_NASM_FLAGS --debug-prefix-map ${S}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR})" >> ${WORKDIR}/toolchain.cmake + echo "set(CMAKE_ASM_NASM_FLAGS --debug-prefix-map ${S}=${TARGET_DBGSRC_DIR})" >> ${WORKDIR}/toolchain.cmake } EXTRA_OECMAKE:append:x86 = " -DENABLE_ASSEMBLY=OFF" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.6.bb index ad42e27278..376dd15d17 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.6.bb @@ -7,12 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0 gdk-pixbuf" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection vala features_check SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" -SRC_URI[sha256sum] = "07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6" +SRC_URI[sha256sum] = "c3bc5025d7db380587f9c8eb800c611f6b5a16d6b4b78fcff93f62876a677f17" S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.4.2.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.5.0.bb index b17e4767b4..d1cbe0f590 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_2.5.0.bb @@ -8,8 +8,8 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1" -SRC_URI = "git://github.com/cisco/libsrtp.git;branch=2_4_x_throttle;protocol=https" -SRCREV = "90d05bf8980d16e4ac3f16c19b77e296c4bc207b" +SRC_URI = "git://github.com/cisco/libsrtp.git;branch=main;protocol=https" +SRCREV = "a566a9cfcd619e8327784aa7cff4a1276dc1e895" S = "${WORKDIR}/git" |