diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
8 files changed, 11 insertions, 238 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb index 73e8e3f564..0cae7c54bd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "096f4acfba00f1210a84fb7650f7693d" -SRC_URI[sha256sum] = "7b32db1719d7f6516cce82a9d00dfddfb3581725db732ea87d41ea8ef0ce5227" +SRC_URI[md5sum] = "454d03ce31addb5b7dca62d213c9660e" +SRC_URI[sha256sum] = "525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb deleted file mode 100644 index bcb3015f8b..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire-0.2_git.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Multimedia processing server for Linux" -AUTHOR = "Wim Taymans <wtaymans@redhat.com>" -HOMEPAGE = "https://pipewire.org" -SECTION = "multimedia" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ - file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" -DEPENDS = "alsa-lib dbus udev" -SRCREV = "14c11c0fe4d366bad4cfecdee97b6652ff9ed63d" -PV = "0.2.7" - -SRC_URI = "git://github.com/PipeWire/pipewire" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd manpages - -PACKAGECONFIG ??= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - gstreamer \ -" - -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" - -PACKAGES =+ "\ - ${PN}-spa-plugins \ - ${PN}-alsa \ - ${PN}-config \ - gstreamer1.0-${PN} \ - lib${PN} \ - lib${PN}-modules \ -" - -RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" - -FILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ - ${bindir}/pipewire* \ - ${systemd_user_unitdir}/* \ -" -FILES_lib${PN} = "\ - ${libdir}/libpipewire-*.so.* \ -" -FILES_lib${PN}-modules = "\ - ${libdir}/pipewire-*/* \ -" -FILES_${PN}-spa-plugins = "\ - ${bindir}/spa-* \ - ${libdir}/spa/* \ -" -FILES_${PN}-alsa = "\ - ${libdir}/alsa-lib/* \ - ${datadir}/alsa/alsa.conf.d/50-pipewire.conf \ -" -FILES_gstreamer1.0-${PN} = "\ - ${libdir}/gstreamer-1.0/* \ -" - -CONFFILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ -" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb deleted file mode 100644 index 173b695e1f..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/pipewire/pipewire_git.bb +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY = "Multimedia processing server for Linux" -AUTHOR = "Wim Taymans <wtaymans@redhat.com>" -HOMEPAGE = "https://pipewire.org" -SECTION = "multimedia" -LICENSE = "MIT" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ - file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ -" -DEPENDS = "alsa-lib dbus udev" -SRCREV = "74a1632f0720886d5b3b6c23ee8fcd6c03ca7aac" -PV = "0.3.1" - -SRC_URI = "git://github.com/PipeWire/pipewire" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd manpages - -PACKAGECONFIG ??= "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio systemd vulkan', d)} \ - jack gstreamer \ -" - -PACKAGECONFIG[bluez] = "-Dbluez5=true,-Dbluez5=false,bluez5 sbc" -PACKAGECONFIG[jack] = "-Djack=true,-Djack=false,jack" -PACKAGECONFIG[gstreamer] = "-Dgstreamer=true,-Dgstreamer=false,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxml-parser-perl-native" -PACKAGECONFIG[pulseaudio] = "-Dpipewire-pulseaudio=true,-Dpipewire-pulseaudio=false,pulseaudio" -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[vulkan] = "-Dvulkan=true,-Dvulkan=false,vulkan-loader" - -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_x86 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" - -PACKAGES =+ "\ - ${PN}-spa-plugins \ - ${PN}-alsa \ - ${PN}-config \ - gstreamer1.0-${PN} \ - lib${PN} \ - lib${PN}-modules \ - lib${PN}-jack \ -" - -RDEPENDS_lib${PN} += "lib${PN}-modules ${PN}-spa-plugins" - -FILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ - ${bindir}/pw-* \ - ${bindir}/pipewire* \ - ${systemd_user_unitdir}/* \ -" -FILES_lib${PN} = "\ - ${libdir}/libpipewire-*.so.* \ - ${libdir}/libjack-*.so.* \ - ${libdir}/libpulse-*.so.* \ -" -FILES_lib${PN}-modules = "\ - ${libdir}/pipewire-*/* \ -" -FILES_${PN}-spa-plugins = "\ - ${bindir}/spa-* \ - ${libdir}/spa-*/* \ -" -FILES_${PN}-alsa = "\ - ${libdir}/alsa-lib/* \ -" -FILES_gstreamer1.0-${PN} = "\ - ${libdir}/gstreamer-1.0/* \ -" - -CONFFILES_${PN} = "\ - ${sysconfdir}/pipewire/pipewire.conf \ -" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch index 8033fcacf2..a849d465c7 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch @@ -14,7 +14,7 @@ diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am index 0188fe2..dac07f3 100644 --- a/contrib/test/Makefile.am +++ b/contrib/test/Makefile.am -@@ -40,7 +40,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS) +@@ -42,7 +42,7 @@ sdlcam_CFLAGS = -I../.. $(SDL2_CFLAGS) sdlcam_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la mc_nextgen_test_CFLAGS = $(LIBUDEV_CFLAGS) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch deleted file mode 100644 index 57948add6e..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 137ce23ae677b11e5483ef810751edae7bf96bb9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Nov 2019 18:40:06 -0800 -Subject: [PATCH] Define error_t and include sys/types.h - -Fix 'unknown type name' for error_t and u_int32_t. -u_int32_t is defined in sys/type.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/ir-ctl/keymap.h | 4 ++++ - utils/keytable/keymap.h | 5 +++++ - 2 files changed, 9 insertions(+) - -diff --git a/utils/ir-ctl/keymap.h b/utils/ir-ctl/keymap.h -index f2b2963..1f8a3f8 100644 ---- a/utils/ir-ctl/keymap.h -+++ b/utils/ir-ctl/keymap.h -@@ -2,6 +2,10 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <sys/types.h> -+#ifndef error_t -+typedef int error_t; -+#endif - struct keymap { - struct keymap *next; - char *name; -diff --git a/utils/keytable/keymap.h b/utils/keytable/keymap.h -index f2b2963..345d55d 100644 ---- a/utils/keytable/keymap.h -+++ b/utils/keytable/keymap.h -@@ -2,6 +2,11 @@ - #ifndef __KEYMAP_H - #define __KEYMAP_H - -+#include <sys/types.h> -+#ifndef error_t -+typedef int error_t; -+#endif -+ - struct keymap { - struct keymap *next; - char *name; diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index a8926762ed..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b213da2d5fcc93cd24fc880c71c717d8e2ce2968 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Nov 2019 18:43:21 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/keytable/keytable.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c -index 6cb0217..59ff1ee 100644 ---- a/utils/keytable/keytable.c -+++ b/utils/keytable/keytable.c -@@ -53,6 +53,11 @@ - - # define N_(string) string - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - struct input_keymap_entry_v2 { - #define KEYMAP_BY_INDEX (1 << 0) - u_int8_t flags; -@@ -1533,7 +1538,7 @@ static void test_event(struct rc_device *rc_dev, int fd) - - for (i = 0; i < rd / sizeof(struct input_event); i++) { - printf(_("%ld.%06ld: event type %s(0x%02x)"), -- ev[i].time.tv_sec, ev[i].time.tv_usec, -+ ev[i].input_event_sec, ev[i].input_event_usec, - get_event_name(events_type, ev[i].type), ev[i].type); - - switch (ev[i].type) { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch index ac704c72dc..e3ce45d167 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch @@ -20,7 +20,7 @@ diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common index 651917e..cea57b7 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) +@@ -785,15 +785,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb index 193335deaa..3e92d49b4f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb @@ -20,14 +20,14 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ - file://0005-Define-error_t-and-include-sys-types.h.patch \ - file://0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://0007-Do-not-use-getsubopt.patch \ " -SRC_URI[md5sum] = "ff2dd75970683be9a301ed949b3372b3" -SRC_URI[sha256sum] = "25fc42253722401f8742f04dc50a444dfa9b75378e7d09b55035bcbb44c5f342" +SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894" +SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" -EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" +EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ + --disable-v4l2-compliance-32 --disable-v4l2-ctl-32 \ + --with-systemdsystemunitdir=${systemd_system_unitdir}" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" @@ -37,7 +37,8 @@ RPROVIDES_${PN}-dbg += "libv4l-dbg" FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" -FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" +FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules \ + ${systemd_system_unitdir}/systemd-udevd.service.d/50-rc_keymap.conf" RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" |