diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
29 files changed, 62 insertions, 154 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb index c8ea8b177f..4c38df4027 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.8.bb @@ -1,6 +1,6 @@ SUMMARY = "Alsa OSS Compatibility Package" SECTION = "libs/multimedia" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a" DEPENDS = "alsa-lib" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb index f4e19e4ad3..e91c81d703 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb +++ b/meta-openembedded/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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index e9841e483e..dd0405c953 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/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 diff --git a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb index 8b3aafc3b5..56d5e1201e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.8.8.bb @@ -1,7 +1,7 @@ SUMMARY = "An open source MPEG-4 and MPEG-2 AAC decoding library" HOMEPAGE = "http://www.audiocoding.com/faad2.html" SECTION = "libs" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index 21fa0bda1e..a7d645f59f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb @@ -1,6 +1,6 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch new file mode 100644 index 0000000000..1fa64812ef --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb index fa4da18c8c..bfdf26ed46 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb @@ -1,7 +1,7 @@ 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 \ " @@ -13,6 +13,7 @@ SRCREV = "de37569c926c5886768f892c019e3f0468615038" SRC_URI = " \ git://github.com/linuxaudio/a2jmidid;protocol=https;branch=master \ file://riscv_ucontext.patch \ + file://ppc_musl_ucontext.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb index 8411cbaefb..97b0edeed0 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.19.bb @@ -6,7 +6,7 @@ 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 & LGPL-2.1-only" 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 \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb index 0cae7c54bd..99eda69643 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.5.4.bb @@ -1,7 +1,7 @@ SUMMARY = "Library for reading, mastering and writing optical discs" HOMEPAGE = "http://libburnia-project.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" SRC_URI = "http://files.libburnia-project.org/releases/${BPN}-${PV}.tar.gz" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb index 3ca91f64a3..53404e54a8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb @@ -2,7 +2,7 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb index 170a555b9e..1facd47d8f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.1.0.bb @@ -1,7 +1,7 @@ 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 \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb index 791b4ae3e8..054fe4a482 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb @@ -1,6 +1,6 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb index 80581765ac..2f7edfb75c 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb @@ -1,7 +1,7 @@ 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 = "GPLv2+" +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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb index 2538cc4f12..d3ac85ee0b 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb @@ -1,7 +1,7 @@ SUMMARY = "MPEG Audio Decoder library" HOMEPAGE = "http://sourceforge.net/projects/mad/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb index 3e528fecf5..62c20c6122 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb +++ b/meta-openembedded/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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210824.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210824.bb index deacab2ac0..a899049b77 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210824.bb +++ b/meta-openembedded/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" @@ -55,6 +55,7 @@ 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" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb index 76e10f86a3..e0712ba930 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.11.1.bb +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb index 57e58b1ba8..c600e88f88 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.34.1.bb @@ -15,7 +15,7 @@ DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ " -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCREV_mpv = "349e437466163cb52f7d0aa227d4606edd9db501" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 591703e868..5f9d7a6ba4 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -1,7 +1,7 @@ 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 diff --git a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb index e4fb4ff026..87320a98e8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch index eb294b3fb4..8ac8fbe19e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch @@ -1,7 +1,8 @@ -From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001 +From 0d5c0e9a75eca43667b0e29155b635e50622b66a 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. @@ -16,7 +17,7 @@ Conflicts: 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 +index c48c8d6..e255e16 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -1,8 +1,7 @@ @@ -30,7 +31,7 @@ index ee7dcc9..d11fa2e 100644 +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_& },/;' \ + $(AM_V_GEN) 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 diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch deleted file mode 100644 index a849d465c7..0000000000 --- a/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch index 9fcf61165b..52fc2d7a8d 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-original-patch-mediactl-pkgconfig.patch @@ -1,13 +1,14 @@ -From 480c04ac6a9d11bfef9d4aca073052fdcee4fdea Mon Sep 17 00:00:00 2001 +From 320b8378ee30eb5e0fe83a8b397f822f2f88a4c1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 1 Mar 2015 22:25:07 +0000 +Subject: [PATCH] %% original patch: mediactl-pkgconfig.patch --- 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 +index e255e16..ff7b417 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -20,6 +20,7 @@ libv4l2subdev_la_LIBADD = libmediactl.la diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch index 55a5cdc8a1..39dc338350 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-original-patch-export-mediactl-headers.patch @@ -1,13 +1,14 @@ -From b82e509c10659a4647961a6da3adf4d285dea2dd Mon Sep 17 00:00:00 2001 +From f7109d6b2fcb291824d795071c04a492d9fbc45b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 1 Mar 2015 22:25:07 +0000 +Subject: [PATCH] %% original patch: export-mediactl-headers.patch --- 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 +index ff7b417..6ce656f 100644 --- a/utils/media-ctl/Makefile.am +++ b/utils/media-ctl/Makefile.am @@ -17,8 +17,8 @@ CLEANFILES = $(BUILT_SOURCES) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch index e3ce45d167..d8d1b8d184 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0007-Do-not-use-getsubopt.patch @@ -1,4 +1,4 @@ -From 4a10eab0e31d69948161241b1801c41201a5d081 Mon Sep 17 00:00:00 2001 +From e4582c11f76b9390a3e172dcf0741dca90a9dc8d 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 @@ -12,20 +12,21 @@ 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 +index c940171..49c0f39 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) +@@ -956,15 +956,17 @@ static bool parse_subset(char *optarg) static bool parse_next_subopt(char **subs, char **value) { - static char *const subopts[] = { -- NULL +- nullptr - }; - int opt = getsubopt(subs, subopts, value); + char *p = *subs; diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch deleted file mode 100644 index 5aec3c5747..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3f61e353424fb9ea3dce742022b94dfd7ea1ed9f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> -Date: Thu, 4 Mar 2021 14:23:39 +0100 -Subject: [PATCH] configure.ac: autodetect availability of systemd -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Import systemd's official suggestion [1] how this should be handled in packages -using autoconf. A side effect of this is the removal of the hardcoded fallback -path "/lib/systemd/system" which leaks build host information when cross -compiling v4l-utils and therefore defeats reproducible builds. - -[1] https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20systemd%20Service%20Files - -Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=3f61e353424fb9ea3dce742022b94dfd7ea1ed9f] - -Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> -Signed-off-by: Sean Young <sean@mess.org> ---- - configure.ac | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 727730c5ccf4..8470116df4b1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -388,7 +388,15 @@ AC_ARG_WITH(udevdir, - AC_ARG_WITH(systemdsystemunitdir, - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [set systemd system unit directory]), - [], -- [with_systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd || echo /lib/systemd/system`]) -+ [with_systemdsystemunitdir=auto]) -+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], -+ [def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) -+ AS_IF([test "x$def_systemdsystemunitdir" = "x"], -+ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], -+ [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) -+ with_systemdsystemunitdir=no], -+ [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) -+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) - - # Generic check: works with most distributions - def_gconv_dir=`for i in /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib; do if @<:@ -d \$i/gconv @:>@; then echo \$i/gconv; break; fi; done` --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch deleted file mode 100644 index 63a695f8f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 01f2c6c58e6f4441df7df8e27eb7919f1f01e310 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ulrich=20=C3=96lmann?= <u.oelmann@pengutronix.de> -Date: Thu, 4 Mar 2021 14:23:40 +0100 -Subject: [PATCH] keytable: restrict installation of 50-rc_keymap.conf -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It is only needed if BPF is effectively used and the package is compiled for a -systemd based target. - -Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=01f2c6c58e6f4441df7df8e27eb7919f1f01e310] - -Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> -Signed-off-by: Sean Young <sean@mess.org> ---- - utils/keytable/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am -index c5eb414acf2f..eee61f0e0551 100644 ---- a/utils/keytable/Makefile.am -+++ b/utils/keytable/Makefile.am -@@ -3,9 +3,13 @@ man_MANS = ir-keytable.1 rc_keymap.5 - sysconf_DATA = rc_maps.cfg - keytablesystem_DATA = $(srcdir)/rc_keymaps/* - udevrules_DATA = 70-infrared.rules -+if WITH_BPF -+if HAVE_SYSTEMD - if HAVE_UDEVDSYSCALLFILTER - systemdsystemunit_DATA = 50-rc_keymap.conf - endif -+endif -+endif - - ir_keytable_SOURCES = keytable.c parse.h ir-encode.c ir-encode.h toml.c toml.h keymap.c keymap.h - --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb index 866c0c5a7d..741e1030cf 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.20.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.22.1.bb @@ -1,5 +1,5 @@ SUMMARY = "v4l2 and IR applications" -LICENSE = "GPLv2 & LGPLv2.1" +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" @@ -18,15 +18,13 @@ 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://0002-original-patch-mediactl-pkgconfig.patch \ + file://0003-original-patch-export-mediactl-headers.patch \ file://0007-Do-not-use-getsubopt.patch \ - file://0008-configure.ac-autodetect-availability-of-systemd.patch \ - file://0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch \ " -SRC_URI[md5sum] = "46f9e2c0b2fdccd009da2f7e1aa87894" -SRC_URI[sha256sum] = "956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" + +SRC_URI[md5sum] = "8aa73287320a49e9170a8255d7b2c7e6" +SRC_URI[sha256sum] = "65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index 39e73d3b78..10176634bd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -1,5 +1,5 @@ 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;branch=master \ |