diff options
Diffstat (limited to 'meta-multimedia/recipes-support')
10 files changed, 158 insertions, 68 deletions
diff --git a/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch b/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..a12eba8ebf --- /dev/null +++ b/meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch @@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/graeme-hill/crossguid/pull/67] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <jni.h> + #endif + ++#include <cstdint> + #include <functional> + #include <iostream> + #include <array> +-- +2.39.1 + diff --git a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb index 7441716635..5e680c4640 100644 --- a/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb +++ b/meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb @@ -7,14 +7,14 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" -SRCREV = "5b45cdd9a56ca9da35ee0f8845cb4e2603d245dc" -SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https" +SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681" +SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" S = "${WORKDIR}/git" inherit cmake -do_install() { - install -D -m 0644 ${B}/libxg.a ${D}${libdir}/libxg.a - install -D -m 0644 ${S}/Guid.hpp ${D}${includedir}/Guid.hpp +do_install:append() { + sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${datadir}/crossguid/cmake/crossguid-config.cmake } diff --git a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index feffa9fe19..04d16ffe11 100644 --- a/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb +++ b/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -2,19 +2,22 @@ SUMMARY = "Profiling utilities for GStreamer 1.0 pipelines" HOMEPAGE = "https://github.com/kirushyk/gst-instruments" SECTION = "multimedia" -LICENSE = "LGPL-3.0" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" - DEPENDS = "gstreamer1.0" +SRCREV = "cb8977a6711657e32853159cd539d1d75fcbc772" +PV = "0.3.1+git" + +SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "3b862e52e5c53ad1023dc6808effa4cb75572c4b" -SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;" -FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*a" -FILES_${PN} += "${libdir}/*" +inherit vala meson pkgconfig -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN}-staticdev += "${libdir}/gstreamer-1.0/*a" +FILES:${PN} += "${libdir}/*" -inherit autotools pkgconfig +INSANE_SKIP:${PN}-dev = "dev-elf" +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'ui', '', d)}" +PACKAGECONFIG[ui] = "-Dui=enabled,-Dui=disabled,gtk+3" diff --git a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.6.bb index 31fe43bfa7..376dd15d17 100644 --- a/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb +++ b/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.6.bb @@ -1,23 +1,22 @@ SUMMARY = "Library tasked with managing, extracting and handling media art caches" -LICENSE = "LGPLv2+ & GPLv2+" +LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" 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}" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST = "introspection" +GIR_MESON_OPTION = "" EXTRA_OEMESON = "-Dimage_library=gdk-pixbuf" diff --git a/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb b/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb deleted file mode 100644 index 9d4c305fc7..0000000000 --- a/meta-multimedia/recipes-support/libsrtp/libsrtp_2.3.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "library implementing Secure RTP (RFC 3711)" -HOMEPAGE = "https://github.com/cisco/libsrtp" -SECTION = "libs" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1" - -S = "${WORKDIR}/git" -SRCREV = "d02d21111e379c297e93a9033d7b653135f732ee" -SRC_URI = "git://github.com/cisco/libsrtp.git" - -inherit autotools pkgconfig - -EXTRA_OEMAKE += "shared_library" - -do_configure_prepend() { - cp ${STAGING_DATADIR_NATIVE}/automake-*/ar-lib ${S} -} - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-multimedia/recipes-support/libsrtp/libsrtp_2.5.0.bb b/meta-multimedia/recipes-support/libsrtp/libsrtp_2.5.0.bb new file mode 100644 index 0000000000..d1cbe0f590 --- /dev/null +++ b/meta-multimedia/recipes-support/libsrtp/libsrtp_2.5.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Library implementing Secure RTP (RFC 3711)" +DESCRIPTION = "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), \ + the Universal Security Transform (UST), and a supporting cryptographic kernel. The SRTP API \ + is documented in include/srtp.h, and the library is in libsrtp2.a (after compilation)." +HOMEPAGE = "https://github.com/cisco/libsrtp" +BUGTRACKER = "https://github.com/cisco/libsrtp/issues" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1" + +SRC_URI = "git://github.com/cisco/libsrtp.git;branch=main;protocol=https" +SRCREV = "a566a9cfcd619e8327784aa7cff4a1276dc1e895" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[nss] = "-Dcrypto-library=nss,, nss,,, openssl" +PACKAGECONFIG[openssl] = "-Dcrypto-library=openssl,, openssl,,, nss" + +inherit meson pkgconfig diff --git a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch b/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch deleted file mode 100644 index 0cb6943ccb..0000000000 --- a/meta-multimedia/recipes-support/srt/srt/0001-core-Fix-build-with-GCC-11.-1806.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f1b35cbf5b9b42b031e9b119e4c802b5f744468c Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux <krop@users.noreply.github.com> -Date: Wed, 10 Feb 2021 12:42:45 +0000 -Subject: [PATCH] [core] Fix build with GCC 11. (#1806) - -The 'limits' header must be included explicitly. ---- -Upstream-Status: Backport [https://github.com/haivision/srt/commit/f1b35cbf5b9b42b031e9b119e4c802b5f744468c] - srtcore/sync.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/srtcore/sync.h b/srtcore/sync.h -index 59c125a7..9f01ca91 100644 ---- a/srtcore/sync.h -+++ b/srtcore/sync.h -@@ -15,6 +15,7 @@ - //#define ENABLE_CXX17 - - #include <cstdlib> -+#include <limits> - #ifdef ENABLE_STDCXX_SYNC - #include <chrono> - #include <thread> --- -2.30.1 - diff --git a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb b/meta-multimedia/recipes-support/srt/srt_1.4.4.bb index f7dfda28f1..d6cf36dfbe 100644 --- a/meta-multimedia/recipes-support/srt/srt_1.4.2.bb +++ b/meta-multimedia/recipes-support/srt/srt_1.4.4.bb @@ -6,10 +6,9 @@ HOMEPAGE = "https://github.com/Haivision/srt" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad" -SRCREV = "50b7af06f3a0a456c172b4cb3aceafa8a5cc0036" -SRC_URI = "git://github.com/Haivision/srt;protocol=https \ +SRCREV = "8b32f3734ff6af7cc7b0fef272591cb80a2d1aae" +SRC_URI = "git://github.com/Haivision/srt;protocol=https;branch=master \ file://0001-don-t-install-srt-ffplay.patch \ - file://0001-core-Fix-build-with-GCC-11.-1806.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -24,5 +23,5 @@ PACKAGECONFIG[crypt] = "-DENABLE_ENCRYPTION=ON,-DENABLE_ENCRYPTION=OFF,openssl" PACKAGECONFIG[utils] = "-DENABLE_APPS=ON,-DENABLE_APPS=OFF," PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'utils', '${PN}-utils', '', d)}" -FILES_${PN}-utils += "${bindir}" -RDEPENDS_${PN}-utils += "${PN}" +FILES:${PN}-utils += "${bindir}" +RDEPENDS:${PN}-utils += "${PN}" diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch new file mode 100644 index 0000000000..ff4fcc292a --- /dev/null +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr/0001-screencast-Fix-build-with-older-mesa.patch @@ -0,0 +1,53 @@ +From ef60a76e2a21b7649632dcf71d125039604a56b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 18 Jun 2023 10:42:19 -0700 +Subject: [PATCH] screencast: Fix build with older mesa + +gbm_bo_create_with_modifiers2() is quite new and there are still distros +that ship 21.2 and older. e.g. powerVR mesa implementation + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/screencast/pipewire_screencast.c | 8 ++++++-- + src/screencast/screencast_common.c | 4 ++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/screencast/pipewire_screencast.c b/src/screencast/pipewire_screencast.c +index 0611fd5..7d66810 100644 +--- a/src/screencast/pipewire_screencast.c ++++ b/src/screencast/pipewire_screencast.c +@@ -234,9 +234,13 @@ static void pwr_handle_stream_param_changed(void *data, uint32_t id, + uint32_t n_params; + struct spa_pod_builder *builder[2] = {&b[0].b, &b[1].b}; + +- struct gbm_bo *bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, ++ struct gbm_bo *bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, + cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, +- cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers, flags); ++ cast->screencopy_frame_info[cast->buffer_type].format, modifiers, n_modifiers); ++ if(!bo) ++ bo = gbm_bo_create(cast->ctx->gbm, ++ cast->screencopy_frame_info[cast->buffer_type].width, cast->screencopy_frame_info[cast->buffer_type].height, ++ cast->screencopy_frame_info[cast->buffer_type].format, GBM_BO_USE_RENDERING); + if (bo) { + modifier = gbm_bo_get_modifier(bo); + gbm_bo_destroy(bo); +diff --git a/src/screencast/screencast_common.c b/src/screencast/screencast_common.c +index d6d13db..2e4fc18 100644 +--- a/src/screencast/screencast_common.c ++++ b/src/screencast/screencast_common.c +@@ -143,8 +143,8 @@ struct xdpw_buffer *xdpw_buffer_create(struct xdpw_screencast_instance *cast, + uint32_t flags = GBM_BO_USE_RENDERING; + if (cast->pwr_format.modifier != DRM_FORMAT_MOD_INVALID) { + uint64_t *modifiers = (uint64_t*)&cast->pwr_format.modifier; +- buffer->bo = gbm_bo_create_with_modifiers2(cast->ctx->gbm, frame_info->width, frame_info->height, +- frame_info->format, modifiers, 1, flags); ++ buffer->bo = gbm_bo_create_with_modifiers(cast->ctx->gbm, frame_info->width, frame_info->height, ++ frame_info->format, modifiers, 1); + } else { + if (cast->ctx->state->config->screencast_conf.force_mod_linear) { + flags |= GBM_BO_USE_LINEAR; +-- +2.41.0 + diff --git a/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb new file mode 100644 index 0000000000..8ffe652b22 --- /dev/null +++ b/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "This provides screenshot/screencast xdg-desktop-portal backends for wlroots." +HOMEPAGE = "https://github.com/emersion/xdg-desktop-portal-wlr" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e316e9609dd7672b87ff25b46b2cf3e1" + +DEPENDS = " \ + wayland \ + wayland-native \ + wayland-protocols \ + libdrm \ + libinih \ + pipewire \ + virtual/libgbm \ +" + +inherit meson pkgconfig features_check +REQUIRED_DISTRO_FEATURES = "opengl wayland" + +SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;branch=master \ + file://0001-screencast-Fix-build-with-older-mesa.patch" + +S = "${WORKDIR}/git" +SRCREV = "776113a4f014639c29d8de8fcb513493ef7b491f" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" + +PACKAGECONFIG[man-pages] = "-Dman-pages=enabled,-Dman-pages=disabled,scdoc-native" +PACKAGECONFIG[systemd] = "-Dsystemd=enabled -Dsd-bus-provider=libsystemd,-Dsystemd=disabled" +PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu" + +FILES:${PN} += "${systemd_user_unitdir} ${datadir}" |