From c6c636e3203f987afd83ab0dda358cb636461492 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Dec 2023 10:44:23 -0800 Subject: [PATCH] Revert "libcamera: skip until upstream resolves python 3.12 compatibility" This reverts commit dd402176a6e28df76e4b737cec7d266b5bfbfa06. --- meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb | 1 - .../packagegroups/packagegroup-meta-multimedia.bb | 1 + meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb index 9c04d7434f..2a3c6473ee 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb @@ -73,4 +73,3 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0" # both 32 and 64 bit file APIs. GLIBC_64BIT_TIME_FLAGS = "" -SKIP_RECIPE[libcamera] ?= "Not compatible with python 3.12, see https://bugs.libcamera.org/show_bug.cgi?id=206" diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 6ca4d539fb..672c8abc9a 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -42,6 +42,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\ tearsofsteel-1080p \ pipewire \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \ + libcamera \ vorbis-tools \ libopenmpt \ mimic \ diff --git a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb index 4d894349a1..b4da781f0f 100644 --- a/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb +++ b/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.0.bb @@ -86,7 +86,7 @@ PACKAGECONFIG:class-target ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ ${PIPEWIRE_SESSION_MANAGER} \ - ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \ + ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \ " # "jack" and "pipewire-jack" packageconfigs cannot be both enabled,