diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-12-30 10:44:23 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-12-30 11:06:30 -0800 |
| commit | c6c636e3203f987afd83ab0dda358cb636461492 (patch) | |
| tree | 3692238548cfe7882c6ab58ebe8df5f60d5ec868 /meta-multimedia | |
| parent | 639d7378ce5a049e3e035e77162cc9b1013d4980 (diff) | |
| download | meta-openembedded-c6c636e3203f987afd83ab0dda358cb636461492.tar.gz | |
Revert "libcamera: skip until upstream resolves python 3.12 compatibility"
This reverts commit dd402176a6e28df76e4b737cec7d266b5bfbfa06.
Diffstat (limited to 'meta-multimedia')
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 9c04d7434..2a3c6473e 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" | |||
| 73 | # both 32 and 64 bit file APIs. | 73 | # both 32 and 64 bit file APIs. |
| 74 | GLIBC_64BIT_TIME_FLAGS = "" | 74 | GLIBC_64BIT_TIME_FLAGS = "" |
| 75 | 75 | ||
| 76 | 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 6ca4d539f..672c8abc9 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 = "\ | |||
| 42 | tearsofsteel-1080p \ | 42 | tearsofsteel-1080p \ |
| 43 | pipewire \ | 43 | pipewire \ |
| 44 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \ | 44 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "projucer", "", d), "", d)} \ |
| 45 | libcamera \ | ||
| 45 | vorbis-tools \ | 46 | vorbis-tools \ |
| 46 | libopenmpt \ | 47 | libopenmpt \ |
| 47 | mimic \ | 48 | 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 4d894349a..b4da781f0 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 ??= " \ | |||
| 86 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ | 86 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \ |
| 87 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ | 87 | ${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \ |
| 88 | ${PIPEWIRE_SESSION_MANAGER} \ | 88 | ${PIPEWIRE_SESSION_MANAGER} \ |
| 89 | ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling readline \ | 89 | ${FFMPEG_AVAILABLE} avahi flatpak gstreamer gsettings jack libusb pw-cat raop sndfile v4l2 udev volume webrtc-echo-cancelling libcamera readline \ |
| 90 | " | 90 | " |
| 91 | 91 | ||
| 92 | # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, | 92 | # "jack" and "pipewire-jack" packageconfigs cannot be both enabled, |