diff options
Diffstat (limited to 'meta-oe/recipes-multimedia')
70 files changed, 1655 insertions, 1432 deletions
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb deleted file mode 100644 index 6b955dcfd9..0000000000 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a" -DEPENDS = "alsa-lib" - -SRC_URI = "https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "9ec4bb783fdce19032aace086d65d874" -SRC_URI[sha256sum] = "64adcef5927e848d2e024e64c4bf85b6f395964d9974ec61905ae4cb8d35d68e" - -inherit autotools - -LEAD_SONAME = "libaoss.so.0" - -do_configure_prepend () { - touch NEWS README AUTHORS ChangeLog - sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in -} - -# http://errors.yoctoproject.org/Errors/Details/186961/ -COMPATIBLE_HOST_libc-musl = 'null' diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb index f4e19e4ad3..a09f84381e 100644 --- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb @@ -4,7 +4,7 @@ WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ Research, Amiga IFF/8SVX, and NIST SPHERE." HOMEPAGE = "http://www.68k.org/~michael/audiofile/" SECTION = "libs" -LICENSE = "LGPLv2 & GPLv2" +LICENSE = "LGPL-2.0-only & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -19,6 +19,8 @@ SRC_URI[sha256sum] = "ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8c inherit autotools lib_package pkgconfig +CXXFLAGS += "-std=c++14" + DEPENDS = " \ asciidoc-native \ alsa-lib \ diff --git a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch index ecb3108050..4792a15e86 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + libaudiofile/modules/SimpleModule.h | 2 +- test/FloatToInt.cpp | 2 +- test/IntToFloat.cpp | 2 +- diff --git a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch index 2c66cf4d00..dea8187ccb 100644 --- a/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch +++ b/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch @@ -14,6 +14,8 @@ Upstrem-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- +Upstream-Status: Pending + test/NeXT.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index 3344821fa0..9fd91114d7 100644 --- a/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -1,7 +1,7 @@ SUMMARY = "CD/DVD command line tools" HOMEPAGE = "http://cdrkit.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b30d3b2750b668133fc17b401e1b98f8" # While writing download from cdrkit.org was broken so get sources from debian @@ -11,22 +11,29 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-define-__THROW-to-avoid-build-issue-with-musl.patch \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ file://0001-genisoimage-Add-missing-extern-definition.patch \ + file://0001-add-new-option-eltorito-platform.patch \ + file://0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch \ " +SRC_URI:append:class-nativesdk = " \ + file://0001-install-netscsid-to-bin-for-nativesdk.patch \ +" SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" inherit cmake DEPENDS = "libcap file bzip2" -RDEPENDS_dirsplit = "perl" +RDEPENDS:dirsplit = "perl" + +RDEPENDS:${PN}-dev = "" PACKAGES =+ "dirsplit genisoimage icedax wodim" -FILES_dirsplit = " \ +FILES:dirsplit = " \ ${bindir}/dirsplit \ " -FILES_genisoimage = " \ +FILES:genisoimage = " \ ${bindir}/devdump \ ${bindir}/genisoimage \ ${bindir}/isodebug \ @@ -36,7 +43,7 @@ FILES_genisoimage = " \ ${bindir}/mkisofs \ " -FILES_icedax = " \ +FILES:icedax = " \ ${bindir}/cdda2mp3 \ ${bindir}/cdda2ogg \ ${bindir}/icedax \ @@ -44,14 +51,14 @@ FILES_icedax = " \ ${bindir}/readmult \ " -FILES_wodim = " \ +FILES:wodim = " \ ${bindir}/readom \ ${bindir}/wodim \ ${sbindir}/netscsid \ " -do_install_append() { - ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs +do_install:append() { + ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-add-new-option-eltorito-platform.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-add-new-option-eltorito-platform.patch new file mode 100644 index 0000000000..dac3328a42 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-add-new-option-eltorito-platform.patch @@ -0,0 +1,335 @@ +From 5a2d571f3687910260c45841725f2deb84c8f12e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Mon, 25 Apr 2022 18:18:00 +0800 +Subject: [PATCH] add new option -eltorito-platform + +Mkisofs now correctly supports El Torito multi boot entries by introducing +a Boot Dection Header before a list of alternate boot entries. + +New option -eltorito-platform allows to set the El Torito platform id +for a boot entry or for a list of boot entries. Supported values for +the parameter are: +- x86 the standard value vor x86 based PCs +- PPC the Power PC platform +- Mac The Apple Mac platform +- efi EFI based boot for PCs +- # an arbitrary numerical value + +Upstream-Status: Inappropriate [port from cdrtools] +https://github.com/jobermayr/cdrtools/commit/a50804fd61d75eb689a515dbfca6968ca2296fd7 + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + genisoimage/eltorito.c | 73 +++++++++++++++++++++++++++++++++++++-- + genisoimage/genisoimage.c | 47 +++++++++++++++++++++++++ + genisoimage/genisoimage.h | 8 +++++ + genisoimage/iso9660.h | 33 ++++++++++++++++-- + 4 files changed, 157 insertions(+), 4 deletions(-) + +diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c +index d52e17e..a804988 100644 +--- a/genisoimage/eltorito.c ++++ b/genisoimage/eltorito.c +@@ -56,6 +56,7 @@ static unsigned int bcat_de_flags; + void init_boot_catalog(const char *path); + void insert_boot_cat(void); + static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc); ++static void fill_boot_shdr(struct eltorito_sectionheader_entry *boot_shdr_entry, int arch); + static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry, + struct eltorito_boot_entry_info *boot_entry); + void get_boot_entry(void); +@@ -282,7 +283,14 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + struct directory_entry *de2; /* Boot catalog */ + int i; + int offset; ++ int arch = 0; ++ int nentries = 0; + struct eltorito_defaultboot_entry boot_desc_record; ++ struct eltorito_sectionheader_entry boot_shdr_record; ++#ifdef __needed__ ++ struct eltorito_section_entry boot_section_record; ++#endif ++ struct eltorito_sectionheader_entry *last_section_header = 0; + + memset(boot_desc, 0, sizeof (*boot_desc)); + boot_desc->type[0] = 0; +@@ -311,13 +319,22 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + set_731(boot_desc->bootcat_ptr, + (unsigned int) get_733(de2->isorec.extent)); + ++ /* ++ * If the platform id for the first (default) boot entry has not been ++ * explicitly set, we default to EL_TORITO_ARCH_x86 ++ */ ++ if ((first_boot_entry->type & ELTORITO_BOOT_ID) == 0) { ++ first_boot_entry->boot_platform = EL_TORITO_ARCH_x86; ++ } ++ arch = first_boot_entry->boot_platform; ++ + /* + * we have the boot image, so write boot catalog information + * Next we write out the primary descriptor for the disc + */ + memset(&valid_desc, 0, sizeof (valid_desc)); + valid_desc.headerid[0] = 1; +- valid_desc.arch[0] = EL_TORITO_ARCH_x86; ++ valid_desc.arch[0] = arch; /* Platform id for the default boot */ + + /* + * we'll shove start of publisher id into id field, +@@ -351,8 +368,17 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + current_boot_entry != NULL; + current_boot_entry = current_boot_entry->next, + offset += sizeof (boot_desc_record)) { ++ int newarch = arch; + +- if (offset >= SECTOR_SIZE) { ++ if (current_boot_entry->type & ELTORITO_BOOT_ID) ++ newarch = current_boot_entry->boot_platform; ++ else ++ current_boot_entry->boot_platform = arch; ++ ++ /* ++ * El Torito has no such limitation but we currently have... ++ */ ++ if (offset >= (SECTOR_SIZE - sizeof (boot_desc_record))) { + #ifdef USE_LIBSCHILY + comerrno(EX_BAD, + "Too many El Torito boot entries\n"); +@@ -362,12 +388,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc) + exit(1); + #endif + } ++ ++ if (current_boot_entry == first_boot_entry) { ++ ; ++ /* EMPTY */ ++ } else if ((current_boot_entry == first_boot_entry->next) || ++ (arch != newarch) || ++ (current_boot_entry->type & ELTORITO_SECTION_HEADER)) { ++ if (last_section_header) ++ set_721(&last_section_header->entry_count, nentries); ++ nentries = 1; ++ last_section_header = (struct eltorito_sectionheader_entry *) ++ (de2->table + offset); ++ fill_boot_shdr(&boot_shdr_record, newarch); ++ memcpy(de2->table + offset, &boot_shdr_record, ++ sizeof (boot_shdr_record)); ++ offset += sizeof (boot_desc_record); ++ } else { ++ nentries++; /* Add entry to this section header */ ++ } ++ /* ++ * This works because a section entry has the same essential ++ * layout as a default entry (and we do not populate the ++ * selection criteria fields). ++ */ ++ + fill_boot_desc(&boot_desc_record, current_boot_entry); + memcpy(de2->table + offset, &boot_desc_record, + sizeof (boot_desc_record)); + } ++ ++ if (last_section_header) { ++ set_721(&last_section_header->entry_count, nentries); ++ last_section_header->header_id[0] = EL_TORITO_SHDR_ID_LAST_SHDR; ++ } ++ + }/* get_torito_desc(... */ + ++static void ++fill_boot_shdr(boot_shdr_entry, arch) ++ struct eltorito_sectionheader_entry *boot_shdr_entry; ++ int arch; ++{ ++ memset(boot_shdr_entry, 0, sizeof(struct eltorito_sectionheader_entry)); ++ boot_shdr_entry->header_id[0] = EL_TORITO_SHDR_ID_SHDR; ++ boot_shdr_entry->platform_id[0] = arch; ++} ++ + static void + fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry, + struct eltorito_boot_entry_info *boot_entry) +@@ -678,7 +745,9 @@ get_boot_entry() + if (!first_boot_entry) { + first_boot_entry = current_boot_entry; + last_boot_entry = current_boot_entry; ++ current_boot_entry->boot_platform = EL_TORITO_ARCH_x86; + } else { ++ current_boot_entry->boot_platform = last_boot_entry->boot_platform; + last_boot_entry->next = current_boot_entry; + last_boot_entry = current_boot_entry; + } +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index 9089081..84ac3c2 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -271,6 +271,8 @@ struct rcopts { + char **variable; + }; + ++static int get_boot_platid(char *opt_arg); ++ + struct rcopts rcopt[] = { + {"PREP", &preparer}, + {"PUBL", &publisher}, +@@ -404,6 +406,7 @@ struct ld_option { + + #define OPTION_ALLOW_LEADING_DOTS 1070 + #define OPTION_PUBLISHER 1071 ++#define OPTION_PLATFORM 1072 + + #ifdef JIGDO_TEMPLATE + #define OPTION_JTT_OUTPUT 1101 +@@ -528,6 +531,8 @@ static const struct ld_option ld_options[] = + 'b', "FILE", "Set El Torito boot image name", ONE_DASH}, + {{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT}, + '\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH}, ++ {{"eltorito-platform", required_argument, NULL, OPTION_PLATFORM}, ++ '\0', "ID", "Set El Torito platform id for the next boot entry", ONE_DASH}, + {{"sparc-boot", required_argument, NULL, 'B'}, + 'B', "FILES", "Set sparc boot image names", ONE_DASH}, + {{"sunx86-boot", required_argument, NULL, OPTION_SUNX86BOOT}, +@@ -1558,6 +1563,9 @@ int main(int argc, char *argv[]) + */ + new_boot_entry(); + break; ++ case OPTION_PLATFORM: ++ get_boot_platid(optarg); ++ break; + case OPTION_BOOTALPHA: + use_alphaboot++; + /* list of pathnames of boot images */ +@@ -3829,3 +3837,42 @@ e_malloc(size_t size) + memset(pt, 0, size); + return (pt); + } ++ ++static int ++get_boot_platid(char *opt_arg) ++{ ++ long val; ++ char *ptr; ++ ++ use_eltorito++; ++ if (streql(opt_arg, "x86")) { ++ val = EL_TORITO_ARCH_x86; ++ } else if (streql(opt_arg, "PPC")) { ++ val = EL_TORITO_ARCH_PPC; ++ } else if (streql(opt_arg, "Mac")) { ++ val = EL_TORITO_ARCH_PPC; ++ } else if (streql(opt_arg, "efi")) { ++ val = EL_TORITO_ARCH_EFI; ++ } else { ++ val = strtol(opt_arg, &ptr, 0); ++ if (*ptr || val < 0 || val >= 0x100) { ++ comerrno(EX_BAD, "Bad boot system ID.\n"); ++ } ++ } ++ ++ /* ++ * If there is already a boot entry and the boot file name has been set ++ * for this boot entry and the new platform id differs from the ++ * previous value, we start a new boot section. ++ */ ++ if (current_boot_entry && ++ current_boot_entry->boot_image != NULL && ++ current_boot_entry->boot_platform != val) { ++ new_boot_entry(); ++ } ++ get_boot_entry(); ++ current_boot_entry->type |= ELTORITO_BOOT_ID; ++ current_boot_entry->boot_platform = val; ++ return (1); ++} ++ +diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h +index 82c859b..1170d89 100644 +--- a/genisoimage/genisoimage.h ++++ b/genisoimage/genisoimage.h +@@ -299,6 +299,14 @@ struct eltorito_boot_entry_info { + int boot_info_table; + int load_size; + int load_addr; ++ ++#define ELTORITO_BOOT_ID 1 ++#define ELTORITO_SECTION_HEADER 2 ++ int type; ++ /* ++ * Valid if (type & ELTORITO_BOOT_ID) != 0 ++ */ ++ int boot_platform; + }; + + extern int goof; +diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h +index c74c2a9..61b6fc0 100644 +--- a/genisoimage/iso9660.h ++++ b/genisoimage/iso9660.h +@@ -62,6 +62,7 @@ struct iso_volume_descriptor { + #define EL_TORITO_ARCH_x86 0 + #define EL_TORITO_ARCH_PPC 1 + #define EL_TORITO_ARCH_MAC 2 ++#define EL_TORITO_ARCH_EFI 0xEF + + #define EL_TORITO_BOOTABLE 0x88 + #define EL_TORITO_NOT_BOOTABLE 0 +@@ -159,10 +160,15 @@ struct eltorito_boot_descriptor { + }; + + /* Validation entry for El Torito */ ++/* ++ * headerid must be 1 ++ * id is the manufacturer ID ++ * cksum to make the sum of all shorts in this record 0 ++ */ + struct eltorito_validation_entry { + char headerid [ISODCL(1, 1)]; /* 711 */ + char arch [ISODCL(2, 2)]; +- char pad1 [ISODCL(3, 4)]; /* 711 */ ++ char pad1 [ISODCL(3, 4)]; /* 721 */ + char id [ISODCL(5, 28)]; /* CD devel/man*/ + char cksum [ISODCL(29, 30)]; + char key1 [ISODCL(31, 31)]; +@@ -173,7 +179,7 @@ struct eltorito_validation_entry { + struct eltorito_defaultboot_entry { + char boot_id [ISODCL(1, 1)]; /* 711 */ + char boot_media [ISODCL(2, 2)]; +- char loadseg [ISODCL(3, 4)]; /* 711 */ ++ char loadseg [ISODCL(3, 4)]; /* 721 */ + char sys_type [ISODCL(5, 5)]; + char pad1 [ISODCL(6, 6)]; + char nsect [ISODCL(7, 8)]; +@@ -181,6 +187,29 @@ struct eltorito_defaultboot_entry { + char pad2 [ISODCL(13, 32)]; + }; + ++/* El Torito section header entry in boot catalog */ ++struct eltorito_sectionheader_entry { ++#define EL_TORITO_SHDR_ID_SHDR 0x90 ++#define EL_TORITO_SHDR_ID_LAST_SHDR 0x91 ++ char header_id [ISODCL(1, 1)]; /* 711 */ ++ char platform_id [ISODCL(2, 2)]; ++ char entry_count [ISODCL(3, 4)]; /* 721 */ ++ char id [ISODCL(5, 32)]; ++}; ++ ++/* El Torito section entry in boot catalog */ ++struct eltorito_section_entry { ++ char boot_id [ISODCL(1, 1)]; /* 711 */ ++ char boot_media [ISODCL(2, 2)]; ++ char loadseg [ISODCL(3, 4)]; /* 721 */ ++ char sys_type [ISODCL(5, 5)]; ++ char pad1 [ISODCL(6, 6)]; ++ char nsect [ISODCL(7, 8)]; ++ char bootoff [ISODCL(9, 12)]; ++ char sel_criteria [ISODCL(13, 13)]; ++ char vendor_sel_criteria [ISODCL(14, 32)]; ++}; ++ + /* + * XXX JS: The next two structures have odd lengths! + * Some compilers (e.g. on Sun3/mc68020) padd the structures to even length. +-- +2.27.0 + diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch index b3beb069eb..95a5ddd7dd 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch @@ -8,6 +8,8 @@ http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285 Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- +Upstream-Status: Pending + genisoimage/sha256.h | 4 ++++ genisoimage/sha512.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch new file mode 100644 index 0000000000..b999577265 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Add-checksum.h-and-md5.h-for-function-pr.patch @@ -0,0 +1,44 @@ +From f28b8ec20c3485068f1617ff93b497bafe5264e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 00:50:17 -0700 +Subject: [PATCH] genisoimage: Add checksum.h and md5.h for function prototypes + +Needed for parse_checksum_algo and calculate_md5sum + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + genisoimage/genisoimage.c | 2 ++ + genisoimage/jte.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c +index 84ac3c2..5c9f7f3 100644 +--- a/genisoimage/genisoimage.c ++++ b/genisoimage/genisoimage.c +@@ -59,6 +59,8 @@ + #include "udf.h" + #endif + ++#include "checksum.h" ++ + #ifdef NEED_O_BINARY + #include <io.h> /* for setmode() prototype */ + #endif +diff --git a/genisoimage/jte.c b/genisoimage/jte.c +index 0dff289..1f03ad3 100644 +--- a/genisoimage/jte.c ++++ b/genisoimage/jte.c +@@ -36,6 +36,8 @@ + #include "vms.h" + #endif + ++#include "md5.h" ++ + /* Different types used in building our state list below */ + #define JTET_FILE_MATCH 1 + #define JTET_NOMATCH 2 +-- +2.37.3 + diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch index f52f71b632..1a2c1a91cf 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH] genisoimage: Fix fprintf format errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + genisoimage/genisoimage.c | 4 ++-- genisoimage/tree.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch b/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch new file mode 100644 index 0000000000..fdf1563b38 --- /dev/null +++ b/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch @@ -0,0 +1,28 @@ +From 6b698b7c1045d279fe24818d45c67d9884d5fd81 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 7 May 2021 15:10:04 +0800 +Subject: [PATCH] install netscsid to bin for nativesdk + +For Yocto, the nativesdk does not have sbin dir, use bin to relpace + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + netscsid/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netscsid/CMakeLists.txt b/netscsid/CMakeLists.txt +index f6bddf1..cf23312 100644 +--- a/netscsid/CMakeLists.txt ++++ b/netscsid/CMakeLists.txt +@@ -9,5 +9,5 @@ ADD_EXECUTABLE (netscsid netscsid.c) + #SET_SOURCE_FILES_PROPERTIES(netscsid.c ) + TARGET_LINK_LIBRARIES(netscsid ${EXTRA_LIBS} ) + #SET_TARGET_PROPERTIES(netscsid PROPERTIES SKIP_BUILD_RPATH TRUE) +-INSTALL(TARGETS netscsid DESTINATION sbin) ++INSTALL(TARGETS netscsid DESTINATION bin) + +-- +2.27.0 + diff --git a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch index 547a21c67f..47c12928b7 100644 --- a/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch +++ b/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch @@ -8,6 +8,8 @@ on musl. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + include/xconfig.h.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb b/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb new file mode 100644 index 0000000000..bec9b75ebd --- /dev/null +++ b/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "An open source MPEG-4 and MPEG-2 AAC decoding library" +HOMEPAGE = "http://www.audiocoding.com/faad2.html" +SECTION = "libs" +LICENSE = "GPL-2.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" + +LICENSE_FLAGS = "commercial" + +PV .= "+git" + +SRC_URI = "git://github.com/knik0/faad2.git;branch=master;protocol=https" +SRCREV = "216f00e8ddba6f2c64caf481a04f1ddd78b93e78" + +S = "${WORKDIR}/git" + +inherit cmake diff --git a/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb b/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb deleted file mode 100644 index 8b3aafc3b5..0000000000 --- a/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "An open source MPEG-4 and MPEG-2 AAC decoding library" -HOMEPAGE = "http://www.audiocoding.com/faad2.html" -SECTION = "libs" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" - -LICENSE_FLAGS = "commercial" - -SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-2.8.0/${BP}.tar.gz" -SRC_URI[md5sum] = "28f6116efdbe9378269f8a6221767d1f" -SRC_URI[sha256sum] = "985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d" - -inherit autotools lib_package diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch index 09edecc964..c8b546b179 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch +++ b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch @@ -1,6 +1,6 @@ Add a description to the AC_DEFINE statements so that it appears in config.h and silences a fatal warning. -Upstream-Status:Pending +Upstream-Status: Pending Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> --- configure.in | 6 +++--- diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index 21fa0bda1e..379c7e1b63 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb @@ -1,10 +1,9 @@ SUMMARY = "Library for interacting with ID3 tags" SECTION = "libs/multimedia" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" DEPENDS = "zlib" -PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \ ${DEBIAN_MIRROR}/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-16.2.debian.tar.xz;name=patch;subdir=${BP} \ diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch new file mode 100644 index 0000000000..1fa64812ef --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch @@ -0,0 +1,19 @@ +Add musl/ppc mcontext differences specific checks to choose +correct gregs and context structure definitions + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/sigsegv.c ++++ b/sigsegv.c +@@ -95,7 +95,11 @@ static void signal_segv(int signum, sigi + for(i = 0; i < NGREG; i++) + a2j_error("reg[%02d] = 0x" REGFORMAT, i, + #if defined(__powerpc__) && !defined(__powerpc64__) ++# if defined(__GLIBC__) + ucontext->uc_mcontext.uc_regs[i] ++# else ++ ucontext->uc_regs->gregs[i] ++# endif + #elif defined(__powerpc64__) + ucontext->uc_mcontext.gp_regs[i] + #elif defined(__sparc__) && defined(__arch64__) diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb index 5fffe77c2d..bfdf26ed46 100644 --- a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb +++ b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -1,18 +1,19 @@ SUMMARY = "a2jmidid is daemon for exposing ALSA sequencer applications as JACK MIDI" SECTION = "libs/multimedia" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://LICENSE;md5=751419260aa954499f7abaabaa882bbe \ " DEPENDS = "alsa-lib jack dbus" -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS:append:libc-musl = " libexecinfo" SRCREV = "de37569c926c5886768f892c019e3f0468615038" SRC_URI = " \ - git://github.com/linuxaudio/a2jmidid;protocol=https \ + git://github.com/linuxaudio/a2jmidid;protocol=https;branch=master \ file://riscv_ucontext.patch \ + file://ppc_musl_ucontext.patch \ " S = "${WORKDIR}/git" @@ -21,8 +22,8 @@ inherit meson pkgconfig EXTRA_OEMESON = "-Db_lto=false" -LDFLAGS_append_libc-musl = " -lexecinfo" +LDFLAGS:append:libc-musl = " -lexecinfo" export LINKFLAGS="${LDFLAGS}" -FILES_${PN} += "${datadir}/dbus-1/services" +FILES:${PN} += "${datadir}/dbus-1/services" diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch b/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch new file mode 100644 index 0000000000..8411d12caf --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch @@ -0,0 +1,34 @@ +From f864a2aa29377a77c3aef61ce917cc03d099c430 Mon Sep 17 00:00:00 2001 +From: Thomas Nagy <tnagy@waf.io> +Date: Wed, 14 Aug 2019 22:05:45 +0200 +Subject: [PATCH] Conceal imp warnings in Python3 + +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/d2060dfd8af4edb5824153ff24e207b39ecd67a2.patch] + + waflib/Context.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f..38ab03f1 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2000c00 + """Constant updated on new releases""" diff --git a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch b/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch deleted file mode 100644 index 1bdc5adbc1..0000000000 --- a/meta-oe/recipes-multimedia/jack/jack/0001-example-clients-Use-c-compiler-for-jack_simdtests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f8cb818ca96fc2a45a04448a51f25a277ec183db Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Jan 2020 20:21:58 -0800 -Subject: [PATCH] example-clients: Use c++ compiler for jack_simdtests - -It uses c++ sources and runtime therefore its best to use c++ compiler -to build it so it can find the correct runtime, cross compiling with -clang fails - -x86_64-yoe-linux-ld: example-clients/simdtests.cpp.28.o: undefined reference to symbol '__cxa_call_unexpected@@CXXABI_1.3' - -Upstream-Status: Submitted [https://github.com/jackaudio/jack2/pull/536] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - example-clients/wscript | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - ---- a/example-clients/wscript -+++ b/example-clients/wscript -@@ -49,10 +49,15 @@ def build(bld): - else: - use = ['clientlib'] - -+ if example_program == 'jack_simdtests': -+ ftrs = 'cxx cxxprogram' -+ else: -+ ftrs = 'c cprogram' -+ - if bld.env['IS_MACOSX']: -- prog = bld(features='c cprogram', framework = ['Foundation']) -+ prog = bld(features = ftrs, framework = ['Foundation']) - else: -- prog = bld(features='c cprogram') -+ prog = bld(features = ftrs) - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = example_program_source - prog.use = use diff --git a/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch b/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch new file mode 100644 index 0000000000..cbced56a67 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch @@ -0,0 +1,229 @@ +From bcba27168d99a3919b730e6a533cf79ab3b24eee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr> +Date: Sat, 5 Jan 2019 12:02:42 +0100 +Subject: [PATCH] Fix all DeprecationWarning: invalid escape sequence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/412a9b819e86a0061f990c7245f0f5db76d0eda3] + + waflib/Build.py | 2 +- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 2 +- + waflib/Task.py | 2 +- + waflib/TaskGen.py | 2 +- + waflib/Tools/c_config.py | 2 +- + waflib/Tools/c_preproc.py | 6 +++--- + waflib/Tools/msvc.py | 16 ++++++++-------- + waflib/Utils.py | 2 +- + waflib/ansiterm.py | 2 +- + 10 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df1..9e733c9e 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ class BuildContext(Context.Context): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c..901fba6c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Context.py b/waflib/Context.py +index 38ab03f1..5799a60a 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -614,7 +614,7 @@ class Context(ctx): + Logs.pprint(color, msg) + + def load_special_tools(self, var, ban=[]): +- """ ++ r""" + Loads third-party extensions modules for certain programming languages + by trying to list certain files in the extras/ directory. This method + is typically called once for a programming language group, see for +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc607..0c5cb994 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -1044,7 +1044,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') ++re_cond = re.compile(r'(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P<backslash>\\)|(?P<dollar>\$\$)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431..3776bac1 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -727,7 +727,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8..60cc0ecd 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -239,7 +239,7 @@ def validate_cfg(self, kw): + + @conf + def exec_cfg(self, kw): +- """ ++ r""" + Executes ``pkg-config`` or other ``-config`` applications to collect configuration flags: + + * if atleast_pkgconfig_version is given, check that pkg-config has the version n and return +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7..68e5f5ae 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ re_lines = re.compile( + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d4..ff58449d 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -281,7 +281,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +367,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +525,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +579,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +683,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +700,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +747,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09..da1b73e7 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -730,7 +730,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c637..027f0ad6 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ else: + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() diff --git a/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb index d5288c7b71..bb844e4ff1 100644 --- a/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb +++ b/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb @@ -6,18 +6,23 @@ flow model and lock-free programming techniques for graph access have \ been used to have a more dynamic and robust system." SECTION = "libs/multimedia" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ - file://common/jack/control.h;beginline=2;endline=21;md5=e6df0bf30cde8b3b825451459488195d \ - file://common/jack/jack.h;beginline=1;endline=19;md5=6b736ed6b810592b135480a5e853392e \ + file://common/JackControlAPI.cpp;beginline=5;endline=19;md5=9d1921199e203163f160313243f853d6 \ + file://common/JackControlAPI.h;beginline=4;endline=18;md5=9d1921199e203163f160313243f853d6 \ + file://common/jack/jack.h;beginline=2;endline=17;md5=0a668d22ce661159cad28d1c3b8e66af \ + file://common/JackServer.h;beginline=2;endline=17;md5=9bf0870727804a994ee2d19fd368d940 \ " -DEPENDS = "libsamplerate0 libsndfile1 readline" +DEPENDS = "libsamplerate0 libsndfile1" -SRC_URI = "git://github.com/jackaudio/jack2.git \ - file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ - " -SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ + file://0001-Conceal-imp-warnings-in-Python3.patch \ + file://0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch \ +" +SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" @@ -32,7 +37,7 @@ PACKAGECONFIG[opus] = "--opus=yes,--opus=no,libopus" # portaudio is for windows builds only EXTRA_OECONF = "--portaudio=no" -do_install_append() { +do_install:append() { if ! ${@bb.utils.contains('PACKAGECONFIG', 'dbus', True, False, d)}; then rm -f ${D}${bindir}/jack_control fi @@ -40,14 +45,15 @@ do_install_append() { PACKAGES =+ "libjack jack-server jack-utils" -RDEPENDS_jack-dev_remove = "${PN} (= ${EXTENDPKGV})" +RDEPENDS:jack-dev:remove = "${PN} (= ${EXTENDPKGV})" -FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" -FILES_jack-server = " \ +FILES:libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" +FILES:jack-server = " \ ${datadir}/dbus-1/services \ ${bindir}/jackdbus \ ${bindir}/jackd \ " -FILES_jack-utils = "${bindir}/*" +FILES:jack-utils = "${bindir}/*" + +FILES:${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" -FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/*" diff --git a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb index 3454a5c270..800ad1b15e 100644 --- a/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb +++ b/meta-oe/recipes-multimedia/libass/libass_0.17.1.bb @@ -5,26 +5,23 @@ SECTION = "libs/multimedia" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" -DEPENDS = "enca fontconfig freetype libpng fribidi" +DEPENDS = "fontconfig freetype fribidi harfbuzz" -SRC_URI = "git://github.com/libass/libass.git" -SRCREV = "73284b676b12b47e17af2ef1b430527299e10c17" +SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=0.17.1-branch" +SRCREV = "e8ad72accd3a84268275a9385beb701c9284e5b3" S = "${WORKDIR}/git" inherit autotools pkgconfig -PACKAGECONFIG ??= "" -PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz" - -EXTRA_OECONF = " \ - --enable-fontconfig \ -" +PACKAGECONFIG[asm] = "--enable-asm,--disable-asm,nasm-native" +# use larger tiles in the rasterizer (better performance, slightly worse quality) +PACKAGECONFIG[largetiles] = "--enable-large-tiles,--disable-large-tiles" -# Disable compiling with ASM for x86 to avoid textrel -EXTRA_OECONF_append_x86 = " --disable-asm" +PACKAGECONFIG ??= "" +PACKAGECONFIG:append:x86-64 = " asm" PACKAGES =+ "${PN}-tests" -FILES_${PN}-tests = " \ +FILES:${PN}-tests = " \ ${libdir}/test/test \ " diff --git a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb b/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb deleted file mode 100644 index 0cae7c54bd..0000000000 --- a/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Library for reading, mastering and writing optical discs" -HOMEPAGE = "http://libburnia-project.org/" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" - -SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "454d03ce31addb5b7dca62d213c9660e" -SRC_URI[sha256sum] = "525059d10759c5cb8148eebc863bb510e311c663603da7bd2d21c46b7cf63b54" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb index 82a16cc94a..53404e54a8 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb @@ -1,24 +1,24 @@ SUMMARY = "library to read digital audio CDs with error correction" HOMEPAGE = "http://www.gnu.org/software/libcdio/" +BUGTRUCKER = "https://github.com/rocky/libcdio-paranoia/issues/" SECTION = "libs" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libcdio" SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" -SRC_URI[md5sum] = "0255aa50e660db7f2c39658b9c565814" -SRC_URI[sha256sum] = "ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493" +SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" inherit autotools pkgconfig PACKAGES += "${PN}-utils" -FILES_${PN} = "${libdir}/${BPN}${SOLIB}" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN} = "${libdir}/${BPN}${SOLIB}" +FILES:${PN}-utils = "${bindir}/*" python libcdio_split_packages() { libdir = d.expand('${libdir}') - do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) + do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) } PACKAGESPLITFUNCS =+ "libcdio_split_packages" diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch new file mode 100644 index 0000000000..09e7dc3dfb --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio/0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch @@ -0,0 +1,40 @@ +From e5e54be286bf6d8336b747503c803750bc674c57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Oct 2021 01:28:18 -0700 +Subject: [PATCH] Fix a few -Werror=format-security errors with mvprintw() + +In all these places a non-constant is used as a format string which +compiler complains about. Fix by using "%s" as format. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/cdda-player.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/cdda-player.c b/src/cdda-player.c +index 69eddee..8834d60 100644 +--- a/src/cdda-player.c ++++ b/src/cdda-player.c +@@ -298,7 +298,7 @@ action(const char *psz_action) + psz_action); + else + snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" ); +- mvprintw(LINE_ACTION, 0, psz_action_line); ++ mvprintw(LINE_ACTION, 0, "%s", psz_action_line); + clrtoeol(); + refresh(); + } +@@ -1029,10 +1029,10 @@ display_tracks(void) + } + if (sub.track == i) { + attron(A_STANDOUT); +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + attroff(A_STANDOUT); + } else +- mvprintw(i_line++, 0, line); ++ mvprintw(i_line++, 0, "%s", line); + clrtoeol(); + } + } diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch new file mode 100644 index 0000000000..0b25dff75e --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch @@ -0,0 +1,43 @@ +From 08c1768aaeea86c522c0ef1705b9b6d434ebd3ae Mon Sep 17 00:00:00 2001 +From: Chris Lamb <chris@chris-lamb.co.uk> +Date: Fri, 28 Jul 2017 11:49:13 +0100 +Subject: [PATCH] Drop LIBCDIO_SOURCE_PATH by dropping STRIP_FROM_PATH Doxygen + setup; it's not used as FULL_PATH_NAMES = no + +Source: https://sources.debian.org/data/main/libc/libcdio/2.1.0-4/debian/patches/Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 ----- + doc/doxygen/Doxyfile.in | 2 +- + 2 files changed, 1 insertion(+), 6 deletions(-) + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -557,11 +557,6 @@ AC_SUBST(HAVE_SOLARIS_CDROM) + AC_SUBST(HAVE_WIN32_CDROM) + AC_SUBST(HAVE_OS2_CDROM) + +-LIBCDIO_SOURCE_PATH="`pwd`" +-AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH", +- [Full path to libcdio top_sourcedir.]) +-AC_SUBST(LIBCDIO_SOURCE_PATH) +- + AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \ + getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \ + seteuid setegid snprintf setenv strndup unsetenv tzset sleep \ +Index: b/doc/doxygen/Doxyfile.in +=================================================================== +--- a/doc/doxygen/Doxyfile.in ++++ b/doc/doxygen/Doxyfile.in +@@ -138,7 +138,7 @@ FULL_PATH_NAMES = NO + # If left blank the directory from which doxygen is run is used as the + # path to strip. + +-STRIP_FROM_PATH = @LIBCDIO_SOURCE_PATH@ ++STRIP_FROM_PATH = + + # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of + # the path mentioned in the documentation of a class, which tells diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index e282e89b7f..8562462cba 100644 --- a/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -1,10 +1,13 @@ SUMMARY = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access." HOMEPAGE = "http://www.gnu.org/software/libcdio/" SECTION = "libs" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://0001-Fix-a-few-Werror-format-security-errors-with-mvprint.patch \ + file://Drop-LIBCDIO_SOURCE_PATH-by-dropping-STRIP_FROM_PATH.patch \ + " SRC_URI[md5sum] = "aa7629e8f73662a762f64c444b901055" SRC_URI[sha256sum] = "8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" @@ -16,14 +19,17 @@ PACKAGECONFIG[cdda-player] = "--with-cdda-player,--without-cdda-player,ncurses" PACKAGECONFIG[cddb] = "--enable-cddb,--disable-cddb,libcddb" PACKAGECONFIG[vcd-info] = "--enable-vcd-info,--disable-vcd-info,vcdimager" +# add -D_LARGEFILE64_SOURCE for 32bit targets +CFLAGS += "${@['-D_LARGEFILE64_SOURCE',''][d.getVar('SITEINFO_BITS') != '32']}" + PACKAGES += "${PN}-utils" -FILES_${PN} = "${libdir}/${BPN}${SOLIB}" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN} = "${libdir}/${BPN}${SOLIB}" +FILES:${PN}-utils = "${bindir}/*" python libcdio_split_packages() { libdir = d.expand('${libdir}') - do_split_packages(d, libdir, '^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) + do_split_packages(d, libdir, r'^lib(.*)\.so\..*', 'lib%s', 'libcdio %s library', extra_depends='', allow_links=True) } PACKAGESPLITFUNCS =+ "libcdio_split_packages" diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb index 65f5b6adf4..9090cabb12 100644 --- a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb +++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.3.bb @@ -1,12 +1,11 @@ SUMMARY = "DVD access multimeda library" SECTION = "libs/multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e" -SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796" +SRC_URI[sha256sum] = "ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369" inherit autotools lib_package binconfig pkgconfig -CONFIGUREOPTS_remove = "--disable-silent-rules" +CONFIGUREOPTS:remove = "--disable-silent-rules" diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch new file mode 100644 index 0000000000..54f49f6f23 --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch @@ -0,0 +1,40 @@ +From 91fcf66b9182c75cd2b96d88991d5a1c6307d4b4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 2 Aug 2017 16:27:52 +0300 +Subject: [PATCH] Fix gperf 3.1 incompatibility. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + compat.h | 2 +- + frametype.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/compat.h b/compat.h +index 8af71ec..b3d80d9 100644 +--- a/compat.h ++++ b/compat.h +@@ -34,7 +34,7 @@ struct id3_compat { + }; + + struct id3_compat const *id3_compat_lookup(register char const *, +- register unsigned int); ++ register size_t); + + int id3_compat_fixup(struct id3_tag *); + +diff --git a/frametype.h b/frametype.h +index dd064b2..b5b7593 100644 +--- a/frametype.h ++++ b/frametype.h +@@ -37,6 +37,6 @@ extern struct id3_frametype const id3_frametype_unknown; + extern struct id3_frametype const id3_frametype_obsolete; + + struct id3_frametype const *id3_frametype_lookup(register char const *, +- register unsigned int); ++ register size_t); + + # endif +-- +2.13.2 + diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch new file mode 100644 index 0000000000..10e089018c --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/10_utf16.patch @@ -0,0 +1,34 @@ +libid3tag: patch for CVE-2004-2779 + +The patch comes from +https://sources.debian.org/patches/libid3tag/0.15.1b-13/10_utf16.dpatch + +Upstream-Status: Pending + +CVE: CVE-2004-2779 +CVE: CVE-2017-11551 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> + +diff -urNad libid3tag-0.15.1b/utf16.c /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c +--- libid3tag-0.15.1b/utf16.c 2006-01-13 15:26:29.000000000 +0100 ++++ /tmp/dpep.tKvO7a/libid3tag-0.15.1b/utf16.c 2006-01-13 15:27:19.000000000 +0100 +@@ -282,5 +282,18 @@ + + free(utf16); + ++ if (end == *ptr && length % 2 != 0) ++ { ++ /* We were called with a bogus length. It should always ++ * be an even number. We can deal with this in a few ways: ++ * - Always give an error. ++ * - Try and parse as much as we can and ++ * - return an error if we're called again when we ++ * already tried to parse everything we can. ++ * - tell that we parsed it, which is what we do here. ++ */ ++ (*ptr)++; ++ } ++ + return ucs4; + } diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch new file mode 100644 index 0000000000..38d40c3632 --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch @@ -0,0 +1,43 @@ +Upstream-Status: Inappropriate [configuration] + +Index: libid3tag-0.15.1b/Makefile.am +=================================================================== +--- libid3tag-0.15.1b.orig/Makefile.am 2009-07-29 09:29:20.000000000 +0100 ++++ libid3tag-0.15.1b/Makefile.am 2009-07-29 09:29:47.000000000 +0100 +@@ -27,6 +27,9 @@ + lib_LTLIBRARIES = libid3tag.la + include_HEADERS = id3tag.h + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = id3tag.pc ++ + ## From the libtool documentation on library versioning: + ## + ## CURRENT +Index: libid3tag-0.15.1b/configure.ac +=================================================================== +--- libid3tag-0.15.1b.orig/configure.ac 2009-07-29 09:27:15.000000000 +0100 ++++ libid3tag-0.15.1b/configure.ac 2009-07-29 09:27:45.000000000 +0100 +@@ -201,5 +201,5 @@ + dnl AC_SUBST(LTLIBOBJS) + + AC_CONFIG_FILES([Makefile msvc++/Makefile \ +- libid3tag.list]) ++ libid3tag.list id3tag.pc]) + AC_OUTPUT +Index: libid3tag-0.15.1b/id3tag.pc.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libid3tag-0.15.1b/id3tag.pc.in 2009-07-29 09:29:10.000000000 +0100 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: id3tag ++Description: ID3 tag reading library ++Requires: ++Version: @VERSION@ ++Libs: -L${libdir} -lid3tag -lz ++Cflags: -I${includedir} diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch new file mode 100644 index 0000000000..1895748d1d --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/cflags_filter.patch @@ -0,0 +1,19 @@ +configure contains CFLAGS filtering code which was removing our prefix-map +flags. We need those to generate reproducible binaries. Allow them through. + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,10 @@ do + -mno-cygwin) + shift + ;; ++ -fmacro-prefix-map*|-fdebug-prefix-map*|-ffile-prefix-map*) ++ CFLAGS="$CFLAGS $1" ++ shift ++ ;; + -m*) + arch="$arch $1" + shift diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch new file mode 100644 index 0000000000..2845fb1d3a --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599280&group_id=12349&atid=112349] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd libid3tag-0.15.1b/configure.ac libid3tag-0.15.1b/configure.ac +--- libid3tag-0.15.1b/configure.ac 2004-01-24 01:22:46.000000000 +0200 ++++ libid3tag-0.15.1b/configure.ac 2013-01-03 06:41:02.734835014 +0200 +@@ -28,7 +28,7 @@ + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + dnl System type. diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch b/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch new file mode 100644 index 0000000000..f0867b5f01 --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag/unknown-encoding.patch @@ -0,0 +1,39 @@ +In case of an unknown/invalid encoding, id3_parse_string() will +return NULL, but the return value wasn't checked resulting +in segfault in id3_ucs4_length(). This is the only place +the return value wasn't checked. + +Patch taken from Debian: +https://sources.debian.org/patches/libid3tag/0.15.1b-14/11_unknown_encoding.dpatch/ + +CVE: CVE-2017-11550 +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf +--- libid3tag-0.15.1b~/compat.gperf 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/compat.gperf 2007-01-14 14:36:53.000000000 +0000 +@@ -236,6 +236,10 @@ + + encoding = id3_parse_uint(&data, 1); + string = id3_parse_string(&data, end - data, encoding, 0); ++ if (!string) ++ { ++ continue; ++ } + + if (id3_ucs4_length(string) < 4) { + free(string); +diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c +--- libid3tag-0.15.1b~/parse.c 2004-01-23 09:41:32.000000000 +0000 ++++ libid3tag-0.15.1b/parse.c 2007-01-14 14:37:34.000000000 +0000 +@@ -165,6 +165,9 @@ + case ID3_FIELD_TEXTENCODING_UTF_8: + ucs4 = id3_utf8_deserialize(ptr, length); + break; ++ default: ++ /* FIXME: Unknown encoding! Print warning? */ ++ return NULL; + } + + if (ucs4 && !full) { diff --git a/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb new file mode 100644 index 0000000000..850918d319 --- /dev/null +++ b/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -0,0 +1,27 @@ +SUMMARY = "Library for interacting with ID3 tags in MP3 files" +HOMEPAGE = "http://sourceforge.net/projects/mad/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYRIGHT;md5=5e6279efb87c26c6e5e7a68317a6a87a \ + file://version.h;beginline=1;endline=8;md5=86ac68b67f054b7afde9e149bbc3fe63" +SECTION = "libs" +DEPENDS = "zlib gperf-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libid3tag-${PV}.tar.gz \ + file://addpkgconfig.patch \ + file://obsolete_automake_macros.patch \ + file://0001-Fix-gperf-3.1-incompatibility.patch \ + file://10_utf16.patch \ + file://unknown-encoding.patch \ + file://cflags_filter.patch \ + " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mad/files/libid3tag/" +UPSTREAM_CHECK_REGEX = "/projects/mad/files/libid3tag/(?P<pver>.*)/$" + +SRC_URI[md5sum] = "e5808ad997ba32c498803822078748c3" +SRC_URI[sha256sum] = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151" + +S = "${WORKDIR}/libid3tag-${PV}" + +inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb new file mode 100644 index 0000000000..eced6c7726 --- /dev/null +++ b/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Reference implementation of JPEG XL (encoder and decoder)" +HOMEPAGE = "https://github.com/libjxl/libjxl/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6a905a337cc228a1f68f0b5416f52a7f" + +inherit cmake pkgconfig mime + +DEPENDS = "highway brotli" + +SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1" + +SRCREV = "e1489592a770b989303b0edc5cc1dc447bbe0515" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DCMAKE_BUILD_TYPE=Release \ + -DJPEGXL_ENABLE_PLUGINS=ON \ + -DBUILD_TESTING=OFF \ + -DJPEGXL_WARNINGS_AS_ERRORS=OFF \ + -DJPEGXL_ENABLE_SIZELESS_VECTORS=ON \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_SKCMS=ON \ + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ + -DJPEGXL_FORCE_SYSTEM_HWY=ON \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_TCMALLOC=OFF \ + -DJPEGXL_ENABLE_TOOLS=OFF \ +" + +PACKAGECONFIG ?= "mime gdk-pixbuf-loader" +PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" +PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" +PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" + +FILES:${PN} += "${libdir}/gdk-pixbuf-2.0 ${datadir}" diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch new file mode 100644 index 0000000000..586782a348 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmad/libmad/0001-configure-Respect-the-cflags-from-environment.patch @@ -0,0 +1,47 @@ +From 26342d1c775205f661f5cf005b7e054a04f5d32e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 16 May 2023 10:14:57 -0700 +Subject: [PATCH] configure: Respect the cflags from environment + +This is needed with OE like cross-build envs where certain important +flags maybe passed as global policy to aid cross compiling or +reproducibility etc. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -73,12 +73,9 @@ debug="" + optimize="" + profile="" + +-set -- $CFLAGS +-CFLAGS="" +- + if test "$GCC" = yes + then +- CFLAGS="-Wall" ++ CFLAGS="$CFLAGS -Wall" + fi + + while test $# -gt 0 +@@ -115,10 +112,13 @@ do + optimize="$optimize $1" + shift + ;; +- *) ++ -*) + CFLAGS="$CFLAGS $1" + shift + ;; ++ *) ++ shift ++ ;; + esac + done + diff --git a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch index 70723f2d08..b9a444dc32 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch +++ b/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch @@ -4,6 +4,8 @@ Date: Tue, 16 Sep 2014 12:28:47 +0300 Subject: [PATCH 4/4] Remove clang unsupported compiler flags --- +Upstream-Status: Pending + configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb index 8d9246a5ce..e70c8e3ed1 100644 --- a/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -1,25 +1,24 @@ SUMMARY = "MPEG Audio Decoder library" -HOMEPAGE = "http://sourceforge.net/projects/mad/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" -LICENSE = "GPLv2+" +HOMEPAGE = "https://sourceforge.net/projects/mad/" +BUGTRACKER = "https://sourceforge.net/tracker/?group_id=12349&atid=112349" +LICENSE = "GPL-2.0-or-later" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454" SECTION = "libs" DEPENDS = "libid3tag" -PR = "r3" -SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz \ +SRC_URI = "https://downloads.sourceforge.net/mad/libmad-${PV}.tar.gz \ file://no-force-mem.patch \ file://add-pkgconfig.patch \ file://fix_for_mips_with_gcc-4.5.0.patch \ file://obsolete_automake_macros.patch \ file://automake-foreign.patch \ + file://0001-configure-Respect-the-cflags-from-environment.patch \ " -SRC_URI_append_toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch " +SRC_URI:append:toolchain-clang = " file://0004-Remove-clang-unsupported-compiler-flags.patch " -SRC_URI[md5sum] = "1be543bc30c56fb6bea1d7bf6a64e66c" SRC_URI[sha256sum] = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690" S = "${WORKDIR}/libmad-${PV}" @@ -27,9 +26,9 @@ S = "${WORKDIR}/libmad-${PV}" inherit autotools pkgconfig EXTRA_OECONF = "-enable-speed --enable-shared" -EXTRA_OECONF_append_arm = " --enable-fpm=arm" +EXTRA_OECONF:append:arm = " --enable-fpm=arm" -do_configure_prepend () { +do_configure:prepend () { # damn picky automake... touch NEWS AUTHORS ChangeLog } diff --git a/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb b/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb index 668afc8c16..62c20c6122 100644 --- a/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb +++ b/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb @@ -2,7 +2,7 @@ SUMMARY = "MMS stream protocol library" HOMEPAGE = "http://sourceforge.net/projects/libmms/" SECTION = "libs/multimedia" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz" @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "3c05e05aebcbfcc044d9e8c2d4646cd8359be39a3f0ba8ce4e72a9094b inherit autotools pkgconfig -do_install_append() { +do_install:append() { # The GLib dependency was removed in libmms 0.6.3, but the # "Requires" was not removed from the pkg-config file. Since we # don't have (and don't want) the RDEPENDS on GLib, we should diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch new file mode 100644 index 0000000000..dfdaf810d8 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug/0001-fastmix-Drop-register-storage-class-keyword.patch @@ -0,0 +1,38 @@ +From 7a25d5def379db387de9237f0b03605b3ae277b6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 11:32:59 -0800 +Subject: [PATCH] fastmix: Drop 'register' storage class keyword + +It has been dropped from laters C/C++ standards ( c++17 and newer ) + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/fastmix.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index d693d20..aa51c4a 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -288,7 +288,7 @@ CzWINDOWEDFIR sfir; + // MIXING MACROS + // ---------------------------------------------------------------------------- + #define SNDMIX_BEGINSAMPLELOOP8\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed char *p = (signed char *)(pChn->pCurrentSample+pChn->nPos);\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +@@ -296,7 +296,7 @@ CzWINDOWEDFIR sfir; + do { + + #define SNDMIX_BEGINSAMPLELOOP16\ +- register MODCHANNEL * const pChn = pChannel;\ ++ MODCHANNEL * const pChn = pChannel;\ + nPos = pChn->nPosLo;\ + const signed short *p = (signed short *)(pChn->pCurrentSample+(pChn->nPos*2));\ + if (pChn->dwFlags & CHN_STEREO) p += pChn->nPos;\ +-- +2.39.0 + diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb index 398daae087..e04e763776 100644 --- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.9.0.bb @@ -4,8 +4,9 @@ HOMEPAGE = "http://modplug-xmms.sf.net" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" -SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" -SRC_URI[md5sum] = "5ba16981e6515975e9a68a58d5ba69d1" +SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz \ + file://0001-fastmix-Drop-register-storage-class-keyword.patch" + SRC_URI[sha256sum] = "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" inherit autotools pkgconfig @@ -13,7 +14,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-option-checking" # NOTE: autotools_stage_all does nothing here, we need to do it manually -do_install_append() { +do_install:append() { install -d ${D}${includedir}/libmodplug install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb index 29ef2fa448..02958ef023 100644 --- a/meta-oe/recipes-multimedia/libopus/libopus_1.3.1.bb +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.5.2.bb @@ -6,11 +6,10 @@ technology from Skype's SILK codec and Xiph.Org's CELT codec." HOMEPAGE = "http://www.opus-codec.org/" SECTION = "libs/multimedia" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b365c2155d66e550e1447075d6744a5" SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" -SRC_URI[md5sum] = "d7c07db796d21c9cf1861e0c2b0c0617" -SRC_URI[sha256sum] = "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" +SRC_URI[sha256sum] = "65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1" S = "${WORKDIR}/opus-${PV}" @@ -29,9 +28,9 @@ EXTRA_OECONF = " \ " # ne10 is available only for armv7a, armv7ve and aarch64 -DEPENDS_append_aarch64 = " ne10" -DEPENDS_append_armv7a = " ne10" -DEPENDS_append_armv7ve = " ne10" +DEPENDS:append:aarch64 = " ne10" +DEPENDS:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" +DEPENDS:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon"," ne10","",d)}" python () { if d.getVar('TARGET_FPU') in [ 'soft' ]: @@ -50,6 +49,8 @@ python () { #| {standard input}:761: Error: selected processor does not support Thumb mode `smull fp,r2,r3,r9' #| {standard input}:773: Error: selected processor does not support Thumb mode `smull fp,r3,r5,r8' #| make[2]: *** [celt/celt.lo] Error 1 -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" BBCLASSEXTEND = "native nativesdk" + +CVE_PRODUCT += "opus-codec:opus" diff --git a/meta-oe/recipes-multimedia/live555/live555_20210406.bb b/meta-oe/recipes-multimedia/live555/live555_20210824.bb index cc138adb67..a899049b77 100644 --- a/meta-oe/recipes-multimedia/live555/live555_20210406.bb +++ b/meta-oe/recipes-multimedia/live555/live555_20210824.bb @@ -4,7 +4,7 @@ DESCRIPTION = "LIVE555 Streaming Media libraries" HOMEPAGE = "http://live.com/" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" SECTION = "devel" DEPENDS = "openssl" @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "0bd182fac7d6297d924af4405ce840515a38fa5438cb1a4b90fcb6bc737b36d6" +SRC_URI[sha256sum] = "ce95a1c79f6d18e959f9dc129b8529b711c60e76754acc285e60946303b923ec" S = "${WORKDIR}/live" @@ -55,8 +55,9 @@ do_install() { install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ } +RDEPENDS:${PN}-dev = "" PACKAGES =+ "live555-openrtsp live555-playsip live555-mediaserver live555-examples" -FILES_live555-openrtsp = "${bindir}/openRTSP" -FILES_live555-playsip = "${bindir}/playSIP" -FILES_live555-mediaserver = "${bindir}/live555MediaServer" -FILES_live555-examples = "${bindir}/*" +FILES:live555-openrtsp = "${bindir}/openRTSP" +FILES:live555-playsip = "${bindir}/playSIP" +FILES:live555-mediaserver = "${bindir}/live555MediaServer" +FILES:live555-examples = "${bindir}/*" diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb index 76e10f86a3..e0712ba930 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm." SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "alsa-lib texinfo" diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb index 171eef7b73..0f50a6e8fe 100644 --- a/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb @@ -3,54 +3,52 @@ DESCRIPTION = "mpv is a fork of mplayer2 and MPlayer. It shares some features wi SECTION = "multimedia" HOMEPAGE = "http://www.mpv.io/" -DEPENDS = "zlib ffmpeg jpeg libv4l" - -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ +DEPENDS = " \ + zlib \ + ffmpeg \ + jpeg \ + libv4l \ + libass \ " -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" -SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv \ - https://waf.io/waf-2.0.20;name=waf;subdir=git \ -" -SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" +SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239" +SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \ + https://waf.io/waf-2.0.25;name=waf;subdir=git \ + " +SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" S = "${WORKDIR}/git" inherit waf pkgconfig mime-xdg -LDFLAGS_append_riscv64 = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" LUA ?= "lua" -LUA_mips64 = "" -LUA_aarch64 = "" -LUA_powerpc64 = "" -LUA_powerpc64le = "" -LUA_riscv64 = "" -LUA_riscv32 = "" -LUA_powerpc = "" +LUA:mips64 = "" +LUA:powerpc64 = "" +LUA:powerpc64le = "" +LUA:riscv64 = "" +LUA:riscv32 = "" +LUA:powerpc = "" -# Note: both lua and libass are required to get on-screen-display (controls) +# Note: lua is required to get on-screen-display (controls) PACKAGECONFIG ??= " \ ${LUA} \ - libass \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl," +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" @@ -90,7 +88,6 @@ EXTRA_OECONF = " \ --confdir=${sysconfdir} \ --datadir=${datadir} \ --disable-manpage-build \ - --disable-libsmbclient \ --disable-libbluray \ --disable-dvdnav \ --disable-cdda \ @@ -101,14 +98,19 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " +do_configure:append() { + sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h +} + link_waf() { - ln -s waf-2.0.20 ${S}/waf + ln -s waf-2.0.25 ${S}/waf } do_unpack[postfuncs] += "link_waf" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/zsh \ ${datadir}/bash-completion \ + ${datadir}/metainfo \ " -EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" +EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" diff --git a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb deleted file mode 100644 index a84f2bf078..0000000000 --- a/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Opus Audio Tools" -HOMEPAGE = "http://www.opus-codec.org/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1" - -SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" -SRC_URI[md5sum] = "b424790eda9357a4df394e2d7ca19eac" -SRC_URI[sha256sum] = "e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6" - -S = "${WORKDIR}/opus-tools-${PV}" - -DEPENDS = "libopus flac" - -inherit autotools pkgconfig diff --git a/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb new file mode 100644 index 0000000000..6e4321dd7d --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/paprefs_1.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog for the PulseAudio sound server." +HOMEPAGE = "https://freedesktop.org/software/pulseaudio/paprefs/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "pulseaudio gtkmm3 gtk+3 libsigc++-3 glibmm" + +inherit meson pkgconfig features_check + +# paprefs.cc includes gdk/gdkx.h and gdkx.h isn't provided by gtk3 without x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://freedesktop.org/software/pulseaudio/paprefs/${BP}.tar.xz" + +SRC_URI[sha256sum] = "b3f21e40dc3936d15e3ffc910fb0c07c14b88e8c287715b456a948c17638f633" + +EXTRA_OEMESON = "-Dlynx=false" + +RDEPENDS:${PN} += "pulseaudio-server" diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch new file mode 100644 index 0000000000..44169240c5 --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-pavucontrol-remove-canberra-gtk-support.patch @@ -0,0 +1,112 @@ +From 87992a57e5f517d5ceb5dfabaea662ac64983720 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 27 May 2022 18:37:53 +0200 +Subject: [PATCH] pavucontrol: remove canberra-gtk support + +libcanberra-gtk3 module isn't buildable for wayland. +Remove its dpendency. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate +--- + configure.ac | 2 +- + src/pavuapplication.cc | 2 -- + src/pavucontrol.cc | 4 ---- + src/sinkwidget.cc | 17 ----------------- + 4 files changed, 1 insertion(+), 24 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 056ba5e..e857563 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ AC_TYPE_SIGNAL + AC_HEADER_STDC + AX_CXX_COMPILE_STDCXX_11 + +-PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 libcanberra-gtk3 >= 0.16 json-glib-1.0 ]) ++PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 >= 3.22 sigc++-2.0 json-glib-1.0 ]) + AC_SUBST(GUILIBS_CFLAGS) + AC_SUBST(GUILIBS_LIBS) + +diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc +index 6773b53..60c016c 100644 +--- a/src/pavuapplication.cc ++++ b/src/pavuapplication.cc +@@ -24,8 +24,6 @@ + + #include "i18n.h" + +-#include <canberra-gtk.h> +- + #include "pavuapplication.h" + #include "pavucontrol.h" + #include "mainwindow.h" +diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc +index 18d5400..10ab646 100644 +--- a/src/pavucontrol.cc ++++ b/src/pavucontrol.cc +@@ -29,8 +29,6 @@ + #include <json-glib/json-glib.h> + #endif + +-#include <canberra-gtk.h> +- + #include "pavucontrol.h" + #include "i18n.h" + #include "minimalstreamwidget.h" +@@ -916,8 +914,6 @@ MainWindow* pavucontrol_get_window(pa_glib_mainloop *m, bool maximize, bool _ret + tab_number = _tab_number; + retry = _retry; + +- ca_context_set_driver(ca_gtk_context_get(), "pulse"); +- + mainWindow = MainWindow::create(maximize); + + api = pa_glib_mainloop_get_api(m); +diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc +index f30bd37..482fd1f 100644 +--- a/src/sinkwidget.cc ++++ b/src/sinkwidget.cc +@@ -24,7 +24,6 @@ + + #include "sinkwidget.h" + +-#include <canberra-gtk.h> + #if HAVE_EXT_DEVICE_RESTORE_API + # include <pulse/format.h> + # include <pulse/ext-device-restore.h> +@@ -111,7 +110,6 @@ SinkWidget* SinkWidget::create(MainWindow* mainWindow) { + void SinkWidget::executeVolumeUpdate() { + pa_operation* o; + char dev[64]; +- int playing = 0; + + if (!(o = pa_context_set_sink_volume_by_index(get_context(), index, &volume, NULL, NULL))) { + show_error(_("pa_context_set_sink_volume_by_index() failed")); +@@ -120,22 +118,7 @@ void SinkWidget::executeVolumeUpdate() { + + pa_operation_unref(o); + +- ca_context_playing(ca_gtk_context_get(), 2, &playing); +- if (playing) +- return; +- + snprintf(dev, sizeof(dev), "%lu", (unsigned long) index); +- ca_context_change_device(ca_gtk_context_get(), dev); +- +- ca_gtk_play_for_widget(GTK_WIDGET(gobj()), +- 2, +- CA_PROP_EVENT_DESCRIPTION, _("Volume Control Feedback Sound"), +- CA_PROP_EVENT_ID, "audio-volume-change", +- CA_PROP_CANBERRA_CACHE_CONTROL, "permanent", +- CA_PROP_CANBERRA_ENABLE, "1", +- NULL); +- +- ca_context_change_device(ca_gtk_context_get(), NULL); + } + + void SinkWidget::onMuteToggleButton() { +-- +2.25.1 + diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb index 6c07eff764..012fc3a94d 100644 --- a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb @@ -1,24 +1,27 @@ DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server." HOMEPAGE = "https://freedesktop.org/software/pulseaudio/pavucontrol/" SECTION = "x11/multimedia" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # glib-2.0-native is required for glib-gettextize, which is used by the # AM_GLIB_GNU_GETTEXT macro in configure.ac. That macro is deprecated, so the # glib-2.0-native dependency may go away at some point (something to keep in # mind when doing version upgrades). -DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" +DEPENDS = "libxml-parser-perl-native intltool-native glib-2.0-native gtkmm3 pulseaudio json-glib" -inherit autotools features_check perlnative +inherit autotools features_check perlnative pkgconfig -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz \ - " -SRC_URI[md5sum] = "9dcc2c76292e7e5e075d51b8dcb20202" -SRC_URI[sha256sum] = "8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2" +SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}" + +SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = ",,libcanberra" EXTRA_OECONF = "--disable-lynx " -RDEPENDS_${PN} += "pulseaudio-server" +RDEPENDS:${PN} += "pulseaudio-server" diff --git a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb index e4fb4ff026..87320a98e8 100644 --- a/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb +++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Freedesktop sound theme" HOMEPAGE = "http://freedesktop.org/wiki/Specifications/sound-theme-spec" -LICENSE = "GPLv2+ & CC-BY-3.0 & CC-BY-SA-3.0" +LICENSE = "GPL-2.0-or-later & CC-BY-3.0 & CC-BY-SA-3.0" LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69" # glib-2.0 for glib-gettext.m4 which provides AM_GLIB_GNU_GETTEXT diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch deleted file mode 100644 index eb294b3fb4..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 27 Feb 2015 21:55:36 +0000 -Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and - libv4l2subdev" - -This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Conflicts: - utils/media-ctl/Makefile.am - ---- - utils/media-ctl/Makefile.am | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index ee7dcc9..d11fa2e 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -1,8 +1,7 @@ --noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la -- -+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la - libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h --libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) --libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) -+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) -+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) - - media-bus-format-names.h: ../../include/linux/media-bus-format.h - sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \ -@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --libv4l2subdev_la_CFLAGS = -static --libv4l2subdev_la_LDFLAGS = -static -- - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch new file mode 100644 index 0000000000..64c01e4977 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch @@ -0,0 +1,46 @@ +From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <festevam@denx.de> +Date: Fri, 12 Jan 2024 00:17:14 -0300 +Subject: [PATCH] keytable: meson: Restrict the installation of + 50-rc_keymap.conf + +Currently, meson tries to install 50-rc_keymap.conf even if systemd +is not used. + +Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"), +only allowed 50-rc_keymap.conf to be installed when both BPF and systemd +were used. + +Apply the same logic in meson to fix the problem. + +Signed-off-by: Fabio Estevam <festevam@denx.de> +Signed-off-by: Sean Young <sean@mess.org> +Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168] +--- + utils/keytable/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build +index 4130a4bea514..76ce329eae8e 100644 +--- a/utils/keytable/meson.build ++++ b/utils/keytable/meson.build +@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files( + install_data(ir_keytable_udev_rules, + install_dir : ir_keytable_system_dir / 'rules.d') + ++if ir_bpf_enabled ++if dep_systemd.found() + if have_udevdsyscallfilter + ir_keytable_systemd_files = files( + '50-rc_keymap.conf', +@@ -76,6 +78,8 @@ if have_udevdsyscallfilter + install_data(ir_keytable_systemd_files, + install_dir : systemd_systemdir / 'systemd-udevd.service.d') + endif ++endif ++endif + + # Install non-existing directory to create empty directory structure + # See: https://github.com/mesonbuild/meson/issues/2904 +-- +2.34.1 diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch deleted file mode 100644 index a849d465c7..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 49f865a17d62db7bbd333a9b83fadeea55686e35 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 13:17:19 -0700 -Subject: [PATCH] contrib/test: Link mc_nextgen_test with libargp if needed - -musl depends on external argp implementation e.g. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - contrib/test/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 -@@ -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) --mc_nextgen_test_LDFLAGS = $(LIBUDEV_LIBS) -+mc_nextgen_test_LDFLAGS = $(ARGP_LIBS) $(LIBUDEV_LIBS) - - - ioctl_test_SOURCES = ioctl-test.c ioctl-test.h ioctl_32.h ioctl_64.h --- -2.17.1 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch deleted file mode 100644 index e3ce45d167..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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. - -Simply avoid getsubopt, since we cannot rely on it. - -Imported from Alpine Linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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 651917e..cea57b7 100644 ---- a/utils/v4l2-ctl/v4l2-ctl-common.cpp -+++ b/utils/v4l2-ctl/v4l2-ctl-common.cpp -@@ -785,15 +785,17 @@ static bool parse_subset(char *optarg) - - static bool parse_next_subopt(char **subs, char **value) - { -- static char *const subopts[] = { -- NULL -- }; -- int opt = getsubopt(subs, subopts, value); -+ char *p = *subs; -+ *value = *subs; - -- if (opt < 0 || *value) -- return false; -- fprintf(stderr, "Missing suboption value\n"); -- return true; -+ while (*p && *p != ',') -+ p++; -+ -+ if (*p) -+ *p++ = '\0'; -+ -+ *subs = p; -+ return false; - } - - void common_cmd(const std::string &media_bus_info, int ch, char *optarg) diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch deleted file mode 100644 index 55a5cdc8a1..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b82e509c10659a4647961a6da3adf4d285dea2dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 - ---- - utils/media-ctl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index 7c520a2..748353d 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) - nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES) - libv4l2subdev_la_SOURCES = libv4l2subdev.c - libv4l2subdev_la_LIBADD = libmediactl.la --mediactl_includedir=$(includedir)/mediactl --noinst_HEADERS = mediactl.h v4l2subdev.h -+otherincludedir = $(includedir)/mediactl -+otherinclude_HEADERS = mediactl.h v4l2subdev.h - - pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch deleted file mode 100644 index 9fcf61165b..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 1 Mar 2015 22:25:07 +0000 - ---- - utils/media-ctl/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am -index d11fa2e..7c520a2 100644 ---- a/utils/media-ctl/Makefile.am -+++ b/utils/media-ctl/Makefile.am -@@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la - mediactl_includedir=$(includedir)/mediactl - noinst_HEADERS = mediactl.h v4l2subdev.h - -+pkgconfig_DATA = libmediactl.pc - bin_PROGRAMS = media-ctl - media_ctl_SOURCES = media-ctl.c options.c options.h tools.h - media_ctl_LDADD = libmediactl.la libv4l2subdev.la diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb deleted file mode 100644 index 3e92d49b4f..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "v4l2 and IR applications" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ - file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" -PROVIDES = "libv4l media-ctl" - -DEPENDS = "jpeg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" -DEPENDS_append_libc-musl = " argp-standalone" -DEPENDS_append_class-target = " udev" -LDFLAGS_append = " -pthread" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG ??= "media-ctl" -PACKAGECONFIG[media-ctl] = "--enable-v4l-utils,--disable-v4l-utils,," - -SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ - file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ - file://mediactl-pkgconfig.patch \ - file://export-mediactl-headers.patch \ - file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ - file://0007-Do-not-use-getsubopt.patch \ - " -SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894" -SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" - -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" - -PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" - -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 \ - ${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*" - -FILES_${PN} = "${bindir} ${sbindir}" - -FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ - ${libdir}/libdvbv5*${SOLIBS} \ - ${libdir}/libv4l/*-decomp" - -FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ - ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" - -PARALLEL_MAKE_class-native = "" -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb new file mode 100644 index 0000000000..52759ef18e --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -0,0 +1,85 @@ +SUMMARY = "v4l2 and IR applications" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ + file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" +PROVIDES = "libv4l media-ctl" + +DEPENDS = "jpeg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ + ${@bb.utils.contains_any('PACKAGECONFIG', 'qv4l2 qvidcap', 'qtbase qtbase-native', '', d)}" + +DEPENDS:append:libc-musl = " argp-standalone" +DEPENDS:append:class-target = " udev" +LDFLAGS:append = " -pthread" +# v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to +# both 32 and 64 bit file APIs. But it does not handle the time side? +# Needs further investigation +GLIBC_64BIT_TIME_FLAGS = "" + +inherit meson gettext pkgconfig + +PACKAGECONFIG ??= "" +PACKAGECONFIG[qv4l2] = ",-Dqv4l2=disabled" +PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" +PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" + +SRC_URI = "\ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ + file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ +" + +SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" + +PV .= "+git" + +S = "${WORKDIR}/git" + +EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" + +# Disable the erroneous installation of gconv-modules that would break glib +# like it is done in Debian and ArchLinux. +EXTRA_OEMESON += "-Dgconv=disabled" + +VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" + +PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev qv4l2 qvidcap" + +RPROVIDES:${PN}-dbg += "libv4l-dbg" + +FILES:media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" +FILES:qv4l2 = "\ + ${bindir}/qv4l2 \ + ${datadir}/applications/qv4l2.desktop \ + ${datadir}/icons/hicolor/*/apps/qv4l2.* \ +" +FILES:qvidcap = "\ + ${bindir}/qvidcap \ + ${datadir}/applications/qvidcap.desktop \ + ${datadir}/icons/hicolor/*/apps/qvidcap.* \ +" + +FILES:ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" +RDEPENDS:ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" +RDEPENDS:qv4l2 += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qv4l2', 'qtbase', '', d)}" +RDEPENDS:qvidcap += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'qvidcap', 'qtbase', '', d)}" + +FILES:rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" + +FILES:${PN} = "${bindir} ${sbindir}" + +FILES:libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ + ${libdir}/libdvbv5*${SOLIBS} \ + ${libdir}/libv4l/*-decomp \ + ${libdir}/libv4l2tracer.so \ +" + +FILES:libv4l-dev += "${includedir} ${libdir}/pkgconfig \ + ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" + +PARALLEL_MAKE:class-native = "" +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch b/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch deleted file mode 100644 index 41a5dbf4fd..0000000000 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch +++ /dev/null @@ -1,961 +0,0 @@ -From 141d3b3593722eb3d588e7c4b1542f810bc25853 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Thu, 5 Jun 2014 11:29:20 -0500 -Subject: [PATCH] Add stdout mode to allow streaming over the network with nc - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> ---- - yavta.c | 315 ++++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 169 insertions(+), 146 deletions(-) - -diff --git a/yavta.c b/yavta.c -index 32adc26..b398da0 100644 ---- a/yavta.c -+++ b/yavta.c -@@ -309,7 +309,7 @@ static bool video_has_fd(struct device *dev) - static int video_set_fd(struct device *dev, int fd) - { - if (video_has_fd(dev)) { -- printf("Can't set fd (already open).\n"); -+ fprintf(stderr, "Can't set fd (already open).\n"); - return -1; - } - -@@ -321,18 +321,18 @@ static int video_set_fd(struct device *dev, int fd) - static int video_open(struct device *dev, const char *devname) - { - if (video_has_fd(dev)) { -- printf("Can't open device (already open).\n"); -+ fprintf(stderr, "Can't open device (already open).\n"); - return -1; - } - - dev->fd = open(devname, O_RDWR); - if (dev->fd < 0) { -- printf("Error opening device %s: %s (%d).\n", devname, -+ fprintf(stderr, "Error opening device %s: %s (%d).\n", devname, - strerror(errno), errno); - return dev->fd; - } - -- printf("Device %s opened.\n", devname); -+ fprintf(stderr, "Device %s opened.\n", devname); - - dev->opened = 1; - -@@ -352,7 +352,7 @@ static int video_querycap(struct device *dev, unsigned int *capabilities) - *capabilities = cap.capabilities & V4L2_CAP_DEVICE_CAPS - ? cap.device_caps : cap.capabilities; - -- printf("Device `%s' on `%s' is a video %s (%s mplanes) device.\n", -+ fprintf(stderr, "Device `%s' on `%s' is a video %s (%s mplanes) device.\n", - cap.card, cap.bus_info, - video_is_capture(dev) ? "capture" : "output", - video_is_mplane(dev) ? "with" : "without"); -@@ -370,7 +370,7 @@ static int cap_get_buf_type(unsigned int capabilities) - } else if (capabilities & V4L2_CAP_VIDEO_OUTPUT) { - return V4L2_BUF_TYPE_VIDEO_OUTPUT; - } else { -- printf("Device supports neither capture nor output.\n"); -+ fprintf(stderr, "Device supports neither capture nor output.\n"); - return -EINVAL; - } - -@@ -440,7 +440,7 @@ static int get_control(struct device *dev, unsigned int id, int type, - } - } - -- printf("unable to get control 0x%8.8x: %s (%d).\n", -+ fprintf(stderr, "unable to get control 0x%8.8x: %s (%d).\n", - id, strerror(errno), errno); - return -1; - } -@@ -484,12 +484,12 @@ static void set_control(struct device *dev, unsigned int id, int type, - val = old.value; - } - if (ret == -1) { -- printf("unable to set control 0x%8.8x: %s (%d).\n", -+ fprintf(stderr, "unable to set control 0x%8.8x: %s (%d).\n", - id, strerror(errno), errno); - return; - } - -- printf("Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", -+ fprintf(stderr, "Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", - id, old_val, val); - } - -@@ -504,7 +504,7 @@ static int video_get_format(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_G_FMT, &fmt); - if (ret < 0) { -- printf("Unable to get format: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to get format: %s (%d).\n", strerror(errno), - errno); - return ret; - } -@@ -514,7 +514,7 @@ static int video_get_format(struct device *dev) - dev->height = fmt.fmt.pix_mp.height; - dev->num_planes = fmt.fmt.pix_mp.num_planes; - -- printf("Video format: %s (%08x) %ux%u field %s, %u planes: \n", -+ fprintf(stderr, "Video format: %s (%08x) %ux%u field %s, %u planes: \n", - v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, - fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, - v4l2_field_name(fmt.fmt.pix_mp.field), -@@ -527,7 +527,7 @@ static int video_get_format(struct device *dev) - fmt.fmt.pix_mp.plane_fmt[i].bytesperline ? - fmt.fmt.pix_mp.plane_fmt[i].sizeimage : 0; - -- printf(" * Stride %u, buffer size %u\n", -+ fprintf(stderr, " * Stride %u, buffer size %u\n", - fmt.fmt.pix_mp.plane_fmt[i].bytesperline, - fmt.fmt.pix_mp.plane_fmt[i].sizeimage); - } -@@ -539,7 +539,7 @@ static int video_get_format(struct device *dev) - dev->plane_fmt[0].bytesperline = fmt.fmt.pix.bytesperline; - dev->plane_fmt[0].sizeimage = fmt.fmt.pix.bytesperline ? fmt.fmt.pix.sizeimage : 0; - -- printf("Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", -+ fprintf(stderr, "Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", - v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, - fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, - v4l2_field_name(fmt.fmt.pix_mp.field), -@@ -581,25 +581,25 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h, - - ret = ioctl(dev->fd, VIDIOC_S_FMT, &fmt); - if (ret < 0) { -- printf("Unable to set format: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to set format: %s (%d).\n", strerror(errno), - errno); - return ret; - } - - if (video_is_mplane(dev)) { -- printf("Video format set: %s (%08x) %ux%u field %s, %u planes: \n", -+ fprintf(stderr, "Video format set: %s (%08x) %ux%u field %s, %u planes: \n", - v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, - fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, - v4l2_field_name(fmt.fmt.pix_mp.field), - fmt.fmt.pix_mp.num_planes); - - for (i = 0; i < fmt.fmt.pix_mp.num_planes; i++) { -- printf(" * Stride %u, buffer size %u\n", -+ fprintf(stderr, " * Stride %u, buffer size %u\n", - fmt.fmt.pix_mp.plane_fmt[i].bytesperline, - fmt.fmt.pix_mp.plane_fmt[i].sizeimage); - } - } else { -- printf("Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", -+ fprintf(stderr, "Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", - v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, - fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, - v4l2_field_name(fmt.fmt.pix.field), -@@ -619,16 +619,16 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f - - ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); - if (ret < 0) { -- printf("Unable to get frame rate: %s (%d).\n", -+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n", - strerror(errno), errno); - return ret; - } - -- printf("Current frame rate: %u/%u\n", -+ fprintf(stderr, "Current frame rate: %u/%u\n", - parm.parm.capture.timeperframe.numerator, - parm.parm.capture.timeperframe.denominator); - -- printf("Setting frame rate to: %u/%u\n", -+ fprintf(stderr, "Setting frame rate to: %u/%u\n", - time_per_frame->numerator, - time_per_frame->denominator); - -@@ -637,19 +637,19 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f - - ret = ioctl(dev->fd, VIDIOC_S_PARM, &parm); - if (ret < 0) { -- printf("Unable to set frame rate: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to set frame rate: %s (%d).\n", strerror(errno), - errno); - return ret; - } - - ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); - if (ret < 0) { -- printf("Unable to get frame rate: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n", strerror(errno), - errno); - return ret; - } - -- printf("Frame rate set: %u/%u\n", -+ fprintf(stderr, "Frame rate set: %u/%u\n", - parm.parm.capture.timeperframe.numerator, - parm.parm.capture.timeperframe.denominator); - return 0; -@@ -674,7 +674,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, - buffer->mem[i] = mmap(0, length, PROT_READ | PROT_WRITE, MAP_SHARED, - dev->fd, offset); - if (buffer->mem[i] == MAP_FAILED) { -- printf("Unable to map buffer %u/%u: %s (%d)\n", -+ fprintf(stderr, "Unable to map buffer %u/%u: %s (%d)\n", - buffer->idx, i, strerror(errno), errno); - return -1; - } -@@ -682,7 +682,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, - buffer->size[i] = length; - buffer->padding[i] = 0; - -- printf("Buffer %u/%u mapped at address %p.\n", -+ fprintf(stderr, "Buffer %u/%u mapped at address %p.\n", - buffer->idx, i, buffer->mem[i]); - } - -@@ -697,7 +697,7 @@ static int video_buffer_munmap(struct device *dev, struct buffer *buffer) - for (i = 0; i < dev->num_planes; i++) { - ret = munmap(buffer->mem[i], buffer->size[i]); - if (ret < 0) { -- printf("Unable to unmap buffer %u/%u: %s (%d)\n", -+ fprintf(stderr, "Unable to unmap buffer %u/%u: %s (%d)\n", - buffer->idx, i, strerror(errno), errno); - } - -@@ -725,7 +725,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, - ret = posix_memalign(&buffer->mem[i], page_size, - length + offset + padding); - if (ret < 0) { -- printf("Unable to allocate buffer %u/%u (%d)\n", -+ fprintf(stderr, "Unable to allocate buffer %u/%u (%d)\n", - buffer->idx, i, ret); - return -ENOMEM; - } -@@ -734,7 +734,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, - buffer->size[i] = length; - buffer->padding[i] = padding; - -- printf("Buffer %u/%u allocated at address %p.\n", -+ fprintf(stderr, "Buffer %u/%u allocated at address %p.\n", - buffer->idx, i, buffer->mem[i]); - } - -@@ -809,12 +809,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, - - ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); - if (ret < 0) { -- printf("Unable to request buffers: %s (%d).\n", strerror(errno), -+ fprintf(stderr, "Unable to request buffers: %s (%d).\n", strerror(errno), - errno); - return ret; - } - -- printf("%u buffers requested.\n", rb.count); -+ fprintf(stderr, "%u buffers requested.\n", rb.count); - - buffers = malloc(rb.count * sizeof buffers[0]); - if (buffers == NULL) -@@ -835,12 +835,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, - - ret = ioctl(dev->fd, VIDIOC_QUERYBUF, &buf); - if (ret < 0) { -- printf("Unable to query buffer %u: %s (%d).\n", i, -+ fprintf(stderr, "Unable to query buffer %u: %s (%d).\n", i, - strerror(errno), errno); - return ret; - } - get_ts_flags(buf.flags, &ts_type, &ts_source); -- printf("length: %u offset: %u timestamp type/source: %s/%s\n", -+ fprintf(stderr, "length: %u offset: %u timestamp type/source: %s/%s\n", - buf.length, buf.m.offset, ts_type, ts_source); - - buffers[i].idx = i; -@@ -899,12 +899,12 @@ static int video_free_buffers(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); - if (ret < 0) { -- printf("Unable to release buffers: %s (%d).\n", -+ fprintf(stderr, "Unable to release buffers: %s (%d).\n", - strerror(errno), errno); - return ret; - } - -- printf("%u buffers released.\n", dev->nbufs); -+ fprintf(stderr, "%u buffers released.\n", dev->nbufs); - - free(dev->buffers); - dev->nbufs = 0; -@@ -974,7 +974,7 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo - - ret = ioctl(dev->fd, VIDIOC_QBUF, &buf); - if (ret < 0) -- printf("Unable to queue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to queue buffer: %s (%d).\n", - strerror(errno), errno); - - return ret; -@@ -987,7 +987,7 @@ static int video_enable(struct device *dev, int enable) - - ret = ioctl(dev->fd, enable ? VIDIOC_STREAMON : VIDIOC_STREAMOFF, &type); - if (ret < 0) { -- printf("Unable to %s streaming: %s (%d).\n", -+ fprintf(stderr, "Unable to %s streaming: %s (%d).\n", - enable ? "start" : "stop", strerror(errno), errno); - return ret; - } -@@ -1009,10 +1009,10 @@ static void video_query_menu(struct device *dev, struct v4l2_queryctrl *query, - continue; - - if (query->type == V4L2_CTRL_TYPE_MENU) -- printf(" %u: %.32s%s\n", menu.index, menu.name, -+ fprintf(stderr, " %u: %.32s%s\n", menu.index, menu.name, - menu.index == value ? " (*)" : ""); - else -- printf(" %u: %lld%s\n", menu.index, menu.value, -+ fprintf(stderr, " %u: %lld%s\n", menu.index, menu.value, - menu.index == value ? " (*)" : ""); - }; - } -@@ -1043,7 +1043,7 @@ static void video_list_controls(struct device *dev) - continue; - - if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS) { -- printf("--- %s (class 0x%08x) ---\n", query.name, query.id); -+ fprintf(stderr, "--- %s (class 0x%08x) ---\n", query.name, query.id); - continue; - } - -@@ -1053,7 +1053,7 @@ static void video_list_controls(struct device *dev) - else - sprintf(value, "%" PRId64, val64); - -- printf("control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", -+ fprintf(stderr, "control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", - query.id, query.name, query.minimum, query.maximum, - query.step, query.default_value, value); - -@@ -1065,9 +1065,9 @@ static void video_list_controls(struct device *dev) - } - - if (nctrls) -- printf("%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); -+ fprintf(stderr, "%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); - else -- printf("No control found.\n"); -+ fprintf(stderr, "No control found.\n"); - } - - static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, -@@ -1088,30 +1088,30 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, - break; - - if (i != ival.index) -- printf("Warning: driver returned wrong ival index " -+ fprintf(stderr, "Warning: driver returned wrong ival index " - "%u.\n", ival.index); - if (pixelformat != ival.pixel_format) -- printf("Warning: driver returned wrong ival pixel " -+ fprintf(stderr, "Warning: driver returned wrong ival pixel " - "format %08x.\n", ival.pixel_format); - if (width != ival.width) -- printf("Warning: driver returned wrong ival width " -+ fprintf(stderr, "Warning: driver returned wrong ival width " - "%u.\n", ival.width); - if (height != ival.height) -- printf("Warning: driver returned wrong ival height " -+ fprintf(stderr, "Warning: driver returned wrong ival height " - "%u.\n", ival.height); - - if (i != 0) -- printf(", "); -+ fprintf(stderr, ", "); - - switch (ival.type) { - case V4L2_FRMIVAL_TYPE_DISCRETE: -- printf("%u/%u", -+ fprintf(stderr, "%u/%u", - ival.discrete.numerator, - ival.discrete.denominator); - break; - - case V4L2_FRMIVAL_TYPE_CONTINUOUS: -- printf("%u/%u - %u/%u", -+ fprintf(stderr, "%u/%u - %u/%u", - ival.stepwise.min.numerator, - ival.stepwise.min.denominator, - ival.stepwise.max.numerator, -@@ -1119,7 +1119,7 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, - return; - - case V4L2_FRMIVAL_TYPE_STEPWISE: -- printf("%u/%u - %u/%u (by %u/%u)", -+ fprintf(stderr, "%u/%u - %u/%u (by %u/%u)", - ival.stepwise.min.numerator, - ival.stepwise.min.denominator, - ival.stepwise.max.numerator, -@@ -1149,23 +1149,23 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - break; - - if (i != frame.index) -- printf("Warning: driver returned wrong frame index " -+ fprintf(stderr, "Warning: driver returned wrong frame index " - "%u.\n", frame.index); - if (pixelformat != frame.pixel_format) -- printf("Warning: driver returned wrong frame pixel " -+ fprintf(stderr, "Warning: driver returned wrong frame pixel " - "format %08x.\n", frame.pixel_format); - - switch (frame.type) { - case V4L2_FRMSIZE_TYPE_DISCRETE: -- printf("\tFrame size: %ux%u (", frame.discrete.width, -+ fprintf(stderr, "\tFrame size: %ux%u (", frame.discrete.width, - frame.discrete.height); - video_enum_frame_intervals(dev, frame.pixel_format, - frame.discrete.width, frame.discrete.height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - case V4L2_FRMSIZE_TYPE_CONTINUOUS: -- printf("\tFrame size: %ux%u - %ux%u (", -+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (", - frame.stepwise.min_width, - frame.stepwise.min_height, - frame.stepwise.max_width, -@@ -1173,11 +1173,11 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - video_enum_frame_intervals(dev, frame.pixel_format, - frame.stepwise.max_width, - frame.stepwise.max_height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - case V4L2_FRMSIZE_TYPE_STEPWISE: -- printf("\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", -+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", - frame.stepwise.min_width, - frame.stepwise.min_height, - frame.stepwise.max_width, -@@ -1187,7 +1187,7 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) - video_enum_frame_intervals(dev, frame.pixel_format, - frame.stepwise.max_width, - frame.stepwise.max_height); -- printf(")\n"); -+ fprintf(stderr, ")\n"); - break; - - default: -@@ -1211,19 +1211,19 @@ static void video_enum_formats(struct device *dev, enum v4l2_buf_type type) - break; - - if (i != fmt.index) -- printf("Warning: driver returned wrong format index " -+ fprintf(stderr, "Warning: driver returned wrong format index " - "%u.\n", fmt.index); - if (type != fmt.type) -- printf("Warning: driver returned wrong format type " -+ fprintf(stderr, "Warning: driver returned wrong format type " - "%u.\n", fmt.type); - -- printf("\tFormat %u: %s (%08x)\n", i, -+ fprintf(stderr, "\tFormat %u: %s (%08x)\n", i, - v4l2_format_name(fmt.pixelformat), fmt.pixelformat); -- printf("\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), -+ fprintf(stderr, "\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), - fmt.type); -- printf("\tName: %.32s\n", fmt.description); -+ fprintf(stderr, "\tName: %.32s\n", fmt.description); - video_enum_frame_sizes(dev, fmt.pixelformat); -- printf("\n"); -+ fprintf(stderr, "\n"); - } - } - -@@ -1241,13 +1241,13 @@ static void video_enum_inputs(struct device *dev) - break; - - if (i != input.index) -- printf("Warning: driver returned wrong input index " -+ fprintf(stderr, "Warning: driver returned wrong input index " - "%u.\n", input.index); - -- printf("\tInput %u: %s.\n", i, input.name); -+ fprintf(stderr, "\tInput %u: %s.\n", i, input.name); - } - -- printf("\n"); -+ fprintf(stderr, "\n"); - } - - static int video_get_input(struct device *dev) -@@ -1257,7 +1257,7 @@ static int video_get_input(struct device *dev) - - ret = ioctl(dev->fd, VIDIOC_G_INPUT, &input); - if (ret < 0) { -- printf("Unable to get current input: %s (%d).\n", -+ fprintf(stderr, "Unable to get current input: %s (%d).\n", - strerror(errno), errno); - return ret; - } -@@ -1272,7 +1272,7 @@ static int video_set_input(struct device *dev, unsigned int input) - - ret = ioctl(dev->fd, VIDIOC_S_INPUT, &_input); - if (ret < 0) -- printf("Unable to select input %u: %s (%d).\n", input, -+ fprintf(stderr, "Unable to select input %u: %s (%d).\n", input, - strerror(errno), errno); - - return ret; -@@ -1291,14 +1291,14 @@ static int video_set_quality(struct device *dev, unsigned int quality) - - ret = ioctl(dev->fd, VIDIOC_S_JPEGCOMP, &jpeg); - if (ret < 0) { -- printf("Unable to set quality to %u: %s (%d).\n", quality, -+ fprintf(stderr, "Unable to set quality to %u: %s (%d).\n", quality, - strerror(errno), errno); - return ret; - } - - ret = ioctl(dev->fd, VIDIOC_G_JPEGCOMP, &jpeg); - if (ret >= 0) -- printf("Quality set to %u\n", jpeg.quality); -+ fprintf(stderr, "Quality set to %u\n", jpeg.quality); - - return 0; - } -@@ -1313,7 +1313,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - if (filename != NULL) { - fd = open(filename, O_RDONLY); - if (fd == -1) { -- printf("Unable to open test pattern file '%s': %s (%d).\n", -+ fprintf(stderr, "Unable to open test pattern file '%s': %s (%d).\n", - filename, strerror(errno), errno); - return -errno; - } -@@ -1331,7 +1331,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - if (filename != NULL) { - ret = read(fd, dev->pattern[plane], size); - if (ret != (int)size && dev->plane_fmt[plane].bytesperline != 0) { -- printf("Test pattern file size %u doesn't match image size %u\n", -+ fprintf(stderr, "Test pattern file size %u doesn't match image size %u\n", - ret, size); - ret = -EINVAL; - goto done; -@@ -1341,7 +1341,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) - unsigned int i; - - if (dev->plane_fmt[plane].bytesperline == 0) { -- printf("Compressed format detected for plane %u and no test pattern filename given.\n" -+ fprintf(stderr, "Compressed format detected for plane %u and no test pattern filename given.\n" - "The test pattern can't be generated automatically.\n", plane); - ret = -EINVAL; - goto done; -@@ -1410,7 +1410,7 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) - - if (dev->plane_fmt[plane].sizeimage && - dev->plane_fmt[plane].sizeimage != length) -- printf("Warning: bytes used %u != image size %u for plane %u\n", -+ fprintf(stderr, "Warning: bytes used %u != image size %u for plane %u\n", - length, dev->plane_fmt[plane].sizeimage, plane); - - if (buffer->padding[plane] == 0) -@@ -1424,16 +1424,16 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) - } - - if (errors) { -- printf("Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", -+ fprintf(stderr, "Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", - errors, dirty, plane); - - dirty = (dirty + 15) & ~15; - dirty = dirty > 32 ? 32 : dirty; - - for (i = 0; i < dirty; ++i) { -- printf("%02x ", data[i]); -+ fprintf(stderr, "%02x ", data[i]); - if (i % 16 == 15) -- printf("\n"); -+ fprintf(stderr, "\n"); - } - } - } -@@ -1481,18 +1481,32 @@ static void video_save_image(struct device *dev, struct v4l2_buffer *buf, - - ret = write(fd, dev->buffers[buf->index].mem[i], length); - if (ret < 0) { -- printf("write error: %s (%d)\n", strerror(errno), errno); -+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); - break; - } else if (ret != (int)length) -- printf("write error: only %d bytes written instead of %u\n", -+ fprintf(stderr, "write error: only %d bytes written instead of %u\n", - ret, length); - } - close(fd); - } - -+static void video_stdout_image(struct device *dev, struct v4l2_buffer *buf) -+{ -+ int ret; -+ -+ fprintf(stderr, "stdout"); -+ ret = fwrite(dev->buffers[buf->index].mem, buf->bytesused, 1, stdout); -+ -+ if (ret < 0) -+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); -+ else if (ret != (int)buf->bytesused) -+ fprintf(stderr, "write error: only %d bytes written instead of %u\n", -+ ret, buf->bytesused); -+} -+ - static int video_do_capture(struct device *dev, unsigned int nframes, - unsigned int skip, unsigned int delay, const char *pattern, -- int do_requeue_last, enum buffer_fill_mode fill) -+ int do_requeue_last, enum buffer_fill_mode fill, int do_stdout) - { - struct v4l2_plane planes[VIDEO_MAX_PLANES]; - struct v4l2_buffer buf; -@@ -1529,7 +1543,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - ret = ioctl(dev->fd, VIDIOC_DQBUF, &buf); - if (ret < 0) { - if (errno != EIO) { -- printf("Unable to dequeue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to dequeue buffer: %s (%d).\n", - strerror(errno), errno); - goto done; - } -@@ -1550,7 +1564,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - - clock_gettime(CLOCK_MONOTONIC, &ts); - get_ts_flags(buf.flags, &ts_type, &ts_source); -- printf("%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, -+ fprintf(stderr, "%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, - (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-', - v4l2_field_name(buf.field), - buf.sequence, buf.bytesused, buf.timestamp.tv_sec, -@@ -1563,6 +1577,9 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - if (video_is_capture(dev) && pattern && !skip) - video_save_image(dev, &buf, pattern, i); - -+ if (video_is_capture(dev) && do_stdout && !skip) -+ video_stdout_image(dev, &buf); -+ - if (skip) - --skip; - -@@ -1577,7 +1594,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - - ret = video_queue_buffer(dev, buf.index, fill); - if (ret < 0) { -- printf("Unable to requeue buffer: %s (%d).\n", -+ fprintf(stderr, "Unable to requeue buffer: %s (%d).\n", - strerror(errno), errno); - goto done; - } -@@ -1587,7 +1604,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - video_enable(dev, 0); - - if (nframes == 0) { -- printf("No frames captured.\n"); -+ fprintf(stderr, "No frames captured.\n"); - goto done; - } - -@@ -1604,7 +1621,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, - bps = size/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; - fps = i/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; - -- printf("Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", -+ fprintf(stderr, "Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", - i, ts.tv_sec, ts.tv_nsec/1000, fps, bps); - - done: -@@ -1616,42 +1633,42 @@ done: - - static void usage(const char *argv0) - { -- printf("Usage: %s [options] device\n", argv0); -- printf("Supported options:\n"); -- printf("-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); -- printf(" \"capture-mplane\" or \"output-mplane\")\n"); -- printf("-c, --capture[=nframes] Capture frames\n"); -- printf("-C, --check-overrun Verify dequeued frames for buffer overrun\n"); -- printf("-d, --delay Delay (in ms) before requeuing buffers\n"); -- printf("-f, --format format Set the video format\n"); -- printf("-F, --file[=name] Read/write frames from/to disk\n"); -- printf("\tFor video capture devices, the first '#' character in the file name is\n"); -- printf("\texpanded to the frame sequence number. The default file name is\n"); -- printf("\t'frame-#.bin'.\n"); -- printf("-h, --help Show this help screen\n"); -- printf("-i, --input input Select the video input\n"); -- printf("-I, --fill-frames Fill frames with check pattern before queuing them\n"); -- printf("-l, --list-controls List available controls\n"); -- printf("-n, --nbufs n Set the number of video buffers\n"); -- printf("-p, --pause Pause before starting the video stream\n"); -- printf("-q, --quality n MJPEG quality (0-100)\n"); -- printf("-r, --get-control ctrl Get control 'ctrl'\n"); -- printf("-R, --realtime=[priority] Enable realtime RR scheduling\n"); -- printf("-s, --size WxH Set the frame size\n"); -- printf("-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); -- printf("-u, --userptr Use the user pointers streaming method\n"); -- printf("-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); -- printf(" --enum-formats Enumerate formats\n"); -- printf(" --enum-inputs Enumerate inputs\n"); -- printf(" --fd Use a numeric file descriptor insted of a device\n"); -- printf(" --field Interlaced format field order\n"); -- printf(" --no-query Don't query capabilities on open\n"); -- printf(" --offset User pointer buffer offset from page start\n"); -- printf(" --requeue-last Requeue the last buffers before streamoff\n"); -- printf(" --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); -- printf(" --skip n Skip the first n frames\n"); -- printf(" --sleep-forever Sleep forever after configuring the device\n"); -- printf(" --stride value Line stride in bytes\n"); -+ fprintf(stderr, "Usage: %s [options] device\n", argv0); -+ fprintf(stderr, "Supported options:\n"); -+ fprintf(stderr, "-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); -+ fprintf(stderr, " \"capture-mplane\" or \"output-mplane\")\n"); -+ fprintf(stderr, "-c, --capture[=nframes] Capture frames\n"); -+ fprintf(stderr, "-C, --check-overrun Verify dequeued frames for buffer overrun\n"); -+ fprintf(stderr, "-d, --delay Delay (in ms) before requeuing buffers\n"); -+ fprintf(stderr, "-f, --format format Set the video format\n"); -+ fprintf(stderr, "-F, --file[=name] Read/write frames from/to disk\n"); -+ fprintf(stderr, "\tFor video capture devices, the first '#' character in the file name is\n"); -+ fprintf(stderr, "\texpanded to the frame sequence number. The default file name is\n"); -+ fprintf(stderr, "\t'frame-#.bin'.\n"); -+ fprintf(stderr, "-h, --help Show this help screen\n"); -+ fprintf(stderr, "-i, --input input Select the video input\n"); -+ fprintf(stderr, "-I, --fill-frames Fill frames with check pattern before queuing them\n"); -+ fprintf(stderr, "-l, --list-controls List available controls\n"); -+ fprintf(stderr, "-n, --nbufs n Set the number of video buffers\n"); -+ fprintf(stderr, "-p, --pause Pause before starting the video stream\n"); -+ fprintf(stderr, "-q, --quality n MJPEG quality (0-100)\n"); -+ fprintf(stderr, "-r, --get-control ctrl Get control 'ctrl'\n"); -+ fprintf(stderr, "-R, --realtime=[priority] Enable realtime RR scheduling\n"); -+ fprintf(stderr, "-s, --size WxH Set the frame size\n"); -+ fprintf(stderr, "-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); -+ fprintf(stderr, "-u, --userptr Use the user pointers streaming method\n"); -+ fprintf(stderr, "-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); -+ fprintf(stderr, " --enum-formats Enumerate formats\n"); -+ fprintf(stderr, " --enum-inputs Enumerate inputs\n"); -+ fprintf(stderr, " --fd Use a numeric file descriptor insted of a device\n"); -+ fprintf(stderr, " --field Interlaced format field order\n"); -+ fprintf(stderr, " --no-query Don't query capabilities on open\n"); -+ fprintf(stderr, " --offset User pointer buffer offset from page start\n"); -+ fprintf(stderr, " --requeue-last Requeue the last buffers before streamoff\n"); -+ fprintf(stderr, " --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); -+ fprintf(stderr, " --skip n Skip the first n frames\n"); -+ fprintf(stderr, " --sleep-forever Sleep forever after configuring the device\n"); -+ fprintf(stderr, " --stride value Line stride in bytes\n"); - } - - #define OPT_ENUM_FORMATS 256 -@@ -1665,6 +1682,7 @@ static void usage(const char *argv0) - #define OPT_FD 264 - #define OPT_TSTAMP_SRC 265 - #define OPT_FIELD 266 -+#define OPT_STDOUT 267 - - static struct option opts[] = { - {"buffer-type", 1, 0, 'B'}, -@@ -1677,6 +1695,7 @@ static struct option opts[] = { - {"field", 1, 0, OPT_FIELD}, - {"file", 2, 0, 'F'}, - {"fill-frames", 0, 0, 'I'}, -+ {"stdout", 0, 0, OPT_STDOUT}, - {"format", 1, 0, 'f'}, - {"help", 0, 0, 'h'}, - {"input", 1, 0, 'i'}, -@@ -1717,7 +1736,8 @@ int main(int argc, char *argv[]) - int do_list_controls = 0, do_get_control = 0, do_set_control = 0; - int do_sleep_forever = 0, do_requeue_last = 0; - int do_rt = 0; -- int no_query = 0; -+ int no_query = 0; -+ int do_stdout = 0; - char *endptr; - int c; - -@@ -1755,7 +1775,7 @@ int main(int argc, char *argv[]) - case 'B': - ret = v4l2_buf_type_from_string(optarg); - if (ret == -1) { -- printf("Bad buffer type \"%s\"\n", optarg); -+ fprintf(stderr, "Bad buffer type \"%s\"\n", optarg); - return 1; - } - video_set_buf_type(&dev, ret); -@@ -1775,7 +1795,7 @@ int main(int argc, char *argv[]) - do_set_format = 1; - info = v4l2_format_by_name(optarg); - if (info == NULL) { -- printf("Unsupported video format '%s'\n", optarg); -+ fprintf(stderr, "Unsupported video format '%s'\n", optarg); - return 1; - } - pixelformat = info->fourcc; -@@ -1812,7 +1832,7 @@ int main(int argc, char *argv[]) - case 'r': - ctrl_name = strtol(optarg, &endptr, 0); - if (*endptr != 0) { -- printf("Invalid control name '%s'\n", optarg); -+ fprintf(stderr, "Invalid control name '%s'\n", optarg); - return 1; - } - do_get_control = 1; -@@ -1826,12 +1846,12 @@ int main(int argc, char *argv[]) - do_set_format = 1; - width = strtol(optarg, &endptr, 10); - if (*endptr != 'x' || endptr == optarg) { -- printf("Invalid size '%s'\n", optarg); -+ fprintf(stderr, "Invalid size '%s'\n", optarg); - return 1; - } - height = strtol(endptr + 1, &endptr, 10); - if (*endptr != 0) { -- printf("Invalid size '%s'\n", optarg); -+ fprintf(stderr, "Invalid size '%s'\n", optarg); - return 1; - } - break; -@@ -1839,12 +1859,12 @@ int main(int argc, char *argv[]) - do_set_time_per_frame = 1; - time_per_frame.numerator = strtol(optarg, &endptr, 10); - if (*endptr != '/' || endptr == optarg) { -- printf("Invalid time per frame '%s'\n", optarg); -+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg); - return 1; - } - time_per_frame.denominator = strtol(endptr + 1, &endptr, 10); - if (*endptr != 0) { -- printf("Invalid time per frame '%s'\n", optarg); -+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg); - return 1; - } - break; -@@ -1854,12 +1874,12 @@ int main(int argc, char *argv[]) - case 'w': - ctrl_name = strtol(optarg, &endptr, 0); - if (*endptr != ' ' || endptr == optarg) { -- printf("Invalid control name '%s'\n", optarg); -+ fprintf(stderr, "Invalid control name '%s'\n", optarg); - return 1; - } - ctrl_value = strtol(endptr + 1, &endptr, 0); - if (*endptr != 0) { -- printf("Invalid control value '%s'\n", optarg); -+ fprintf(stderr, "Invalid control value '%s'\n", optarg); - return 1; - } - do_set_control = 1; -@@ -1873,16 +1893,16 @@ int main(int argc, char *argv[]) - case OPT_FD: - ret = atoi(optarg); - if (ret < 0) { -- printf("Bad file descriptor %d\n", ret); -+ fprintf(stderr, "Bad file descriptor %d\n", ret); - return 1; - } -- printf("Using file descriptor %d\n", ret); -+ fprintf(stderr, "Using file descriptor %d\n", ret); - video_set_fd(&dev, ret); - break; - case OPT_FIELD: - field = v4l2_field_from_string(optarg); - if (field == (enum v4l2_field)-1) { -- printf("Invalid field order '%s'\n", optarg); -+ fprintf(stderr, "Invalid field order '%s'\n", optarg); - return 1; - } - break; -@@ -1907,22 +1927,25 @@ int main(int argc, char *argv[]) - } else if (!strcmp(optarg, "soe")) { - dev.buffer_output_flags |= V4L2_BUF_FLAG_TSTAMP_SRC_SOE; - } else { -- printf("Invalid timestamp source %s\n", optarg); -+ fprintf(stderr, "Invalid timestamp source %s\n", optarg); - return 1; - } - break; - case OPT_USERPTR_OFFSET: - userptr_offset = atoi(optarg); - break; -+ case OPT_STDOUT: -+ do_stdout = 1; -+ break; - default: -- printf("Invalid option -%c\n", c); -- printf("Run %s -h for help.\n", argv[0]); -+ fprintf(stderr, "Invalid option -%c\n", c); -+ fprintf(stderr, "Run %s -h for help.\n", argv[0]); - return 1; - } - } - - if ((fill_mode & BUFFER_FILL_PADDING) && memtype != V4L2_MEMORY_USERPTR) { -- printf("Buffer overrun can only be checked in USERPTR mode.\n"); -+ fprintf(stderr, "Buffer overrun can only be checked in USERPTR mode.\n"); - return 1; - } - -@@ -1959,7 +1982,7 @@ int main(int argc, char *argv[]) - ret = get_control(&dev, ctrl_name, - get_control_type(&dev, ctrl_name), &val); - if (ret >= 0) -- printf("Control 0x%08x value %" PRId64 "\n", ctrl_name, val); -+ fprintf(stderr, "Control 0x%08x value %" PRId64 "\n", ctrl_name, val); - } - - if (do_set_control) -@@ -1970,7 +1993,7 @@ int main(int argc, char *argv[]) - video_list_controls(&dev); - - if (do_enum_formats) { -- printf("- Available formats:\n"); -+ fprintf(stderr, "- Available formats:\n"); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); - video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_OUTPUT); -@@ -1979,14 +2002,14 @@ int main(int argc, char *argv[]) - } - - if (do_enum_inputs) { -- printf("- Available inputs:\n"); -+ fprintf(stderr, "- Available inputs:\n"); - video_enum_inputs(&dev); - } - - if (do_set_input) { - video_set_input(&dev, input); - ret = video_get_input(&dev); -- printf("Input %d selected\n", ret); -+ fprintf(stderr, "Input %d selected\n", ret); - } - - /* Set the video format. */ -@@ -2028,7 +2051,7 @@ int main(int argc, char *argv[]) - } - - if (do_pause) { -- printf("Press enter to start capture\n"); -+ fprintf(stderr, "Press enter to start capture\n"); - getchar(); - } - -@@ -2037,12 +2060,12 @@ int main(int argc, char *argv[]) - sched.sched_priority = rt_priority; - ret = sched_setscheduler(0, SCHED_RR, &sched); - if (ret < 0) -- printf("Failed to select RR scheduler: %s (%d)\n", -+ fprintf(stderr, "Failed to select RR scheduler: %s (%d)\n", - strerror(errno), errno); - } - - if (video_do_capture(&dev, nframes, skip, delay, filename, -- do_requeue_last, fill_mode) < 0) { -+ do_requeue_last, fill_mode, do_stdout) < 0) { - video_close(&dev); - return 1; - } --- -1.7.9.5 - diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index a192d1a3bb..3069528301 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -1,13 +1,12 @@ SUMMARY = "Yet Another V4L2 Test Application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://git.ideasonboard.org/yavta.git \ - file://0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch" -SRCREV = "7e9f28bedc1ed3205fb5164f686aea96f27a0de2" +SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ + " +SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" PV = "0.0" -PR = "r2" S = "${WORKDIR}/git" EXTRA_OEMAKE = "-e MAKEFLAGS=" diff --git a/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch b/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch new file mode 100644 index 0000000000..d66ad4f268 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/files/extract-libtool-and-convert-to-soversion.patch @@ -0,0 +1,35 @@ +From 25e12cf5918884f232cebc34c92bd548fe40c2b3 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:13:09 +0100 +Subject: [PATCH] cmake: extract libtool from configure.ac and convert to + SOVERSION + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/25e12cf5918884f232cebc34c92bd548fe40c2b3] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adc73b09..7ae5043f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,18 @@ cmake_minimum_required(VERSION 3.2) + + project(WavPack VERSION 5.6.0) + ++file(READ "${CMAKE_CURRENT_SOURCE_DIR}/configure.ac" CONFIGURE_AC) ++string(REGEX MATCH "LT_CURRENT=([0-9]+)" LT_CURRENT "${CONFIGURE_AC}") ++set(LT_CURRENT "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_REVISION=([0-9]+)" LT_REVISION "${CONFIGURE_AC}") ++set(LT_REVISION "${CMAKE_MATCH_1}") ++string(REGEX MATCH "LT_AGE=([0-9]+)" LT_AGE "${CONFIGURE_AC}") ++set(LT_AGE "${CMAKE_MATCH_1}") ++ ++math(EXPR SOVERSION_MAJOR "${LT_CURRENT}-${LT_AGE}") ++math(EXPR SOVERSION_MINOR "${LT_AGE}") ++math(EXPR SOVERSION_MICRO "${LT_REVISION}") ++ + # Languages + + include(CheckLanguage) diff --git a/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch b/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch new file mode 100644 index 0000000000..faddb7b754 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/files/set-soversion-and-version.patch @@ -0,0 +1,26 @@ +From 7c1dd729302b7f77f65884df4e79301df1490423 Mon Sep 17 00:00:00 2001 +From: Anonymous Maarten <anonymous.maarten@gmail.com> +Date: Fri, 9 Dec 2022 19:23:51 +0100 +Subject: [PATCH] cmake: set SOVERSION and VERSION property of wavpack + +This is used to version .so libraries on Linux + +Upstream-Status: Backport [https://github.com/dbry/WavPack/commit/7c1dd729302b7f77f65884df4e79301df1490423] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ae5043f..285b295b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -361,6 +361,8 @@ if(BUILD_SHARED_LIBS) + target_link_directories(wavpack PRIVATE "-Wl,-exported_symbols_list,${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym") + endif() + else() ++ set_target_properties(wavpack PROPERTIES SOVERSION "${SOVERSION_MAJOR}") ++ set_target_properties(wavpack PROPERTIES VERSION "${SOVERSION_MAJOR}.${SOVERSION_MINOR}.${SOVERSION_MICRO}") + set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym;\n};\n\nVERS_2 {\n global: sym;\n} VERS_1;\n") + file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") + check_c_linker_flag("-Wl,--version-script=${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map" COMPILER_SUPPORTS_SYMBOL_MAPS) diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb deleted file mode 100644 index 021496bd43..0000000000 --- a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8" - -SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2" -SRC_URI[md5sum] = "7bb1528f910e4d0003426c02db856063" -SRC_URI[sha256sum] = "175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5" - -inherit autotools lib_package - diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb new file mode 100644 index 0000000000..7384d2892f --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_5.6.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://license.txt;md5=bb5d037e3ad41a3c84c9f2d8bb65a7b4" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/dbry/WavPack.git;branch=master;protocol=https \ + file://set-soversion-and-version.patch \ + file://extract-libtool-and-convert-to-soversion.patch \ + " + +SRCREV = "e03e8e29dc618e08e7baba9636e57ba1254874ce" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig lib_package + +EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index 6ad7f2b478..463651aa4a 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -1,19 +1,20 @@ -From dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 +From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 16 Aug 2011 16:04:35 +0200 Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). +Upstream-Status: Pending --- build/make/configure.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh -index 007e020..04d5cbf 100644 +index b645a666f..0b99a8b38 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -581,6 +581,8 @@ process_common_cmdline() { +@@ -658,6 +658,8 @@ process_common_cmdline() { ;; --prefix=*) prefix="${optval}" @@ -22,7 +23,7 @@ index 007e020..04d5cbf 100644 ;; --libdir=*) libdir="${optval}" -@@ -614,13 +616,23 @@ process_cmdline() { +@@ -687,13 +689,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb index 4a98ec17dd..b4d49842ea 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_1.8.2.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb @@ -7,9 +7,9 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "7ec7a33a081aeeb53fed1a8d87e4cbd189152527" -SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https \ - file://libvpx-configure-support-blank-prefix.patch \ +SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" +SRC_URI += "git://chromium.googlesource.com/webm/libvpx;protocol=https;branch=main \ + file://libvpx-configure-support-blank-prefix.patch \ " S = "${WORKDIR}/git" @@ -19,13 +19,12 @@ S = "${WORKDIR}/git" ARM_INSTRUCTION_SET = "arm" CFLAGS += "-fPIC" +BUILD_LDFLAGS += "-pthread" export CC export LD = "${CC}" -VPXTARGET_armv5te = "armv5te-linux-gcc" -VPXTARGET_armv6 = "armv6-linux-gcc" -VPXTARGET_armv7a = "armv7-linux-gcc" +VPXTARGET:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7-linux-gcc","generic-gnu",d)}" VPXTARGET ?= "generic-gnu" CONFIGUREOPTS = " \ @@ -48,3 +47,5 @@ do_install() { oe_runmake install DESTDIR=${D} chown -R root:root ${D} } + +BBCLASSEXTEND += "native" diff --git a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch index da5841a132..ea9326946e 100644 --- a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch +++ b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- configure.ac.old 2005-06-03 12:53:28.000000000 +0200 +++ configure.ac 2005-06-03 12:54:29.000000000 +0200 @@ -25,9 +25,9 @@ diff --git a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb index b6aafdee19..f900aca2d4 100644 --- a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb +++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" # Remove runtime dependency on empty package ${PN} -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896" SRC_URI[sha256sum] = "a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe" diff --git a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch index 18bc67cdd9..995f03113b 100644 --- a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch +++ b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- Xsp/xsp.pc.in~ 2009-01-07 13:06:07.000000000 +0100 +++ Xsp/xsp.pc.in 2009-01-07 13:06:07.000000000 +0100 @@ -6,5 +6,5 @@ |