diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
8 files changed, 147 insertions, 22 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index fc80cc0acf..9d311608e4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb @@ -7,12 +7,46 @@ DEPENDS = "zlib" PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \ - http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \ + ${DEBIAN_MIRROR}/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-16.2.debian.tar.xz;name=patch;subdir=${BP} \ file://acdefine.patch \ " SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7" SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079" -SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b" -SRC_URI[patch.sha256sum] = "9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c" +SRC_URI[patch.md5sum] = "997c764d3be11c9a51779d93facf1118" +SRC_URI[patch.sha256sum] = "ac2ee23ec89ba2af51d2c6dd5b1b6bf9f8a9f813de251bc182941439a4053176" inherit autotools + +# Unlike other Debian packages, id3lib*.diff.gz contains another series of +# patches maintained by quilt. So manually apply them before applying other local +# patches. Also remove all temp files before leaving, because do_patch() will pop +# up all previously applied patches in the start +id3lib_do_patch() { + cd ${S} + # it's important that we only pop the existing patches when they've + # been applied, otherwise quilt will climb the directory tree + # and reverse out some completely different set of patches + if [ -d ${S}/patches ]; then + # whilst this is the default directory, doing it like this + # defeats the directory climbing that quilt will otherwise + # do; note the directory must exist to defeat this, hence + # the test inside which we operate + QUILT_PATCHES=${S}/patches quilt pop -a + fi + if [ -d ${S}/.pc-id3lib ]; then + rm -rf ${S}/.pc + mv ${S}/.pc-id3lib ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + QUILT_PATCHES=${S}/debian/patches quilt push -a + mv ${S}/.pc ${S}/.pc-id3lib +} + +do_unpack[cleandirs] += "${S}" + +# We invoke base do_patch at end, to incorporate any local patch +python do_patch() { + bb.build.exec_func('id3lib_do_patch', d) + bb.build.exec_func('patch_do_patch', d) +} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.bb index 612000e674..73e8e3f564 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.2.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] = "b32edefdd9a978edc65aacddfe7c588a" -SRC_URI[sha256sum] = "582b12c236c1365211946f2fe3c254976af37bbec244051f7742a98ded9be2bd" +SRC_URI[md5sum] = "096f4acfba00f1210a84fb7650f7693d" +SRC_URI[sha256sum] = "7b32db1719d7f6516cce82a9d00dfddfb3581725db732ea87d41ea8ef0ce5227" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.2.bb index d68e792bab..2ca74f6da8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.0.2.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "b9eeaaaf3c41b1c3cb6c1622e7219aeb" -SRC_URI[sha256sum] = "28ce4f0063883ca4d37dfd40a2f6685503d679bca7d88d58e04ee8112382d5bd" +SRC_URI[md5sum] = "49990935174bf6b2fa501e789c578135" +SRC_URI[sha256sum] = "f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index 1ba9f0f6c8..29bcfe49f5 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -29,6 +29,8 @@ inherit waf pkgconfig pythonnative features_check LUA ?= "lua" LUA_mips64 = "" LUA_aarch64 = "" +LUA_powerpc64 = "" + # Note: both lua and libass are required to get on-screen-display (controls) PACKAGECONFIG ??= " \ ${LUA} \ 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 new file mode 100644 index 0000000000..57948add6e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0005-Define-error_t-and-include-sys-types.h.patch @@ -0,0 +1,45 @@ +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 new file mode 100644 index 0000000000..a8926762ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0006-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +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/0003-v4l2-ctl-Do-not-use-getsubopt.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch index 5b84af2c32..ac704c72dc 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch @@ -1,24 +1,26 @@ -From f7a4b79b3323534460a63b3e6c58ebaf06adf207 Mon Sep 17 00:00:00 2001 +From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 13:20:05 -0700 -Subject: [PATCH] v4l2-ctl: Do not use getsubopt +Date: Sat, 30 Nov 2019 18:50:34 -0800 +Subject: [PATCH] Do not use getsubopt POSIX says that behavior when subopts list is empty is undefined. musl libs will set value to NULL which leads to crash. -Taken from AlpineLinux +Simply avoid getsubopt, since we cannot rely on it. -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Imported from Alpine Linux +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - utils/v4l2-ctl/v4l2-ctl-common.cpp | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) + utils/v4l2-ctl/v4l2-ctl-common.cpp | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-common.cpp b/utils/v4l2-ctl/v4l2-ctl-common.cpp -index 3ea6cd3..291fb3e 100644 +index 651917e..cea57b7 100644 --- a/utils/v4l2-ctl/v4l2-ctl-common.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -692,16 +692,17 @@ static bool parse_subset(char *optarg) +@@ -782,15 +782,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { @@ -31,8 +33,7 @@ index 3ea6cd3..291fb3e 100644 - if (opt < 0 || *value) - return false; -- fprintf(stderr, "No value given to suboption <%s>\n", -- subopts[opt]); +- fprintf(stderr, "Missing suboption value\n"); - return true; + while (*p && *p != ',') + p++; @@ -44,4 +45,4 @@ index 3ea6cd3..291fb3e 100644 + return false; } - void common_cmd(int ch, char *optarg) + void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.5.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb index 415446844d..9cc2a8e5b4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.5.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.18.0.bb @@ -20,10 +20,12 @@ 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://0003-v4l2-ctl-Do-not-use-getsubopt.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] = "de272817133c0dca000a78a5c8c8ec8b" -SRC_URI[sha256sum] = "ed80242510385017a1dc566e17a285a77222bb301f5bc19386badfcc2c19df1b" +SRC_URI[md5sum] = "18996bd5e9d83d47055c05de376708cd" +SRC_URI[sha256sum] = "6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" |