diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-multimedia')
20 files changed, 102 insertions, 450 deletions
diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb deleted file mode 100644 index 0c4a9f5456..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Alsa OSS Compatibility Package" -SECTION = "libs/multimedia" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -DEPENDS = "alsa-lib" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ - file://libio.patch \ -" -SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" -SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" - -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 -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb new file mode 100644 index 0000000000..6c2176f79c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.1.6.bb @@ -0,0 +1,46 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- COPYING +# +++ COPYING +# @@ -2,7 +2,8 @@ +# Version 2, June 1991 +# +# Copyright (C) 1989, 1991 Free Software Foundation, Inc. +# - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# + +# Everyone is permitted to copy and distribute verbatim copies +# of this license document, but changing it is not allowed. +# +# +# + +SUMMARY = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ed055b4eff93da784176a01582e6ec1a" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ + file://libio.patch \ +" +SRC_URI[md5sum] = "fc845cafc4444193510ab1865c7350b8" +SRC_URI[sha256sum] = "c3d3f743e61f05ff95c5cba3b06bc9c91ff86c37495f1d19dab844e6b90845ea" + +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/ +EXCLUDE_FROM_WORLD_libc-musl = "1" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb index 63e590c9e0..9e5a3817aa 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb @@ -1,9 +1,12 @@ -SUMMARY = "Library for reading some sort of media format" +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" + PR = "r1" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch new file mode 100644 index 0000000000..e6021cd706 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Python-3.7-fixes-2126.patch @@ -0,0 +1,26 @@ +From 72564b04151b61fa8d954bbb43afc58108ee50ec Mon Sep 17 00:00:00 2001 +From: Thomas Nagy <tnagy@waf.io> +Date: Mon, 12 Mar 2018 20:42:55 +0100 +Subject: [PATCH] Python 3.7 fixes #2126 + +Upstream-Status: Backport +[https://gitlab.com/ita1024/waf/commit/facdc0b173d933073832c768ec1917c553cb369c] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + waflib/Node.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/waflib/Node.py b/waflib/Node.py +index fb3cd273..405a6fec 100644 +--- a/waflib/Node.py ++++ b/waflib/Node.py +@@ -537,8 +537,6 @@ class Node(object): + if maxdepth: + for k in node.ant_iter(accept=accept, maxdepth=maxdepth - 1, pats=npats, dir=dir, src=src, remove=remove): + yield k +- raise StopIteration +- + def ant_glob(self, *k, **kw): + """ + This method is used for finding files across folders. It behaves like ant patterns: diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb index 11da6b1be0..52559cb367 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb @@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1 readline" -SRC_URI = "git://github.com/jackaudio/jack2.git" +SRC_URI = "git://github.com/jackaudio/jack2.git \ + file://0001-Python-3.7-fixes-2126.patch \ + " SRCREV = "c1647819eed6d11f94b21981d9c869629299f357" PV = "1.9.12" S = "${WORKDIR}/git" 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 831394e5c7..668afc8c16 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 @@ -10,3 +10,11 @@ SRC_URI[md5sum] = "d6b665b335a6360e000976e770da7691" SRC_URI[sha256sum] = "3c05e05aebcbfcc044d9e8c2d4646cd8359be39a3f0ba8ce4e72a9094bee704f" inherit autotools pkgconfig + +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 + # remove the "Requires" line. + sed -i '/^Requires: glib-2\.0$/d' ${D}${libdir}/pkgconfig/libmms.pc +} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb index a24f5e30b6..dd6789dc01 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb @@ -50,3 +50,5 @@ python () { #| {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 = "arm" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch deleted file mode 100644 index 5299d378eb..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: SDL_image-1.2.12/configure.in -=================================================================== ---- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 -+++ SDL_image-1.2.12/configure.in 2014-07-18 06:56:56.853466678 +0000 -@@ -1,5 +1,4 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(README) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -11,12 +10,19 @@ - # if backwards compatibility has been broken, - # set BINARY_AGE and INTERFACE_AGE to 0. - --MAJOR_VERSION=1 --MINOR_VERSION=2 --MICRO_VERSION=12 -+m4_define([sdlimage_major_version],[1]) -+m4_define([sdlimage_minor_version],[2]) -+m4_define([sdlimage_micro_version],[12]) -+m4_define([sdlimage_version], [sdlimage_major_version.sdlimage_minor_version.sdlimage_micro_version]) -+ -+AC_INIT([SDL_image], [sdlimage_version]) -+ -+MAJOR_VERSION=sdlimage_major_version -+MINOR_VERSION=sdlimage_minor_version -+MICRO_VERSION=sdlimage_micro_version - INTERFACE_AGE=4 - BINARY_AGE=12 --VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION -+VERSION=sdlimage_version - - AC_SUBST(MAJOR_VERSION) - AC_SUBST(MINOR_VERSION) -@@ -42,7 +48,7 @@ - AC_CANONICAL_HOST - - dnl Setup for automake --AM_INIT_AUTOMAKE(SDL_image, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - AC_PROG_LIBTOOL diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb deleted file mode 100644 index ea8e9eaa30..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer image library" -SECTION = "libs" - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" - -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ - file://configure.patch" -SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" -SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" - -S = "${WORKDIR}/SDL_image-${PV}" - -inherit autotools pkgconfig - -export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" - -# Disable the run-time loading of the libs and bring back the soname dependencies. -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" - -do_configure_prepend() { - # Removing these files fixes a libtool version mismatch. - rm -f ${S}/acinclude/libtool.m4 - rm -f ${S}/acinclude/sdl.m4 - rm -f ${S}/acinclude/pkg.m4 - rm -f ${S}/acinclude/lt~obsolete.m4 - rm -f ${S}/acinclude/ltoptions.m4 - rm -f ${S}/acinclude/ltsugar.m4 - rm -f ${S}/acinclude/ltversion.m4 -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb deleted file mode 100644 index 1f9c794c73..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer image library v2" -SECTION = "libs" - -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=ec65b9778f5584a0bd8dfc17d6340ba0" - -DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" -SRC_URI[md5sum] = "d94b94555ba022fa249a53a021dc3606" -SRC_URI[sha256sum] = "3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64" - -S = "${WORKDIR}/SDL2_image-${PV}" - -inherit autotools pkgconfig - -# Disable the run-time loading of the libs and bring back the soname dependencies. -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" - -do_configure_prepend() { - # make autoreconf happy - touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog - # Removing these files fixes a libtool version mismatch. - rm -f ${S}/acinclude/libtool.m4 - rm -f ${S}/acinclude/sdl2.m4 - rm -f ${S}/acinclude/pkg.m4 - rm -f ${S}/acinclude/lt~obsolete.m4 - rm -f ${S}/acinclude/ltoptions.m4 - rm -f ${S}/acinclude/ltsugar.m4 - rm -f ${S}/acinclude/ltversion.m4 -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch deleted file mode 100644 index 4c9e8d094c..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in ---- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 -+++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 -@@ -1,6 +1,5 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT(README) --AC_CONFIG_AUX_DIR(build-scripts) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -40,10 +39,6 @@ - AC_SUBST(LT_REVISION) - AC_SUBST(LT_AGE) - --dnl Detect the canonical build and host environments --AC_CONFIG_AUX_DIRS($srcdir/build-scripts) --dnl AC_CANONICAL_HOST -- - dnl Check for tools - AC_PROG_LIBTOOL - AC_PROG_CC diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb deleted file mode 100644 index c83fcc8daa..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer mixer library" -SECTION = "libs" -DEPENDS = "virtual/libsdl flac libmikmod libvorbis" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" - -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ - file://configure.patch \ -" - -SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" -SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" - -S = "${WORKDIR}/SDL_mixer-${PV}" - -inherit autotools-brokensep pkgconfig - -EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" - -PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" - -do_configure () { - # Remove old libtool macros. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f acinclude/$i - done - cp build-scripts/* . || true - rm -rf build-scripts/ - export SYSROOT=$PKG_CONFIG_SYSROOT_DIR - - autotools_do_configure - - rm config.log - for i in $(find -name "Makefile") ; do - sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i - done -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb deleted file mode 100644 index 718f3f5fde..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Simple DirectMedia Layer mixer library V2" -SECTION = "libs" -DEPENDS = "virtual/libsdl2 flac libmikmod libvorbis" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=95e0c3cf63f71b950911e698a54b7fc5" - -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz" - -SRC_URI[md5sum] = "aaa0551393993c14a13f72b339c0ed6c" -SRC_URI[sha256sum] = "4e615e27efca4f439df9af6aa2c6de84150d17cbfd12174b54868c12f19c83bb" - -S = "${WORKDIR}/SDL2_mixer-${PV}" - -inherit autotools-brokensep pkgconfig - -EXTRA_AUTORECONF += "--include=acinclude" -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" - -PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" - -do_configure_prepend () { - # Remove old libtool macros. - MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" - for i in ${MACROS}; do - rm -f acinclude/$i - done -} diff --git a/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d b/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d deleted file mode 100644 index 9e64a20fdd..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -NAME="minidlna" -DAEMON=/usr/sbin/minidlnad -SCRIPTNAME=/etc/init.d/$NAME -PIDFILE=/var/run/$NAME.pid -CONF=/etc/$NAME.conf -ARGS="-f $CONF" - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -start_function() { - - export PATH=$PWD:$PATH - - if [ -f ${PIDFILE} ]; then - echo "$SCRIPTNAME already running with PID #`cat $PIDFILE` ( according to ${PIDFILE} )"; - exit 0 - fi - - $DAEMON $ARGS - - pid=$! - - if [ "$pid" != "" ]; then - echo -n "$pid" > ${PIDFILE} - fi -} - -stop_function() { - - export PATH=$PWD:$PATH - - if [ ! -e "${PIDFILE}" ]; then - echo "${SCRIPTNAME} not running ( according to ${PIDFILE} )"; - exit 1; - fi - PID=`cat ${PIDFILE}` - kill -INT ${PID} - rm -f ${PIDFILE} -} - -case $1 in - "start") - start_function - ;; - "stop") - stop_function - ;; - *) - echo "Usage: $0 {start | stop}" - -esac diff --git a/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service b/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service deleted file mode 100644 index 656100bb62..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Minidlna Daemon -After=network.target - -[Service] -Type=notify -ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index de78de27f0..c2e8e3d574 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -31,6 +31,8 @@ PACKAGECONFIG ??= " \ libass \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ " + +PACKAGECONFIG_remove_aarch64 = "lua" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/mesa" PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch deleted file mode 100644 index 12609d30e2..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 75372b8088c20474497b79ec6cf1e99f2d17f56d Mon Sep 17 00:00:00 2001 -From: Ismo Puustinen <ismo.puustinen@intel.com> -Date: Mon, 3 Apr 2017 13:23:38 +0300 -Subject: [PATCH] buildsystem: do not assume building in source tree. - -Use $(top_srcdir) as reference for include paths and buildtime scripts. -Otherwise compilation outside of project root directory will fail -because header and script paths are wrong. - -To reproduce: mkdir b; cd b; ../configure; make - -Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275] - -Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> - ---- - utils/cec-compliance/Makefile.am | 2 +- - utils/cec-ctl/Makefile.am | 2 +- - utils/cec-follower/Makefile.am | 4 ++-- - utils/qv4l2/Makefile.am | 2 +- - utils/v4l2-compliance/Makefile.am | 2 +- - utils/v4l2-ctl/Makefile.am | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am -index f05fe6c..f7d1535 100644 ---- a/utils/cec-compliance/Makefile.am -+++ b/utils/cec-compliance/Makefile.am -@@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt - cec-compliance.cpp: cec-table.h - - cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h -- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ -+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ - - cec-compliance.cpp: version.h - -diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am -index 4a6eae5..570a070 100644 ---- a/utils/cec-ctl/Makefile.am -+++ b/utils/cec-ctl/Makefile.am -@@ -6,7 +6,7 @@ cec_ctl_SOURCES = cec-ctl.cpp - cec-ctl.cpp: cec-ctl-gen.h - - cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h -- ./msg2ctl.pl 0 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ -+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 0 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ - - clean-local: - -rm -vf cec-ctl-gen.h -diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am -index d8ad292..e3553eb 100644 ---- a/utils/cec-follower/Makefile.am -+++ b/utils/cec-follower/Makefile.am -@@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt - cec-log.cpp: cec-log.h - - cec-log.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h -- ../cec-ctl/msg2ctl.pl 1 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ -+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 1 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ - - cec-follower.cpp: cec-table.h version.h - - cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h -- ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ -+ $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ - - version.h: - @if git show-ref -s HEAD >/dev/null 2>&1; then \ -diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am -index fd58486..ccd1a2a 100644 ---- a/utils/qv4l2/Makefile.am -+++ b/utils/qv4l2/Makefile.am -@@ -8,7 +8,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c - nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp - qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \ - ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la --qv4l2_CPPFLAGS = -I../common -+qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common - - if WITH_QTGL - qv4l2_CPPFLAGS += $(QTGL_CFLAGS) -diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am -index c2b5919..fb8d12e 100644 ---- a/utils/v4l2-compliance/Makefile.am -+++ b/utils/v4l2-compliance/Makefile.am -@@ -5,7 +5,7 @@ DEFS := - v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \ - v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \ - v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h --v4l2_compliance_CPPFLAGS = -I../common -+v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common - - if WITH_V4L2_COMPLIANCE_LIBV4L - v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread -diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am -index 955647d..825e53f 100644 ---- a/utils/v4l2-ctl/Makefile.am -+++ b/utils/v4l2-ctl/Makefile.am -@@ -7,7 +7,7 @@ v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cp - v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \ - v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \ - v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c --v4l2_ctl_CPPFLAGS = -I../common -+v4l2_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common - - if WITH_V4L2_CTL_LIBV4L - v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch deleted file mode 100644 index 82fc3e120f..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b2efcc20617d6317f74c4acb2a6af5b765f20b34 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 14 Jul 2017 13:11:25 -0700 -Subject: [PATCH] ir-ctl: Define TEMP_FAILURE_RETRY if undefined - -use strndup() instead of strndupa() which is not -universally available in C libraries - -Taken from AlpineLinux - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - utils/ir-ctl/ir-ctl.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c -index bc58cee..1a44011 100644 ---- a/utils/ir-ctl/ir-ctl.c -+++ b/utils/ir-ctl/ir-ctl.c -@@ -42,6 +42,16 @@ - # define _(string) string - #endif - -+/* taken from glibc unistd.h */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - # define N_(string) string - - -@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name) - return NULL; - } - -- pstr = strndupa(name, p - name); -+ pstr = strndup(name, p - name); - - if (!protocol_match(pstr, &proto)) { - fprintf(stderr, _("error: protocol '%s' not found\n"), pstr); -+ free(pstr); - return NULL; - } -+ free(pstr); - - if (!strtoscancode(p + 1, &scancode)) { - fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch index a779a307d7..8033fcacf2 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch @@ -6,17 +6,16 @@ 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 4641e21..e47b948 100644 +index 0188fe2..dac07f3 100644 --- a/contrib/test/Makefile.am +++ b/contrib/test/Makefile.am -@@ -32,7 +32,7 @@ v4l2gl_LDFLAGS = $(X11_LIBS) $(GL_LIBS) $(GLU_LIBS) $(ARGP_LIBS) - v4l2gl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la +@@ -40,7 +40,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) @@ -24,3 +23,6 @@ index 4641e21..e47b948 100644 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_1.12.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.0.bb index 57cfb1318f..bcead00b06 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.16.0.bb @@ -17,21 +17,21 @@ 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://0001-buildsystem-do-not-assume-building-in-source-tree.patch \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ - file://0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch \ file://0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch \ file://0003-v4l2-ctl-Do-not-use-getsubopt.patch \ " -SRC_URI[md5sum] = "89e1ed6c69c94e0489dc0a638c7841aa" -SRC_URI[sha256sum] = "5a47dd6f0e7dfe902d94605c01d385a4a4e87583ff5856d6f181900ea81cf46e" +SRC_URI[md5sum] = "21a6ec3605a1c3114c8ccb70a963c871" +SRC_URI[sha256sum] = "f1b425584284bac378b76331c0671dc890bd7af49c03e8a6cc0c70e57eea0bad" EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" VIRTUAL-RUNTIME_ir-keytable-keymaps ?= "rc-keymaps" -PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dbg libv4l-dev" +PACKAGES =+ "media-ctl ir-keytable rc-keymaps libv4l libv4l-dev" + +RPROVIDES_${PN}-dbg += "libv4l-dbg" FILES_media-ctl = "${bindir}/media-ctl ${libdir}/libmediactl.so.*" @@ -46,7 +46,6 @@ FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv ${libdir}/libdvbv5*${SOLIBS} \ ${libdir}/libv4l/*-decomp" -FILES_libv4l-dbg += "${libdir}/libv4l/.debug ${libdir}/libv4l/plugins/.debug" FILES_libv4l-dev += "${includedir} ${libdir}/pkgconfig \ ${libdir}/libv4l*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" |