diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
8 files changed, 141 insertions, 20 deletions
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 3344821fa..54d396343 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 @@ -12,6 +12,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0002-Do-not-use-rcmd-on-build-with-musl.patch \ file://0001-genisoimage-Add-missing-extern-definition.patch \ " +SRC_URI_append_class-nativesdk = " \ + file://0001-install-netscsid-to-bin-for-nativesdk.patch \ +" SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" @@ -51,7 +54,7 @@ FILES_wodim = " \ " do_install_append() { - ln -sf ${bindir}/genisoimage ${D}${bindir}/mkisofs + ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs } -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-install-netscsid-to-bin-for-nativesdk.patch new file mode 100644 index 000000000..fdf1563b3 --- /dev/null +++ b/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.18.bb index d5288c7b7..038e9ce11 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.17.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.19.18.bb @@ -17,7 +17,7 @@ DEPENDS = "libsamplerate0 libsndfile1 readline" SRC_URI = "git://github.com/jackaudio/jack2.git \ file://0001-example-clients-Use-c-compiler-for-jack_simdtests.patch \ " -SRCREV = "9e23888b8def6527774889cf4ef6348fb78c7154" +SRCREV = "5041ab0fe7fb719efa5122386d355397289a91f0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb index 65f5b6adf..ed7443dfd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.2.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e" -SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796" +SRC_URI[md5sum] = "034581479968405ed415c34a50d00224" +SRC_URI[sha256sum] = "cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb index 171eef7b7..1a9150479 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.32.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.33.1.bb @@ -3,7 +3,13 @@ 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 = " \ + zlib \ + ffmpeg \ + jpeg \ + libv4l \ + libass \ +" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' virtual/libx11 xsp libxv libxscrnsaver libxinerama', '', d)} \ @@ -12,9 +18,9 @@ DEPENDS += " \ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=91f1cb870c1cc2d31351a4d2595441cb" -SRCREV_mpv = "70b991749df389bcc0a4e145b5687233a03b4ed7" +SRCREV_mpv = "b5d3e43198b9d57af5620b63537885aaa41fa8cd" SRC_URI = " \ - git://github.com/mpv-player/mpv;name=mpv \ + git://github.com/mpv-player/mpv;name=mpv;branch=release/0.33;protocol=https \ https://waf.io/waf-2.0.20;name=waf;subdir=git \ " SRC_URI[waf.sha256sum] = "bf971e98edc2414968a262c6aa6b88541a26c3cd248689c89f4c57370955ee7f" @@ -27,18 +33,16 @@ LDFLAGS_append_riscv64 = " -latomic" LUA ?= "lua" LUA_mips64 = "" -LUA_aarch64 = "" 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)} \ " @@ -46,11 +50,10 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" 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 +93,6 @@ EXTRA_OECONF = " \ --confdir=${sysconfdir} \ --datadir=${datadir} \ --disable-manpage-build \ - --disable-libsmbclient \ --disable-libbluray \ --disable-dvdnav \ --disable-cdda \ 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 new file mode 100644 index 000000000..5aec3c574 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0008-configure.ac-autodetect-availability-of-systemd.patch @@ -0,0 +1,47 @@ +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 new file mode 100644 index 000000000..63a695f8f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch @@ -0,0 +1,40 @@ +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.20.0.bb index 3e92d49b4..2261feb56 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.20.0.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ PROVIDES = "libv4l media-ctl" DEPENDS = "jpeg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" DEPENDS_append_libc-musl = " argp-standalone" DEPENDS_append_class-target = " udev" LDFLAGS_append = " -pthread" @@ -21,13 +22,14 @@ SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2 \ 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 \ + 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" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev \ - --disable-v4l2-compliance-32 --disable-v4l2-ctl-32 \ - --with-systemdsystemunitdir=${systemd_system_unitdir}" + --disable-v4l2-compliance-32 --disable-v4l2-ctl-32" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" @@ -37,8 +39,7 @@ 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" +FILES_ir-keytable = "${bindir}/ir-keytable ${base_libdir}/udev/rules.d/*-infrared.rules" RDEPENDS_ir-keytable += "${VIRTUAL-RUNTIME_ir-keytable-keymaps}" FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" |