summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2014-10-10 03:20:04 +0200
committerTudor Florea <tudor.florea@enea.com>2014-10-10 03:20:04 +0200
commit1b8dfe266937a37a4c642f96ceb2347bf4c00a17 (patch)
tree0c6aab146bb3c82efd9c7846a9a4e70dcb0ec84f /meta-oe/recipes-multimedia
downloadmeta-openembedded-daisy-140929.tar.gz
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch43
-rw-r--r--meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb22
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb15
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/configure-fix.patch10
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gzbin0 -> 44925 bytes
-rw-r--r--meta-oe/recipes-multimedia/esound/esound/no-docs.patch11
-rw-r--r--meta-oe/recipes-multimedia/esound/esound_0.2.36.bb33
-rw-r--r--meta-oe/recipes-multimedia/faad2/faad2_2.7.bb28
-rw-r--r--meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb17
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/jack_fix_TWL4030_alsa_capture.patch31
-rw-r--r--meta-oe/recipes-multimedia/jack/jack/remove-wrong-host-test.patch68
-rw-r--r--meta-oe/recipes-multimedia/jack/jack_0.121.0.bb40
-rw-r--r--meta-oe/recipes-multimedia/libass/libass.inc28
-rw-r--r--meta-oe/recipes-multimedia/libass/libass_0.10.1.bb5
-rw-r--r--meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb28
-rw-r--r--meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb17
-rw-r--r--meta-oe/recipes-multimedia/libmms/libmms_0.6.2.bb14
-rw-r--r--meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb21
-rw-r--r--meta-oe/recipes-multimedia/libopus/libopus-fpu.inc6
-rw-r--r--meta-oe/recipes-multimedia/libopus/libopus_1.1.bb20
-rw-r--r--meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb46
-rw-r--r--meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb31
-rw-r--r--meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch21
-rw-r--r--meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb40
-rw-r--r--meta-oe/recipes-multimedia/live555/files/config.linux-cross17
-rw-r--r--meta-oe/recipes-multimedia/live555/live555.inc58
-rw-r--r--meta-oe/recipes-multimedia/live555/live555_20130430.bb7
-rw-r--r--meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb26
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer-common.bb23
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf15
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch26
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb142
-rw-r--r--meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch41
-rw-r--r--meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch48
-rw-r--r--meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb19
-rw-r--r--meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb15
-rw-r--r--meta-oe/recipes-multimedia/pulseaudio/pavucontrol_1.0.bb13
-rw-r--r--meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb16
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/files/openat.patch38
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb21
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb39
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch854
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb18
-rw-r--r--meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb10
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx.inc38
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch69
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch28
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch43
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb19
-rw-r--r--meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch13
-rw-r--r--meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb21
-rw-r--r--meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch10
-rw-r--r--meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb13
53 files changed, 2295 insertions, 0 deletions
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch
new file mode 100644
index 0000000000..a053e4c604
--- /dev/null
+++ b/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch
@@ -0,0 +1,43 @@
1Index: alsa-oss-1.0.15/alsa/stdioemu.c
2===================================================================
3--- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200
4+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200
5@@ -37,7 +37,9 @@
6 #endif
7
8 #include <stdio.h>
9+#ifdef HAVE_LIBIO_H
10 #include <libio.h>
11+#endif
12
13 struct fd_cookie {
14 int fd;
15@@ -99,7 +101,11 @@
16
17 if (open_mode && fdc->fd > 0) {
18 result = fopencookie (fdc,"w", fns);
19+#ifdef HAVE_FILENO
20 result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */
21+#else
22+ result->__filedes = fdc->fd;
23+#endif
24 }
25 return result;
26 }
27Index: alsa-oss-1.0.15/configure.in
28===================================================================
29--- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200
30+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200
31@@ -33,6 +33,12 @@
32 LIBS="$OLD_LIBS"
33 fi
34
35+AC_CHECK_HEADERS_ONCE([libio.h])
36+
37+AC_CHECK_MEMBER([struct _IO_FILE._fileno],
38+ [AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
39+ [],[])
40+
41 AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
42 oss-redir/Makefile test/Makefile \
43 alsa/testaoss test/testaoss)
diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb
new file mode 100644
index 0000000000..8966dbbc1a
--- /dev/null
+++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb
@@ -0,0 +1,22 @@
1SUMMARY = "Alsa OSS Compatibility Package"
2SECTION = "libs/multimedia"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5DEPENDS = "alsa-lib"
6PR = "r1"
7
8SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
9 file://libio.patch \
10"
11
12inherit autotools
13
14LEAD_SONAME = "libaoss.so.0"
15
16do_configure_prepend () {
17 touch NEWS README AUTHORS ChangeLog
18 sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in
19}
20
21SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f"
22SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca"
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb
new file mode 100644
index 0000000000..bf7cdfb7aa
--- /dev/null
+++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb
@@ -0,0 +1,15 @@
1DESCRIPTION = "The Audio File Library provides a uniform and elegant \
2API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \
3WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \
4Research, Amiga IFF/8SVX, and NIST SPHERE."
5HOMEPAGE = "http://www.68k.org/~michael/audiofile/"
6SECTION = "libs"
7LICENSE = "LGPLv2 & GPLv2"
8LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
9 file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
10
11SRC_URI = "http://www.68k.org/~michael/audiofile/${PN}-${PV}.tar.gz"
12SRC_URI[md5sum] = "a39be317a7b1971b408805dc5e371862"
13SRC_URI[sha256sum] = "a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2"
14
15inherit autotools lib_package binconfig
diff --git a/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch b/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch
new file mode 100644
index 0000000000..8fdc35ad5e
--- /dev/null
+++ b/meta-oe/recipes-multimedia/esound/esound/configure-fix.patch
@@ -0,0 +1,10 @@
1--- /tmp/configure.ac 2008-06-02 16:46:55.640793306 +0200
2+++ esound-0.2.36/configure.ac 2008-06-02 16:47:26.030793494 +0200
3@@ -29,6 +29,7 @@
4 AC_SUBST(pkgdocdir)
5
6 AC_PROG_CC
7+AC_PROG_CXX
8 AC_PROG_CPP
9 AC_LIBTOOL_WIN32_DLL
10 AM_PROG_LIBTOOL
diff --git a/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz b/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz
new file mode 100644
index 0000000000..719f5d09de
--- /dev/null
+++ b/meta-oe/recipes-multimedia/esound/esound/esound_0.2.36-1ubuntu5.diff.gz
Binary files differ
diff --git a/meta-oe/recipes-multimedia/esound/esound/no-docs.patch b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
new file mode 100644
index 0000000000..fc69f1a038
--- /dev/null
+++ b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
@@ -0,0 +1,11 @@
1Index: esound-0.2.36/Makefile.am
2===================================================================
3--- esound-0.2.36.orig/Makefile.am
4+++ esound-0.2.36/Makefile.am
5@@ -1,5 +1,5 @@
6
7-SUBDIRS = docs
8+SUBDIRS =
9
10 ACLOCAL_FLAGS = -I m4
11
diff --git a/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb b/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb
new file mode 100644
index 0000000000..035358d54c
--- /dev/null
+++ b/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb
@@ -0,0 +1,33 @@
1SUMMARY = "Enlightened Sound Daemon"
2SECTION = "gpe/base"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
5DEPENDS = "audiofile"
6
7inherit gnome binconfig
8
9PR = "r1"
10
11SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2;name=archive \
12 file://esound_0.2.36-1ubuntu5.diff.gz \
13 file://no-docs.patch \
14 file://configure-fix.patch"
15
16SRC_URI[archive.md5sum] = "3facb5aa0115cc1c31771b9ad454ae76"
17SRC_URI[archive.sha256sum] = "68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76"
18
19EXTRA_OECONF = " \
20 --disable-alsa \
21 --disable-arts \
22 --disable-artstest \
23"
24do_configure_prepend() {
25 sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' ${S}/configure.ac
26}
27
28PACKAGES =+ "esddsp esd esd-utils"
29
30FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*"
31FILES_esd = "${bindir}/esd"
32FILES_esd-utils = "${bindir}/*"
33
diff --git a/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb b/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb
new file mode 100644
index 0000000000..3723f8dea6
--- /dev/null
+++ b/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Library for reading some sort of media format"
2SECTION = "libs"
3LICENSE = "GPLv2"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958"
6
7PR = "r1"
8
9inherit autotools
10
11SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${PN}-${PV}.tar.bz2;name=faad2 \
12"
13
14SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332"
15SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5"
16
17PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev"
18
19FILES_${PN} = "${bindir}/faad"
20
21FILES_libfaad = "${libdir}/libfaad.so.*"
22FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${includedir}/faad.h"
23FILES_libfaad-staticdev = "${libdir}/libfaad.a"
24
25FILES_libmp4ff = "${libdir}/libmp4ff.so.*"
26FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${includedir}/mp4ff.h"
27FILES_libmp4ff-staticdev = "${libdir}/libmp4ff.a"
28
diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
new file mode 100644
index 0000000000..3089b8e730
--- /dev/null
+++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
@@ -0,0 +1,17 @@
1SUMMARY = "Library for interacting with ID3 tags"
2SECTION = "libs/multimedia"
3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
5DEPENDS = "zlib"
6
7PR = "r1"
8
9SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \
10 http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \
11"
12SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7"
13SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079"
14SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b"
15SRC_URI[patch.sha256sum] = "9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c"
16
17inherit autotools
diff --git a/meta-oe/recipes-multimedia/jack/jack/jack_fix_TWL4030_alsa_capture.patch b/meta-oe/recipes-multimedia/jack/jack/jack_fix_TWL4030_alsa_capture.patch
new file mode 100644
index 0000000000..77337ff6c7
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack/jack_fix_TWL4030_alsa_capture.patch
@@ -0,0 +1,31 @@
1--- a/drivers/alsa/alsa_driver.c 2009-05-06 06:36:08.000000000 +1000
2+++ b/drivers/alsa/alsa_driver.c 2010-07-28 21:02:57.238101024 +1000
3@@ -2388,7 +2388,7 @@
4 strcpy (params[i].name, "period");
5 params[i].character = 'p';
6 params[i].type = JackDriverParamUInt;
7- params[i].value.ui = 1024U;
8+ params[i].value.ui = 256U; /* TWL4030 capture. */
9 strcpy (params[i].short_desc, "Frames per period");
10 strcpy (params[i].long_desc, params[i].short_desc);
11
12@@ -2396,7 +2396,7 @@
13 strcpy (params[i].name, "nperiods");
14 params[i].character = 'n';
15 params[i].type = JackDriverParamUInt;
16- params[i].value.ui = 2U;
17+ params[i].value.ui = 4U; /* TWL4030 capture. */
18 strcpy (params[i].short_desc, "Number of periods of playback latency");
19 strcpy (params[i].long_desc, params[i].short_desc);
20
21@@ -2518,8 +2518,8 @@
22 driver_initialize (jack_client_t *client, const JSList * params)
23 {
24 jack_nframes_t srate = 48000;
25- jack_nframes_t frames_per_interrupt = 1024;
26- unsigned long user_nperiods = 2;
27+ jack_nframes_t frames_per_interrupt = 256; /* TWL4030 needs small number of frames here. */
28+ unsigned long user_nperiods = 4; /* TWL4030 needs 4 periods to avoid XRuns. */
29 char *playback_pcm_name = "hw:0";
30 char *capture_pcm_name = "hw:0";
31 int hw_monitoring = FALSE;
diff --git a/meta-oe/recipes-multimedia/jack/jack/remove-wrong-host-test.patch b/meta-oe/recipes-multimedia/jack/jack/remove-wrong-host-test.patch
new file mode 100644
index 0000000000..b41c98f2a7
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack/remove-wrong-host-test.patch
@@ -0,0 +1,68 @@
1From be5f1439a1f36c0bc714411d20186045bd3e9539 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 12 Jul 2011 12:48:14 +0200
4Subject: [PATCH] remove bogus check for host-side jack installs, we are crosscompiling and don't care about these misguided checks
5
6---
7 configure.ac | 45 ---------------------------------------------
8 1 files changed, 0 insertions(+), 45 deletions(-)
9
10diff --git a/configure.ac b/configure.ac
11index 0a7e6bc..4033c21 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -3,51 +3,6 @@ dnl $Id: configure.ac 4467 2011-06-23 15:10:03Z paul $
15
16 AC_INIT(jackd/jackd.c)
17
18-
19-dnl
20-dnl Check for existing JACK installs
21-dnl
22-
23-AC_MSG_CHECKING([existing, conflicting JACK installs])
24-not_overwriting=0
25-installs=
26-for dir in /usr/lib /usr/local/lib /opt/lib ; do
27- if test -d $dir ; then
28- if test $(find $dir/ -name 'libjack.so.*' 2>/dev/null | wc -l) -gt 0 ; then
29- if echo $prefix/lib | grep -vs $dir >/dev/null 2>&1 ; then
30- not_overwriting=$(expr $not_overwriting + 1)
31- fi
32- installs="$installs $dir"
33- fi
34- fi
35-done
36-
37-if test $not_overwriting -gt 0 ; then
38- echo
39- echo
40- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
41- echo "You appear to have at least one existing installation of JACK."
42- echo
43- echo "Complete or partial JACK installs exist in:$installs"
44- echo
45- echo "Installing this version will leave at least one of these"
46- echo "existing installations installed and this will probably break"
47- echo "JACK on your machine. "
48- echo
49- echo "Before building, you should first remove the existing JACK"
50- echo "installation(s). "
51- echo
52- echo "Alternatively use ./configure --prefix=... to force overwriting"
53- echo "the existing install."
54- echo
55- echo "WARNING: ON ANY DEBIAN-DERIVED DISTRIBUTION (Debian, Ubuntu etc)"
56- echo "CHANGING THE INSTALLATION PREFIX WILL NOT PRODUCE A WORKING JACK"
57- echo "INSTALL. Please contact the distribution packager for JACK and"
58- echo "ask them to fix their packaging."
59- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
60- exit 1
61-fi
62-
63 AC_CONFIG_AUX_DIR(config)
64 AC_CANONICAL_TARGET
65
66--
671.6.6.1
68
diff --git a/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb
new file mode 100644
index 0000000000..e7a0ee1118
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb
@@ -0,0 +1,40 @@
1DESCRIPTION = "JACK is a low-latency audio server. It can \
2connect a number of different applications to an audio \
3device, as well as allowing them to share audio between \
4themselves."
5SECTION = "libs/multimedia"
6
7LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \
9 file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
10 file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \
11"
12
13DEPENDS = "alsa-lib libsamplerate0 readline"
14
15SRCREV = "91a688c602b7ce1711d8ad10fb07ebcf2e530a64"
16SRC_URI = "git://github.com/jackaudio/jack1.git \
17 file://remove-wrong-host-test.patch \
18 file://jack_fix_TWL4030_alsa_capture.patch \
19"
20
21S = "${WORKDIR}/git"
22
23inherit autotools
24
25EXTRA_OECONF = "--enable-timestamps \
26 --disable-capabilities \
27 --disable-oldtrans \
28 --disable-portaudio \
29 --disable-coreaudio \
30 --disable-oss \
31 --enable-alsa"
32
33EXTRA_OEMAKE = 'transform="s,^,,"'
34
35PACKAGES =+ "libjack jack-server jack-utils"
36
37FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
38FILES_jack-server = "${bindir}/jackd"
39FILES_jack-utils = "${bindir}/*"
40FILES_${PN}-doc += " ${datadir}/jack-audio-connection-kit/reference/html/* "
diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc
new file mode 100644
index 0000000000..64405ff680
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libass/libass.inc
@@ -0,0 +1,28 @@
1DESCRIPTION = "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter."
2HOMEPAGE = "http://code.google.com/p/libass/"
3SECTION = "libs/multimedia"
4
5LICENSE = "ISC"
6LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a"
7
8DEPENDS = "enca fontconfig freetype libpng fribidi"
9
10INC_PR = "r1"
11
12SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz"
13
14inherit autotools pkgconfig
15
16PACKAGECONFIG ??= ""
17PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
18
19EXTRA_OECONF = " \
20 --enable-enca \
21 --enable-fontconfig \
22"
23
24PACKAGES =+ "${PN}-tests"
25
26FILES_${PN}-tests = " \
27 ${libdir}/test/test \
28"
diff --git a/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb
new file mode 100644
index 0000000000..0b32276925
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb
@@ -0,0 +1,5 @@
1require ${PN}.inc
2PR = "${INC_PR}.0"
3
4SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026"
5SRC_URI[sha256sum] = "629a7e81fff92dea8d0399b818a41fd1b61e381c67a5961b1eaec2efadb14c6c"
diff --git a/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb
new file mode 100644
index 0000000000..64f3e5d1fc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb
@@ -0,0 +1,28 @@
1ESCRIPTION = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access."
2HOMEPAGE = "http://www.gnu.org/software/libcdio/"
3SECTION = "libs"
4
5LICENSE = "GPLv3+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7
8DEPENDS = "ncurses"
9
10SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz"
11SRC_URI[md5sum] = "1c29b18e01ab2b966162bc727bf3c360"
12SRC_URI[sha256sum] = "1acb3de8e0927906ade7a34c5853173d3068b87b02dfba80d0bf11e47f0b5d39"
13
14inherit autotools pkgconfig
15
16EXTRA_OECONF = "ac_cv_member_struct_tm_tm_gmtoff=no --disable-rpath"
17DEBUG_OPTIMIZATION_thumb = "-Os -fno-omit-frame-pointer -g"
18
19PACKAGES += "${PN}-utils"
20
21FILES_${PN} = "${libdir}/${PN}${SOLIB}"
22FILES_${PN}-utils = "${bindir}/*"
23
24python populate_packages_prepend () {
25 glibdir = d.expand('${libdir}')
26 do_split_packages(d, glibdir, '^lib(.*)\.so\..*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
27}
28
diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb
new file mode 100644
index 0000000000..4895dd2e57
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb
@@ -0,0 +1,17 @@
1SUMMARY = "DVD access multimeda library"
2SECTION = "libs/multimedia"
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
5SRC_URI = "http://dvdnav.mplayerhq.hu/releases/libdvdread-${PV}.tar.bz2"
6
7SRC_URI[md5sum] = "ab7a19d3ab1a437ae754ef477d6231a4"
8SRC_URI[sha256sum] = "0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097"
9
10inherit autotools lib_package binconfig pkgconfig
11
12CONFIGUREOPTS_remove = "--disable-silent-rules"
13
14do_configure_prepend() {
15 # For some weird reason, libdvdread only provides a `configure2' script...
16 cp ${S}/configure2 ${S}/configure
17}
diff --git a/meta-oe/recipes-multimedia/libmms/libmms_0.6.2.bb b/meta-oe/recipes-multimedia/libmms/libmms_0.6.2.bb
new file mode 100644
index 0000000000..9e2d98b655
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmms/libmms_0.6.2.bb
@@ -0,0 +1,14 @@
1SUMMARY = "MMS stream protocol library"
2HOMEPAGE = "http://sourceforge.net/projects/libmms/"
3SECTION = "libs/multimedia"
4
5LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29"
7
8DEPENDS = "glib-2.0"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/libmms/libmms/${PV}/${BPN}-${PV}.tar.gz"
11SRC_URI[md5sum] = "9f63aa363deb4874e072a45850161bff"
12SRC_URI[sha256sum] = "01931b62172d7d7050fc9ef9b1b64162f3b6e9f6cc4415170192a32a0b7ea432"
13
14inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb
new file mode 100644
index 0000000000..2361875c95
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb
@@ -0,0 +1,21 @@
1SUMMARY = "Library for reading mod-like audio files"
2HOMEPAGE = "http://modplug-xmms.sf.net"
3
4LICENSE = "PD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
8SRC_URI[md5sum] = "d2d9ccd8da22412999caed076140f786"
9SRC_URI[sha256sum] = "3cfdebb60833a082e2f2b8faa3892bc9201d05c64051503e8007d8c98ae9e4c2"
10
11inherit autotools pkgconfig
12
13EXTRA_OECONF = "--disable-option-checking"
14
15# NOTE: autotools_stage_all does nothing here, we need to do it manually
16do_install_append() {
17 install -d ${D}${includedir}/libmodplug
18 install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug
19 install -m 0644 ${S}/src/modplug.h ${D}${includedir}/
20}
21
diff --git a/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc b/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc
new file mode 100644
index 0000000000..8464664d86
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc
@@ -0,0 +1,6 @@
1
2def get_libopus_fpu_setting(bb, d):
3 if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
4 return "--enable-fixed-point"
5 return ""
6
diff --git a/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb b/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb
new file mode 100644
index 0000000000..15782a023c
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Opus Audio Codec"
2DESCRIPTION = "The Opus codec is designed for interactive \
3speech and audio transmission over the Internet. It is \
4designed by the IETF Codec Working Group and incorporates \
5technology from Skype's SILK codec and Xiph.Org's CELT codec."
6HOMEPAGE = "http://www.opus-codec.org/"
7SECTION = "libs/multimedia"
8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3"
10
11SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz"
12SRC_URI[md5sum] = "c5a8cf7c0b066759542bc4ca46817ac6"
13SRC_URI[sha256sum] = "b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95"
14
15S = "${WORKDIR}/opus-${PV}"
16
17inherit autotools pkgconfig
18
19require libopus-fpu.inc
20EXTRA_OECONF = "${@get_libopus_fpu_setting(bb, d)}"
diff --git a/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb
new file mode 100644
index 0000000000..148d1692e3
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb
@@ -0,0 +1,46 @@
1SUMMARY = "FFmpeg derived postprocessing library"
2HOMEPAGE = "http://git.videolan.org/?p=libpostproc.git;a=summary"
3SECTION = "libs"
4DEPENDS = "libav"
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8PV = "0.0.0+git${SRCPV}"
9PR = "r1"
10
11DEFAULT_PREFERENCE = "-1"
12
13SRCREV = "3b7053f46dbfe4662063345245cb00b6acbbe969"
14SRC_URI = "git://git.videolan.org/libpostproc.git"
15
16S = "${WORKDIR}/git"
17
18inherit autotools lib_package pkgconfig
19
20FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
21BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
22
23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
24EXTRA_FFCONF ?= ""
25
26EXTRA_OECONF = " \
27 --enable-shared \
28 --enable-pthreads \
29 --enable-gpl \
30 --enable-postproc \
31 \
32 --cross-prefix=${TARGET_PREFIX} \
33 --prefix=${prefix} \
34 \
35 --arch=${TARGET_ARCH} \
36 --target-os="linux" \
37 --enable-cross-compile \
38 --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
39 --extra-ldflags="${TARGET_LDFLAGS}" \
40 --sysroot="${STAGING_DIR_TARGET}" \
41 ${EXTRA_FFCONF} \
42"
43
44do_configure() {
45 ./configure ${EXTRA_OECONF}
46}
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
new file mode 100644
index 0000000000..ef78927827
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -0,0 +1,31 @@
1SUMMARY = "Simple DirectMedia Layer image library"
2SECTION = "libs"
3
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227"
6
7DEPENDS = "tiff zlib libpng jpeg virtual/libsdl"
8
9SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
10SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb"
11SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
12
13S = "${WORKDIR}/SDL_image-${PV}"
14
15inherit autotools
16
17export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
18
19# Disable the run-time loading of the libs and bring back the soname dependencies.
20EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
21
22do_configure_prepend() {
23 # Removing this file fixes a libtool version mismatch.
24 rm -f acinclude/libtool.m4
25 rm -f acinclude/sdl.m4
26 rm -f acinclude/pkg.m4
27 rm -f acinclude/lt~obsolete.m4
28 rm -f acinclude/ltoptions.m4
29 rm -f acinclude/ltsugar.m4
30 rm -f acinclude/ltversion.m4
31}
diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
new file mode 100644
index 0000000000..4c9e8d094c
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
@@ -0,0 +1,21 @@
1diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in
2--- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200
3+++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200
4@@ -1,6 +1,5 @@
5 dnl Process this file with autoconf to produce a configure script.
6 AC_INIT(README)
7-AC_CONFIG_AUX_DIR(build-scripts)
8
9 dnl Set various version strings - taken gratefully from the GTk sources
10
11@@ -40,10 +39,6 @@
12 AC_SUBST(LT_REVISION)
13 AC_SUBST(LT_AGE)
14
15-dnl Detect the canonical build and host environments
16-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
17-dnl AC_CANONICAL_HOST
18-
19 dnl Check for tools
20 AC_PROG_LIBTOOL
21 AC_PROG_CC
diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
new file mode 100644
index 0000000000..19b9236202
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
@@ -0,0 +1,40 @@
1SUMMARY = "Simple DirectMedia Layer mixer library"
2SECTION = "libs"
3DEPENDS = "virtual/libsdl flac libmikmod libvorbis"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"
6
7SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
8 file://configure.patch \
9"
10
11SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
12SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
13
14S = "${WORKDIR}/SDL_mixer-${PV}"
15
16inherit autotools
17
18EXTRA_AUTORECONF += "--include=acinclude"
19EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}"
20
21PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
22
23do_configure () {
24 # Remove old libtool macros.
25 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
26 for i in ${MACROS}; do
27 rm -f acinclude/$i
28 done
29 cp build-scripts/* . || true
30 rm -rf build-scripts/
31 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
32
33 autotools_do_configure
34
35 rm config.log
36 for i in $(find -name "Makefile") ; do
37 sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
38 done
39}
40
diff --git a/meta-oe/recipes-multimedia/live555/files/config.linux-cross b/meta-oe/recipes-multimedia/live555/files/config.linux-cross
new file mode 100644
index 0000000000..d1277da8d1
--- /dev/null
+++ b/meta-oe/recipes-multimedia/live555/files/config.linux-cross
@@ -0,0 +1,17 @@
1COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1
2C = c
3C_COMPILER = $(CC)
4C_FLAGS = $(COMPILE_OPTS)
5CPP = cpp
6CPLUSPLUS_COMPILER = $(CXX)
7CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1
8OBJ = o
9LINK = $(CXX) -o
10LINK_OPTS = -L.
11CONSOLE_LINK_OPTS = $(LINK_OPTS)
12LIBRARY_LINK = $(LD) -o
13LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic
14LIB_SUFFIX = a
15LIBS_FOR_CONSOLE_APPLICATION =
16LIBS_FOR_GUI_APPLICATION =
17EXE =
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc
new file mode 100644
index 0000000000..a36177db3a
--- /dev/null
+++ b/meta-oe/recipes-multimedia/live555/live555.inc
@@ -0,0 +1,58 @@
1# live555 OE build file
2# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved
3# Released under the MIT license (see packages/COPYING)
4
5DESCRIPTION = "LIVE555 Streaming Media libraries"
6HOMEPAGE = "http://live.com/"
7LICENSE = "LGPLv3"
8SECTION = "devel"
9
10INC_PR = "r0"
11
12URLV = "${@d.getVar('PV',1)[0:4]}.${@d.getVar('PV',1)[4:6]}.${@d.getVar('PV',1)[6:8]}"
13SRC_URI = "http://www.live555.com/liveMedia/public/live.${URLV}.tar.gz \
14 file://config.linux-cross"
15# only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older
16MIRRORS += "http://www.live555.com/liveMedia/public/ http://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \n"
17
18S = "${WORKDIR}/live"
19TARGET_CC_ARCH += "${LDFLAGS}"
20
21do_configure() {
22 cp ${WORKDIR}/config.linux-cross .
23 echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross
24 ./genMakefiles linux-cross
25}
26
27do_compile() {
28 make
29}
30
31do_install() {
32 install -d ${D}${includedir}/BasicUsageEnvironment
33 install -d ${D}${includedir}/groupsock
34 install -d ${D}${includedir}/liveMedia
35 install -d ${D}${includedir}/UsageEnvironment
36 install -d ${D}${libdir}
37 cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
38 cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
39 cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
40 cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
41 cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
42 # Find all the headers
43 for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
44 install ${i} ${D}${includedir}
45 done
46 cp ${S}/*/*.a ${D}${libdir}
47 install -d ${D}${bindir}
48 for i in MPEG2TransportStreamIndexer openRTSP playSIP sapWatch testMPEG1or2AudioVideoToDarwin testMPEG1or2ProgramToTransportStream testMPEG1or2Splitter testMPEG1or2VideoReceiver testMPEG2TransportStreamTrickPlay testMPEG4VideoToDarwin testOnDemandRTSPServer testRelay testAMRAudioStreamer testDVVideoStreamer testMP3Receiver testMP3Streamer testMPEG1or2AudioVideoStreamer testMPEG1or2VideoStreamer testMPEG2TransportStreamer testMPEG4VideoStreamer testWAVAudioStreamer vobStreamer; do
49 install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
50 done
51 install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
52}
53
54PACKAGES =+ " live555-openrtsp live555-playsip live555-mediaserver"
55FILES_${PN} = "${bindir}/sapWatch ${bindir}/testMPEG1or2AudioVideoToDarwin ${bindir}/testMPEG1or2ProgramToTransportStream ${bindir}/testMPEG1or2Splitter ${bindir}/testMPEG1or2VideoReceiver ${bindir}/testMPEG2TransportStreamTrickPlay ${bindir}/testMPEG4VideoToDarwin ${bindir}/testOnDemandRTSPServer ${bindir}/testRelay ${bindir}/testAMRAudioStreamer ${bindir}/testDVVideoStreamer ${bindir}/testMP3Receiver ${bindir}/testMP3Streamer ${bindir}/testMPEG1or2AudioVideoStreamer ${bindir}/testMPEG1or2VideoStreamer ${bindir}/testMPEG2TransportStreamer ${bindir}/testMPEG4VideoStreamer ${bindir}/testWAVAudioStreamer ${bindir}/vobStreamer ${bindir}/MPEG2TransportStreamIndexer"
56FILES_live555-openrtsp = "${bindir}/openRTSP"
57FILES_live555-playsip = "${bindir}/playSIP"
58FILES_live555-mediaserver = "${bindir}/live555MediaServer"
diff --git a/meta-oe/recipes-multimedia/live555/live555_20130430.bb b/meta-oe/recipes-multimedia/live555/live555_20130430.bb
new file mode 100644
index 0000000000..f83285cff7
--- /dev/null
+++ b/meta-oe/recipes-multimedia/live555/live555_20130430.bb
@@ -0,0 +1,7 @@
1require live555.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe"
4
5SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09"
6SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea"
7
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb
new file mode 100644
index 0000000000..6a3077f902
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.3.bb
@@ -0,0 +1,26 @@
1DESCRIPTION = "libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm."
2SECTION = "libs"
3LICENSE = "LGPLv2.1"
4LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b"
5
6DEPENDS = "alsa-lib texinfo"
7
8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/project/mikmod/${BPN}/${PV}/${BPN}-${PV}.tar.gz \
10"
11SRC_URI[md5sum] = "0e0f9bce8f8e598ca292b41e0ae385c8"
12SRC_URI[sha256sum] = "79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437"
13
14inherit autotools binconfig lib_package
15
16EXTRA_OECONF = "\
17 --disable-af \
18 --enable-alsa \
19 --disable-esd \
20 --enable-oss \
21 --disable-sam9407 \
22 --disable-ultra \
23 --disable-esdtest \
24 --enable-threads \
25"
26
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
new file mode 100644
index 0000000000..829c3b2439
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
@@ -0,0 +1,23 @@
1# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
2# License: MIT (see COPYING.MIT)
3
4SUMMARY = "Preconfigured mplayer preferences"
5
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
8
9PV = "0.0.1"
10PR = "r1"
11
12SRC_URI = "file://mplayer.conf"
13
14# Yes, really /usr/etc!!!
15do_install() {
16 install -d "${D}/usr${sysconfdir}/mplayer"
17
18 install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer"
19}
20
21FILES_${PN} = "/usr${sysconfdir}/mplayer"
22
23inherit allarch
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
new file mode 100644
index 0000000000..37ad65fa2d
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
@@ -0,0 +1,15 @@
1
2# You probably shouldn't touch these
3ac=mad,
4ao=alsa,
5
6# Required on SL-Cxxxx for correct rotation in the *VT*,
7# breaks rotation in X!
8# vf=rotate=1
9
10# Enable fullscreen display by default
11# fs=true
12
13# Drop frames to keep audio and video in sync
14framedrop=true
15
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch
new file mode 100644
index 0000000000..e232595cd9
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch
@@ -0,0 +1,26 @@
1From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 27 Mar 2014 00:08:54 +0100
4Subject: [PATCH] configure: don't disable ASS support when explicitly enabled
5
6Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
7---
8 configure | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/configure b/configure
12index 60fd308..2f7df3b 100755
13--- a/configure
14+++ b/configure
15@@ -4346,7 +4346,7 @@ fi
16
17
18 echocheck "SSA/ASS support"
19-if test "$_ass" = auto ; then
20+if test "$_ass" = auto -o "$_ass" = yes ; then
21 if pkg_config_add libass ; then
22 _ass=yes
23 def_ass='#define CONFIG_ASS 1'
24--
251.9.1
26
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
new file mode 100644
index 0000000000..24378849ad
--- /dev/null
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -0,0 +1,142 @@
1SUMMARY = "Open Source multimedia player"
2SECTION = "multimedia"
3HOMEPAGE = "http://www.mplayerhq.hu/"
4DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
5 libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
6 libxv virtual/libx11 libass speex faad2"
7
8RDEPENDS_${PN} = "mplayer-common"
9PROVIDES = "mplayer"
10RPROVIDES_${PN} = "mplayer"
11RCONFLICTS_${PN} = "mplayer"
12
13LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
15
16SRC_URI = "git://repo.or.cz/mplayer.git \
17 file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
18"
19
20SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9"
21
22ARM_INSTRUCTION_SET = "arm"
23
24PV = "2.0+gitr${SRCPV}"
25PR = "r13"
26
27PARALLEL_MAKE = ""
28
29S = "${WORKDIR}/git"
30
31FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
32CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
33 /usr/etc/mplayer/example.conf \
34 /usr/etc/mplayer/codecs.conf \
35"
36
37inherit autotools pkgconfig
38
39EXTRA_OECONF = " \
40 --prefix=/usr \
41 --mandir=${mandir} \
42 --target=${SIMPLE_TARGET_SYS} \
43 \
44 --disable-lirc \
45 --disable-lircc \
46 --disable-joystick \
47 --disable-vm \
48 --disable-xf86keysym \
49 --enable-tv \
50 --enable-tv-v4l2 \
51 --disable-tv-bsdbt848 \
52 --enable-rtc \
53 --enable-networking \
54 --disable-smb \
55 --disable-dvdnav \
56 --enable-dvdread \
57 --disable-dvdread-internal \
58 --disable-libdvdcss-internal \
59 --disable-enca \
60 --disable-ftp \
61 --disable-vstream \
62 \
63 --disable-gif \
64 --enable-png \
65 --enable-jpeg \
66 --disable-libcdio \
67 --disable-qtx \
68 --disable-xanim \
69 --disable-real \
70 --disable-xvid \
71 \
72 --enable-speex \
73 --enable-theora \
74 --disable-ladspa \
75 --disable-libdv \
76 --enable-mad \
77 --disable-xmms \
78 --disable-musepack \
79 \
80 --disable-gl \
81 --enable-sdl \
82 --disable-caca \
83 --disable-directx \
84 --disable-dvb \
85 --enable-xv \
86 --disable-vm \
87 --disable-xinerama \
88 --enable-x11 \
89 --disable-directfb \
90 --disable-tga \
91 --disable-pnm \
92 --disable-md5sum \
93 \
94 --enable-alsa \
95 --enable-ossaudio \
96 --disable-pulse \
97 --disable-jack \
98 --disable-openal \
99 --enable-select \
100 --enable-libass \
101 \
102 --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \
103"
104# -ltheoradec is missing in:
105# libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0'
106
107EXTRA_OECONF_append_armv6 = " --enable-armv6"
108EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
109
110PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
111PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
112PACKAGECONFIG[lame] = ",,lame"
113
114FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
115BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
116
117CFLAGS_append = " -I${S}/libdvdread4 "
118
119do_configure() {
120 sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
121 sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
122 sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
123 sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
124 sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
125 sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
126
127 export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
128 ./configure ${EXTRA_OECONF}
129
130}
131
132do_compile () {
133 oe_runmake
134}
135
136do_install() {
137 oe_runmake 'DESTDIR=${D}' install-no-man
138 install -d ${D}/usr/etc/mplayer
139 install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
140 install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
141 install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
142}
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
new file mode 100644
index 0000000000..96429fd6cc
--- /dev/null
+++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch
@@ -0,0 +1,41 @@
1Fix Makefile:
2* don't overwrite CFLAGS but append to it
3* use gcc as CC only if CC is not already defined
4* use -I= to include paths
5* fix compile of minidlna binary by removing ${LIBS} dependency
6
7Upstream-status: Pending
8Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
9
10Index: minidlna-1.0.25/Makefile
11===================================================================
12--- minidlna-1.0.25.orig/Makefile 2012-01-18 00:49:01.000000000 +0200
13+++ minidlna-1.0.25/Makefile 2013-02-10 17:46:49.000000000 +0200
14@@ -12,13 +12,13 @@
15 #
16 #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
17 #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
18-CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
19- -I/usr/include/ffmpeg \
20- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
21- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
22+CFLAGS += -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
23+ -I=/usr/include/ffmpeg \
24+ -I=/usr/include/libavutil -I=/usr/include/libavcodec -I=/usr/include/libavformat \
25+ -I=/usr/include/ffmpeg/libavutil -I=/usr/include/ffmpeg/libavcodec -I=/usr/include/ffmpeg/libavformat
26 #STATIC_LINKING: CFLAGS += -DSTATIC
27 #STATIC_LINKING: LDFLAGS = -static
28-CC = gcc
29+CC ?= gcc
30 RM = rm -f
31 INSTALL = install
32
33@@ -64,7 +64,7 @@
34 $(INSTALL) -d $(ETCINSTALLDIR)
35 $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
36
37-minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
38+minidlna: $(BASEOBJS) $(LNXOBJS)
39 @echo Linking $@
40 @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
41
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
new file mode 100644
index 0000000000..573d88c812
--- /dev/null
+++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch
@@ -0,0 +1,48 @@
1Search for headers in STAGING_DIR_GOST.
2
3Upstream-status: Pending
4Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
5
6Index: minidlna-1.0.25/genconfig.sh
7===================================================================
8--- minidlna-1.0.25.orig/genconfig.sh 2012-01-21 02:34:13.000000000 +0200
9+++ minidlna-1.0.25/genconfig.sh 2013-02-10 17:12:06.000000000 +0200
10@@ -40,22 +40,22 @@
11
12 # Detect if there are missing headers
13 # NOTE: This check only works with a normal distro
14-[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
15-[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
16-[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
17-[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
18-[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
19-[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
20-[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
21-[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
22- ! -e "/usr/include/libavutil/avutil.h" -a \
23- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
24-[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
25- ! -e "/usr/include/libavformat/avformat.h" -a \
26- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
27-[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
28- ! -e "/usr/include/libavcodec/avcodec.h" -a \
29- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
30+[ ! -e "$STAGING_DIR_HOST/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
31+[ ! -e "$STAGING_DIR_HOST/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
32+[ ! -e "$STAGING_DIR_HOST/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
33+[ ! -e "$STAGING_DIR_HOST/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
34+[ ! -e "$STAGING_DIR_HOST/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
35+[ ! -e "$STAGING_DIR_HOST/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
36+[ ! -e "$STAGING_DIR_HOST/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
37+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avutil.h" -a \
38+ ! -e "$STAGING_DIR_HOST/usr/include/libavutil/avutil.h" -a \
39+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING"
40+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avformat.h" -a \
41+ ! -e "$STAGING_DIR_HOST/usr/include/libavformat/avformat.h" -a \
42+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING"
43+[ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/avcodec.h" -a \
44+ ! -e "$STAGING_DIR_HOST/usr/include/libavcodec/avcodec.h" -a \
45+ ! -e "$STAGING_DIR_HOST/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING"
46 if [ -n "$MISSING" ]; then
47 echo -e "\nERROR! Cannot continue."
48 echo -e "The following required libraries are either missing, or are missing development headers:\n"
diff --git a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
new file mode 100644
index 0000000000..7ceab7b5b8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb
@@ -0,0 +1,19 @@
1DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \
2being fully compliant with DLNA/UPnP-AV clients."
3LICENSE = "GPL-2.0"
4LIC_FILES_CHKSUM = "file://LICENCE;md5=b1a795ac1a06805cf8fd74920bc46b5c"
5
6DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}_${PV}_src.tar.gz \
9 file://search-for-headers-in-staging-dir.patch \
10 file://fix-makefile.patch \
11"
12
13SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
14SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851"
15
16export STAGING_DIR_HOST
17
18inherit autotools
19
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
new file mode 100644
index 0000000000..ff63111475
--- /dev/null
+++ b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
@@ -0,0 +1,15 @@
1SUMMARY = "Opus Audio Tools"
2HOMEPAGE = "http://www.opus-codec.org/"
3
4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1"
6
7SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz"
8SRC_URI[md5sum] = "b424790eda9357a4df394e2d7ca19eac"
9SRC_URI[sha256sum] = "e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6"
10
11S = "${WORKDIR}/opus-tools-${PV}"
12
13DEPENDS = "libopus flac"
14
15inherit autotools pkgconfig
diff --git a/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_1.0.bb b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_1.0.bb
new file mode 100644
index 0000000000..b648351ca5
--- /dev/null
+++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_1.0.bb
@@ -0,0 +1,13 @@
1DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server."
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
4
5DEPENDS = "intltool gtkmm libcanberra pulseaudio"
6
7inherit gnome
8
9SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz"
10SRC_URI[md5sum] = "0ab6b13542af9b4417438527d2524316"
11SRC_URI[sha256sum] = "3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde"
12
13EXTRA_OECONF = " --disable-gtk3 --disable-lynx "
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
new file mode 100644
index 0000000000..ebcfd127f1
--- /dev/null
+++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
@@ -0,0 +1,16 @@
1SUMMARY = "Freedesktop sound theme"
2HOMEPAGE = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"
3LICENSE = "GPLv2+ CC-BY-3.0 CC-BY-SA-3.0"
4LIC_FILES_CHKSUM = "file://CREDITS;md5=3213e601ce34bb42ddc3498903ac4e69"
5
6# glib-2.0 for glib-gettext.m4 which provides AM_GLIB_GNU_GETTEXT
7# intltool for intltool.m4 which provides IT_PROG_INTLTOOL
8DEPENDS = "glib-2.0 intltool-native"
9
10inherit autotools gettext
11
12DEPENDS += "glib-2.0-native intltool-native"
13
14SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2"
15SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62"
16SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14"
diff --git a/meta-oe/recipes-multimedia/v4l2apps/files/openat.patch b/meta-oe/recipes-multimedia/v4l2apps/files/openat.patch
new file mode 100644
index 0000000000..6cbd528d47
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/files/openat.patch
@@ -0,0 +1,38 @@
1From ac8eb4d8e1c16b907e795da123a032869c77c56f Mon Sep 17 00:00:00 2001
2From: Riku Voipio <riku.voipio@linaro.org>
3Date: Tue, 22 Jan 2013 12:44:48 +0200
4Subject: [PATCH] libv4lsyscall-priv.h: use openat when available
5
6New architectures such as 64-Bit arm build kernels without legacy
7system calls - Such as the the no-at system calls. Thus, use
8SYS_openat whenever it is available.
9
10Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
11Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
12
13Upstream-status: backport
14---
15 lib/libv4lconvert/libv4lsyscall-priv.h | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/lib/libv4lconvert/libv4lsyscall-priv.h b/lib/libv4lconvert/libv4lsyscall-priv.h
19index 2dac49a..cdd38bc 100644
20--- a/lib/libv4lconvert/libv4lsyscall-priv.h
21+++ b/lib/libv4lconvert/libv4lsyscall-priv.h
22@@ -72,8 +72,13 @@ typedef off_t __off_t;
23
24 #ifndef CONFIG_SYS_WRAPPER
25
26+#ifdef SYS_openat
27+#define SYS_OPEN(file, oflag, mode) \
28+ syscall(SYS_openat, AT_FDCWD, (const char *)(file), (int)(oflag), (mode_t)(mode))
29+#else
30 #define SYS_OPEN(file, oflag, mode) \
31 syscall(SYS_open, (const char *)(file), (int)(oflag), (mode_t)(mode))
32+#endif
33 #define SYS_CLOSE(fd) \
34 syscall(SYS_close, (int)(fd))
35 #define SYS_IOCTL(fd, cmd, arg) \
36--
371.7.10.4
38
diff --git a/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb b/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb
new file mode 100644
index 0000000000..86e5364df0
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb
@@ -0,0 +1,21 @@
1SUMMARY = "Media controller control application"
2LICENSE = "LGPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
4
5DEPENDS = "linux-libc-headers"
6
7SRC_URI = "git://git.ideasonboard.org/media-ctl.git"
8SRCREV = "a6ec4a37028952ffd6e62eb52648cf66248eb519"
9
10PV = "0.0.1"
11PR = "r4"
12S = "${WORKDIR}/git"
13
14inherit autotools pkgconfig
15
16EXTRA_OECONF = "--with-kernel-headers=${STAGING_EXECPREFIXDIR}"
17
18PACKAGES =+ "libmediactl libv4l2subdev"
19FILES_libmediactl = "${libdir}/libmediactl${SOLIBS}"
20FILES_libv4l2subdev = "${libdir}/libv4l2subdev${SOLIBS}"
21
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
new file mode 100644
index 0000000000..485a4162d1
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb
@@ -0,0 +1,39 @@
1SUMMARY = "v4l2 and IR applications"
2LICENSE = "GPLv2 & LGPLv2.1"
3LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
4 file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0"
5
6PR = "r2"
7
8DEPENDS = "jpeg virtual/libx11"
9
10inherit autotools gettext
11
12# libv4l was absorbed into this, let OE know that
13PROVIDES = "libv4l"
14
15SRC_URI = "git://linuxtv.org/v4l-utils.git \
16 file://openat.patch \
17"
18# 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag
19SRCREV = "0298efdcd1153b8f719b9164548a3f0546f0cb7c"
20
21S = "${WORKDIR}/git"
22
23EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev"
24
25do_configure() {
26 # autotools_do_configure fails with:
27 # | configure.ac:139: error: required file 'build-aux/config.rpath' not found
28 autoreconf -vfi
29 oe_runconf
30}
31
32PACKAGES =+ "rc-keymaps libv4l libv4l-dbg libv4l-dev"
33
34FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*"
35FILES_${PN} = "${bindir} ${sbindir} ${base_libdir}/udev/rules.d/70-infrared.rules"
36FILES_libv4l += "${libdir}/libv4l/* ${libdir}/*.so.*"
37FILES_libv4l-dbg += "${libdir}/libv4l/.debug"
38FILES_libv4l-dev += "${libdir}/*.so ${includedir}/lib* ${libdir}/pkgconfig/lib*"
39
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
new file mode 100644
index 0000000000..430836fee1
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch
@@ -0,0 +1,854 @@
1From 1146a0f01fc8730d5633b46b85d00154a721abbe Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 22 Jun 2012 12:40:23 +0200
4Subject: [PATCH] Add stdout mode to allow streaming over the network with nc
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 yavta.c | 288 ++++++++++++++++++++++++++++++++++-----------------------------
9 1 file changed, 157 insertions(+), 131 deletions(-)
10
11diff --git a/yavta.c b/yavta.c
12index f3deae0..8020209 100644
13--- a/yavta.c
14+++ b/yavta.c
15@@ -188,12 +188,12 @@ static int video_open(struct device *dev, const char *devname, int no_query)
16
17 dev->fd = open(devname, O_RDWR);
18 if (dev->fd < 0) {
19- printf("Error opening device %s: %s (%d).\n", devname,
20+ fprintf(stderr, "Error opening device %s: %s (%d).\n", devname,
21 strerror(errno), errno);
22 return dev->fd;
23 }
24
25- printf("Device %s opened.\n", devname);
26+ fprintf(stderr, "Device %s opened.\n", devname);
27
28 if (no_query) {
29 /* Assume capture device. */
30@@ -211,13 +211,13 @@ static int video_open(struct device *dev, const char *devname, int no_query)
31 else if (cap.capabilities & V4L2_CAP_VIDEO_OUTPUT)
32 dev->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33 else {
34- printf("Error opening device %s: neither video capture "
35+ fprintf(stderr, "Error opening device %s: neither video capture "
36 "nor video output supported.\n", devname);
37 close(dev->fd);
38 return -EINVAL;
39 }
40
41- printf("Device `%s' on `%s' is a video %s device.\n",
42+ fprintf(stderr, "Device `%s' on `%s' is a video %s device.\n",
43 cap.card, cap.bus_info,
44 dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE ? "capture" : "output");
45 return 0;
46@@ -280,7 +280,7 @@ static int get_control(struct device *dev, unsigned int id, int type,
47 }
48 }
49
50- printf("unable to get control 0x%8.8x: %s (%d).\n",
51+ fprintf(stderr, "unable to get control 0x%8.8x: %s (%d).\n",
52 id, strerror(errno), errno);
53 return -1;
54 }
55@@ -322,12 +322,12 @@ static void set_control(struct device *dev, unsigned int id, int type,
56 val = old.value;
57 }
58 if (ret == -1) {
59- printf("unable to set control 0x%8.8x: %s (%d).\n",
60+ fprintf(stderr, "unable to set control 0x%8.8x: %s (%d).\n",
61 id, strerror(errno), errno);
62 return;
63 }
64
65- printf("Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n",
66+ fprintf(stderr, "Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n",
67 id, old_val, val);
68 }
69
70@@ -341,7 +341,7 @@ static int video_get_format(struct device *dev)
71
72 ret = ioctl(dev->fd, VIDIOC_G_FMT, &fmt);
73 if (ret < 0) {
74- printf("Unable to get format: %s (%d).\n", strerror(errno),
75+ fprintf(stderr, "Unable to get format: %s (%d).\n", strerror(errno),
76 errno);
77 return ret;
78 }
79@@ -351,7 +351,7 @@ static int video_get_format(struct device *dev)
80 dev->bytesperline = fmt.fmt.pix.bytesperline;
81 dev->imagesize = fmt.fmt.pix.bytesperline ? fmt.fmt.pix.sizeimage : 0;
82
83- printf("Video format: %s (%08x) %ux%u (stride %u) buffer size %u\n",
84+ fprintf(stderr, "Video format: %s (%08x) %ux%u (stride %u) buffer size %u\n",
85 v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat,
86 fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline,
87 fmt.fmt.pix.sizeimage);
88@@ -374,12 +374,12 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h,
89
90 ret = ioctl(dev->fd, VIDIOC_S_FMT, &fmt);
91 if (ret < 0) {
92- printf("Unable to set format: %s (%d).\n", strerror(errno),
93+ fprintf(stderr, "Unable to set format: %s (%d).\n", strerror(errno),
94 errno);
95 return ret;
96 }
97
98- printf("Video format set: %s (%08x) %ux%u (stride %u) buffer size %u\n",
99+ fprintf(stderr, "Video format set: %s (%08x) %ux%u (stride %u) buffer size %u\n",
100 v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat,
101 fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline,
102 fmt.fmt.pix.sizeimage);
103@@ -396,16 +396,16 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f
104
105 ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm);
106 if (ret < 0) {
107- printf("Unable to get frame rate: %s (%d).\n",
108+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n",
109 strerror(errno), errno);
110 return ret;
111 }
112
113- printf("Current frame rate: %u/%u\n",
114+ fprintf(stderr, "Current frame rate: %u/%u\n",
115 parm.parm.capture.timeperframe.numerator,
116 parm.parm.capture.timeperframe.denominator);
117
118- printf("Setting frame rate to: %u/%u\n",
119+ fprintf(stderr, "Setting frame rate to: %u/%u\n",
120 time_per_frame->numerator,
121 time_per_frame->denominator);
122
123@@ -414,19 +414,19 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f
124
125 ret = ioctl(dev->fd, VIDIOC_S_PARM, &parm);
126 if (ret < 0) {
127- printf("Unable to set frame rate: %s (%d).\n", strerror(errno),
128+ fprintf(stderr, "Unable to set frame rate: %s (%d).\n", strerror(errno),
129 errno);
130 return ret;
131 }
132
133 ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm);
134 if (ret < 0) {
135- printf("Unable to get frame rate: %s (%d).\n", strerror(errno),
136+ fprintf(stderr, "Unable to get frame rate: %s (%d).\n", strerror(errno),
137 errno);
138 return ret;
139 }
140
141- printf("Frame rate set: %u/%u\n",
142+ fprintf(stderr, "Frame rate set: %u/%u\n",
143 parm.parm.capture.timeperframe.numerator,
144 parm.parm.capture.timeperframe.denominator);
145 return 0;
146@@ -449,12 +449,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs,
147
148 ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb);
149 if (ret < 0) {
150- printf("Unable to request buffers: %s (%d).\n", strerror(errno),
151+ fprintf(stderr, "Unable to request buffers: %s (%d).\n", strerror(errno),
152 errno);
153 return ret;
154 }
155
156- printf("%u buffers requested.\n", rb.count);
157+ fprintf(stderr, "%u buffers requested.\n", rb.count);
158
159 buffers = malloc(rb.count * sizeof buffers[0]);
160 if (buffers == NULL)
161@@ -470,35 +470,35 @@ static int video_alloc_buffers(struct device *dev, int nbufs,
162 buf.memory = dev->memtype;
163 ret = ioctl(dev->fd, VIDIOC_QUERYBUF, &buf);
164 if (ret < 0) {
165- printf("Unable to query buffer %u: %s (%d).\n", i,
166+ fprintf(stderr, "Unable to query buffer %u: %s (%d).\n", i,
167 strerror(errno), errno);
168 return ret;
169 }
170- printf("length: %u offset: %u\n", buf.length, buf.m.offset);
171+ fprintf(stderr, "length: %u offset: %u\n", buf.length, buf.m.offset);
172
173 switch (dev->memtype) {
174 case V4L2_MEMORY_MMAP:
175 buffers[i].mem = mmap(0, buf.length, PROT_READ | PROT_WRITE, MAP_SHARED, dev->fd, buf.m.offset);
176 if (buffers[i].mem == MAP_FAILED) {
177- printf("Unable to map buffer %u: %s (%d)\n", i,
178+ fprintf(stderr, "Unable to map buffer %u: %s (%d)\n", i,
179 strerror(errno), errno);
180 return ret;
181 }
182 buffers[i].size = buf.length;
183 buffers[i].padding = 0;
184- printf("Buffer %u mapped at address %p.\n", i, buffers[i].mem);
185+ fprintf(stderr, "Buffer %u mapped at address %p.\n", i, buffers[i].mem);
186 break;
187
188 case V4L2_MEMORY_USERPTR:
189 ret = posix_memalign(&buffers[i].mem, page_size, buf.length + offset + padding);
190 if (ret < 0) {
191- printf("Unable to allocate buffer %u (%d)\n", i, ret);
192+ fprintf(stderr, "Unable to allocate buffer %u (%d)\n", i, ret);
193 return -ENOMEM;
194 }
195 buffers[i].mem += offset;
196 buffers[i].size = buf.length;
197 buffers[i].padding = padding;
198- printf("Buffer %u allocated at address %p.\n", i, buffers[i].mem);
199+ fprintf(stderr, "Buffer %u allocated at address %p.\n", i, buffers[i].mem);
200 break;
201
202 default:
203@@ -525,7 +525,7 @@ static int video_free_buffers(struct device *dev)
204 case V4L2_MEMORY_MMAP:
205 ret = munmap(dev->buffers[i].mem, dev->buffers[i].size);
206 if (ret < 0) {
207- printf("Unable to unmap buffer %u: %s (%d)\n", i,
208+ fprintf(stderr, "Unable to unmap buffer %u: %s (%d)\n", i,
209 strerror(errno), errno);
210 return ret;
211 }
212@@ -549,12 +549,12 @@ static int video_free_buffers(struct device *dev)
213
214 ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb);
215 if (ret < 0) {
216- printf("Unable to release buffers: %s (%d).\n",
217+ fprintf(stderr, "Unable to release buffers: %s (%d).\n",
218 strerror(errno), errno);
219 return ret;
220 }
221
222- printf("%u buffers released.\n", dev->nbufs);
223+ fprintf(stderr, "%u buffers released.\n", dev->nbufs);
224
225 free(dev->buffers);
226 dev->nbufs = 0;
227@@ -589,7 +589,7 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo
228
229 ret = ioctl(dev->fd, VIDIOC_QBUF, &buf);
230 if (ret < 0)
231- printf("Unable to queue buffer: %s (%d).\n",
232+ fprintf(stderr, "Unable to queue buffer: %s (%d).\n",
233 strerror(errno), errno);
234
235 return ret;
236@@ -602,7 +602,7 @@ static int video_enable(struct device *dev, int enable)
237
238 ret = ioctl(dev->fd, enable ? VIDIOC_STREAMON : VIDIOC_STREAMOFF, &type);
239 if (ret < 0) {
240- printf("Unable to %s streaming: %s (%d).\n",
241+ fprintf(stderr, "Unable to %s streaming: %s (%d).\n",
242 enable ? "start" : "stop", strerror(errno), errno);
243 return ret;
244 }
245@@ -623,9 +623,9 @@ static void video_query_menu(struct device *dev, struct v4l2_queryctrl *query)
246 continue;
247
248 if (query->type == V4L2_CTRL_TYPE_MENU)
249- printf(" %u: %.32s\n", menu.index, menu.name);
250+ fprintf(stderr, " %u: %.32s\n", menu.index, menu.name);
251 else
252- printf(" %u: %lld\n", menu.index, menu.value);
253+ fprintf(stderr, " %u: %lld\n", menu.index, menu.value);
254 };
255 }
256
257@@ -655,7 +655,7 @@ static void video_list_controls(struct device *dev)
258 continue;
259
260 if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS) {
261- printf("--- %s (class 0x%08x) ---\n", query.name, query.id);
262+ fprintf(stderr, "--- %s (class 0x%08x) ---\n", query.name, query.id);
263 continue;
264 }
265
266@@ -665,7 +665,7 @@ static void video_list_controls(struct device *dev)
267 else
268 sprintf(value, "%" PRId64, val64);
269
270- printf("control 0x%08x `%s' min %d max %d step %d default %d current %s.\n",
271+ fprintf(stderr, "control 0x%08x `%s' min %d max %d step %d default %d current %s.\n",
272 query.id, query.name, query.minimum, query.maximum,
273 query.step, query.default_value, value);
274
275@@ -677,9 +677,9 @@ static void video_list_controls(struct device *dev)
276 }
277
278 if (nctrls)
279- printf("%u control%s found.\n", nctrls, nctrls > 1 ? "s" : "");
280+ fprintf(stderr, "%u control%s found.\n", nctrls, nctrls > 1 ? "s" : "");
281 else
282- printf("No control found.\n");
283+ fprintf(stderr, "No control found.\n");
284 }
285
286 static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat,
287@@ -700,30 +700,30 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat,
288 break;
289
290 if (i != ival.index)
291- printf("Warning: driver returned wrong ival index "
292+ fprintf(stderr, "Warning: driver returned wrong ival index "
293 "%u.\n", ival.index);
294 if (pixelformat != ival.pixel_format)
295- printf("Warning: driver returned wrong ival pixel "
296+ fprintf(stderr, "Warning: driver returned wrong ival pixel "
297 "format %08x.\n", ival.pixel_format);
298 if (width != ival.width)
299- printf("Warning: driver returned wrong ival width "
300+ fprintf(stderr, "Warning: driver returned wrong ival width "
301 "%u.\n", ival.width);
302 if (height != ival.height)
303- printf("Warning: driver returned wrong ival height "
304+ fprintf(stderr, "Warning: driver returned wrong ival height "
305 "%u.\n", ival.height);
306
307 if (i != 0)
308- printf(", ");
309+ fprintf(stderr, ", ");
310
311 switch (ival.type) {
312 case V4L2_FRMIVAL_TYPE_DISCRETE:
313- printf("%u/%u",
314+ fprintf(stderr, "%u/%u",
315 ival.discrete.numerator,
316 ival.discrete.denominator);
317 break;
318
319 case V4L2_FRMIVAL_TYPE_CONTINUOUS:
320- printf("%u/%u - %u/%u",
321+ fprintf(stderr, "%u/%u - %u/%u",
322 ival.stepwise.min.numerator,
323 ival.stepwise.min.denominator,
324 ival.stepwise.max.numerator,
325@@ -731,7 +731,7 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat,
326 return;
327
328 case V4L2_FRMIVAL_TYPE_STEPWISE:
329- printf("%u/%u - %u/%u (by %u/%u)",
330+ fprintf(stderr, "%u/%u - %u/%u (by %u/%u)",
331 ival.stepwise.min.numerator,
332 ival.stepwise.min.denominator,
333 ival.stepwise.max.numerator,
334@@ -761,23 +761,23 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat)
335 break;
336
337 if (i != frame.index)
338- printf("Warning: driver returned wrong frame index "
339+ fprintf(stderr, "Warning: driver returned wrong frame index "
340 "%u.\n", frame.index);
341 if (pixelformat != frame.pixel_format)
342- printf("Warning: driver returned wrong frame pixel "
343+ fprintf(stderr, "Warning: driver returned wrong frame pixel "
344 "format %08x.\n", frame.pixel_format);
345
346 switch (frame.type) {
347 case V4L2_FRMSIZE_TYPE_DISCRETE:
348- printf("\tFrame size: %ux%u (", frame.discrete.width,
349+ fprintf(stderr, "\tFrame size: %ux%u (", frame.discrete.width,
350 frame.discrete.height);
351 video_enum_frame_intervals(dev, frame.pixel_format,
352 frame.discrete.width, frame.discrete.height);
353- printf(")\n");
354+ fprintf(stderr, ")\n");
355 break;
356
357 case V4L2_FRMSIZE_TYPE_CONTINUOUS:
358- printf("\tFrame size: %ux%u - %ux%u (",
359+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (",
360 frame.stepwise.min_width,
361 frame.stepwise.min_height,
362 frame.stepwise.max_width,
363@@ -785,11 +785,11 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat)
364 video_enum_frame_intervals(dev, frame.pixel_format,
365 frame.stepwise.max_width,
366 frame.stepwise.max_height);
367- printf(")\n");
368+ fprintf(stderr, ")\n");
369 break;
370
371 case V4L2_FRMSIZE_TYPE_STEPWISE:
372- printf("\tFrame size: %ux%u - %ux%u (by %ux%u) (\n",
373+ fprintf(stderr, "\tFrame size: %ux%u - %ux%u (by %ux%u) (\n",
374 frame.stepwise.min_width,
375 frame.stepwise.min_height,
376 frame.stepwise.max_width,
377@@ -799,7 +799,7 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat)
378 video_enum_frame_intervals(dev, frame.pixel_format,
379 frame.stepwise.max_width,
380 frame.stepwise.max_height);
381- printf(")\n");
382+ fprintf(stderr, ")\n");
383 break;
384
385 default:
386@@ -823,19 +823,19 @@ static void video_enum_formats(struct device *dev, enum v4l2_buf_type type)
387 break;
388
389 if (i != fmt.index)
390- printf("Warning: driver returned wrong format index "
391+ fprintf(stderr, "Warning: driver returned wrong format index "
392 "%u.\n", fmt.index);
393 if (type != fmt.type)
394- printf("Warning: driver returned wrong format type "
395+ fprintf(stderr, "Warning: driver returned wrong format type "
396 "%u.\n", fmt.type);
397
398- printf("\tFormat %u: %s (%08x)\n", i,
399+ fprintf(stderr, "\tFormat %u: %s (%08x)\n", i,
400 v4l2_format_name(fmt.pixelformat), fmt.pixelformat);
401- printf("\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type),
402+ fprintf(stderr, "\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type),
403 fmt.type);
404- printf("\tName: %.32s\n", fmt.description);
405+ fprintf(stderr, "\tName: %.32s\n", fmt.description);
406 video_enum_frame_sizes(dev, fmt.pixelformat);
407- printf("\n");
408+ fprintf(stderr, "\n");
409 }
410 }
411
412@@ -853,13 +853,13 @@ static void video_enum_inputs(struct device *dev)
413 break;
414
415 if (i != input.index)
416- printf("Warning: driver returned wrong input index "
417+ fprintf(stderr, "Warning: driver returned wrong input index "
418 "%u.\n", input.index);
419
420- printf("\tInput %u: %s.\n", i, input.name);
421+ fprintf(stderr, "\tInput %u: %s.\n", i, input.name);
422 }
423
424- printf("\n");
425+ fprintf(stderr, "\n");
426 }
427
428 static int video_get_input(struct device *dev)
429@@ -869,7 +869,7 @@ static int video_get_input(struct device *dev)
430
431 ret = ioctl(dev->fd, VIDIOC_G_INPUT, &input);
432 if (ret < 0) {
433- printf("Unable to get current input: %s (%d).\n",
434+ fprintf(stderr, "Unable to get current input: %s (%d).\n",
435 strerror(errno), errno);
436 return ret;
437 }
438@@ -884,7 +884,7 @@ static int video_set_input(struct device *dev, unsigned int input)
439
440 ret = ioctl(dev->fd, VIDIOC_S_INPUT, &_input);
441 if (ret < 0)
442- printf("Unable to select input %u: %s (%d).\n", input,
443+ fprintf(stderr, "Unable to select input %u: %s (%d).\n", input,
444 strerror(errno), errno);
445
446 return ret;
447@@ -903,14 +903,14 @@ static int video_set_quality(struct device *dev, unsigned int quality)
448
449 ret = ioctl(dev->fd, VIDIOC_S_JPEGCOMP, &jpeg);
450 if (ret < 0) {
451- printf("Unable to set quality to %u: %s (%d).\n", quality,
452+ fprintf(stderr, "Unable to set quality to %u: %s (%d).\n", quality,
453 strerror(errno), errno);
454 return ret;
455 }
456
457 ret = ioctl(dev->fd, VIDIOC_G_JPEGCOMP, &jpeg);
458 if (ret >= 0)
459- printf("Quality set to %u\n", jpeg.quality);
460+ fprintf(stderr, "Quality set to %u\n", jpeg.quality);
461
462 return 0;
463 }
464@@ -930,7 +930,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename)
465
466 if (filename == NULL) {
467 if (dev->bytesperline == 0) {
468- printf("Compressed format detect and no test pattern filename given.\n"
469+ fprintf(stderr, "Compressed format detect and no test pattern filename given.\n"
470 "The test pattern can't be generated automatically.\n");
471 return -EINVAL;
472 }
473@@ -947,7 +947,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename)
474
475 fd = open(filename, O_RDONLY);
476 if (fd == -1) {
477- printf("Unable to open test pattern file '%s': %s (%d).\n",
478+ fprintf(stderr, "Unable to open test pattern file '%s': %s (%d).\n",
479 filename, strerror(errno), errno);
480 return -errno;
481 }
482@@ -956,7 +956,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename)
483 close(fd);
484
485 if (ret != (int)size && dev->bytesperline != 0) {
486- printf("Test pattern file size %u doesn't match image size %u\n",
487+ fprintf(stderr, "Test pattern file size %u doesn't match image size %u\n",
488 ret, size);
489 return -EINVAL;
490 }
491@@ -1012,16 +1012,16 @@ static void video_verify_buffer(struct device *dev, int index)
492 }
493
494 if (errors) {
495- printf("Warning: %u bytes overwritten among %u first padding bytes\n",
496+ fprintf(stderr, "Warning: %u bytes overwritten among %u first padding bytes\n",
497 errors, dirty);
498
499 dirty = (dirty + 15) & ~15;
500 dirty = dirty > 32 ? 32 : dirty;
501
502 for (i = 0; i < dirty; ++i) {
503- printf("%02x ", data[i]);
504+ fprintf(stderr, "%02x ", data[i]);
505 if (i % 16 == 15)
506- printf("\n");
507+ fprintf(stderr, "\n");
508 }
509 }
510 }
511@@ -1061,15 +1061,29 @@ static void video_save_image(struct device *dev, struct v4l2_buffer *buf,
512 close(fd);
513
514 if (ret < 0)
515- printf("write error: %s (%d)\n", strerror(errno), errno);
516+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno);
517 else if (ret != (int)buf->bytesused)
518- printf("write error: only %d bytes written instead of %u\n",
519+ fprintf(stderr, "write error: only %d bytes written instead of %u\n",
520+ ret, buf->bytesused);
521+}
522+
523+static void video_stdout_image(struct device *dev, struct v4l2_buffer *buf)
524+{
525+ int ret;
526+
527+ fprintf(stderr, "stdout");
528+ ret = fwrite(dev->buffers[buf->index].mem, buf->bytesused, 1, stdout);
529+
530+ if (ret < 0)
531+ fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno);
532+ else if (ret != (int)buf->bytesused)
533+ fprintf(stderr, "write error: only %d bytes written instead of %u\n",
534 ret, buf->bytesused);
535 }
536
537 static int video_do_capture(struct device *dev, unsigned int nframes,
538 unsigned int skip, unsigned int delay, const char *pattern,
539- int do_requeue_last, enum buffer_fill_mode fill)
540+ int do_requeue_last, enum buffer_fill_mode fill, int do_stdout)
541 {
542 struct timespec start;
543 struct timeval last;
544@@ -1099,7 +1113,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
545 ret = ioctl(dev->fd, VIDIOC_DQBUF, &buf);
546 if (ret < 0) {
547 if (errno != EIO) {
548- printf("Unable to dequeue buffer: %s (%d).\n",
549+ fprintf(stderr, "Unable to dequeue buffer: %s (%d).\n",
550 strerror(errno), errno);
551 goto done;
552 }
553@@ -1111,7 +1125,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
554
555 if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE &&
556 dev->imagesize != 0 && buf.bytesused != dev->imagesize)
557- printf("Warning: bytes used %u != image size %u\n",
558+ fprintf(stderr, "Warning: bytes used %u != image size %u\n",
559 buf.bytesused, dev->imagesize);
560
561 if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
562@@ -1124,7 +1138,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
563 fps = fps ? 1000000.0 / fps : 0.0;
564
565 clock_gettime(CLOCK_MONOTONIC, &ts);
566- printf("%u (%u) [%c] %u %u bytes %ld.%06ld %ld.%06ld %.3f fps\n", i, buf.index,
567+ fprintf(stderr, "%u (%u) [%c] %u %u bytes %ld.%06ld %ld.%06ld %.3f fps\n", i, buf.index,
568 (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-',
569 buf.sequence, buf.bytesused, buf.timestamp.tv_sec,
570 buf.timestamp.tv_usec, ts.tv_sec, ts.tv_nsec/1000, fps);
571@@ -1132,8 +1146,13 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
572 last = buf.timestamp;
573
574 /* Save the image. */
575- if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pattern && !skip)
576+ if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pattern && !skip) {
577 video_save_image(dev, &buf, pattern, i);
578+ }
579+
580+ if (dev->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && do_stdout && !skip) {
581+ video_stdout_image(dev, &buf);
582+ }
583
584 if (skip)
585 --skip;
586@@ -1149,7 +1168,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
587
588 ret = video_queue_buffer(dev, buf.index, fill);
589 if (ret < 0) {
590- printf("Unable to requeue buffer: %s (%d).\n",
591+ fprintf(stderr, "Unable to requeue buffer: %s (%d).\n",
592 strerror(errno), errno);
593 goto done;
594 }
595@@ -1159,7 +1178,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
596 video_enable(dev, 0);
597
598 if (nframes == 0) {
599- printf("No frames captured.\n");
600+ fprintf(stderr, "No frames captured.\n");
601 goto done;
602 }
603
604@@ -1176,7 +1195,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
605 bps = size/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0;
606 fps = i/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0;
607
608- printf("Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n",
609+ fprintf(stderr, "Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n",
610 i, ts.tv_sec, ts.tv_nsec/1000, fps, bps);
611
612 done:
613@@ -1188,37 +1207,38 @@ done:
614
615 static void usage(const char *argv0)
616 {
617- printf("Usage: %s [options] device\n", argv0);
618- printf("Supported options:\n");
619- printf("-c, --capture[=nframes] Capture frames\n");
620- printf("-C, --check-overrun Verify dequeued frames for buffer overrun\n");
621- printf("-d, --delay Delay (in ms) before requeuing buffers\n");
622- printf("-f, --format format Set the video format\n");
623- printf("-F, --file[=name] Read/write frames from/to disk\n");
624- printf("\tFor video capture devices, the first '#' character in the file name is\n");
625- printf("\texpanded to the frame sequence number. The default file name is\n");
626- printf("\t'frame-#.bin'.\n");
627- printf("-h, --help Show this help screen\n");
628- printf("-i, --input input Select the video input\n");
629- printf("-I, --fill-frames Fill frames with check pattern before queuing them\n");
630- printf("-l, --list-controls List available controls\n");
631- printf("-n, --nbufs n Set the number of video buffers\n");
632- printf("-p, --pause Pause before starting the video stream\n");
633- printf("-q, --quality n MJPEG quality (0-100)\n");
634- printf("-r, --get-control ctrl Get control 'ctrl'\n");
635- printf("-R, --realtime=[priority] Enable realtime RR scheduling\n");
636- printf("-s, --size WxH Set the frame size\n");
637- printf("-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n");
638- printf("-u, --userptr Use the user pointers streaming method\n");
639- printf("-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n");
640- printf(" --enum-formats Enumerate formats\n");
641- printf(" --enum-inputs Enumerate inputs\n");
642- printf(" --no-query Don't query capabilities on open\n");
643- printf(" --offset User pointer buffer offset from page start\n");
644- printf(" --requeue-last Requeue the last buffers before streamoff\n");
645- printf(" --skip n Skip the first n frames\n");
646- printf(" --sleep-forever Sleep forever after configuring the device\n");
647- printf(" --stride value Line stride in bytes\n");
648+ fprintf(stderr, "Usage: %s [options] device\n", argv0);
649+ fprintf(stderr, "Supported options:\n");
650+ fprintf(stderr, "-c, --capture[=nframes] Capture frames\n");
651+ fprintf(stderr, "-C, --check-overrun Verify dequeued frames for buffer overrun\n");
652+ fprintf(stderr, "-d, --delay Delay (in ms) before requeuing buffers\n");
653+ fprintf(stderr, "-f, --format format Set the video format\n");
654+ fprintf(stderr, "-F, --file[=name] Read/write frames from/to disk\n");
655+ fprintf(stderr, "\tFor video capture devices, the first '#' character in the file name is\n");
656+ fprintf(stderr, "\texpanded to the frame sequence number. The default file name is\n");
657+ fprintf(stderr, "\t'frame-#.bin'.\n");
658+ fprintf(stderr, " --stdout write frames to stdout\n");
659+ fprintf(stderr, "-h, --help Show this help screen\n");
660+ fprintf(stderr, "-i, --input input Select the video input\n");
661+ fprintf(stderr, "-I, --fill-frames Fill frames with check pattern before queuing them\n");
662+ fprintf(stderr, "-l, --list-controls List available controls\n");
663+ fprintf(stderr, "-n, --nbufs n Set the number of video buffers\n");
664+ fprintf(stderr, "-p, --pause Pause before starting the video stream\n");
665+ fprintf(stderr, "-q, --quality n MJPEG quality (0-100)\n");
666+ fprintf(stderr, "-r, --get-control ctrl Get control 'ctrl'\n");
667+ fprintf(stderr, "-R, --realtime=[priority] Enable realtime RR scheduling\n");
668+ fprintf(stderr, "-s, --size WxH Set the frame size\n");
669+ fprintf(stderr, "-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n");
670+ fprintf(stderr, "-u, --userptr Use the user pointers streaming method\n");
671+ fprintf(stderr, "-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n");
672+ fprintf(stderr, " --enum-formats Enumerate formats\n");
673+ fprintf(stderr, " --enum-inputs Enumerate inputs\n");
674+ fprintf(stderr, " --no-query Don't query capabilities on open\n");
675+ fprintf(stderr, " --offset User pointer buffer offset from page start\n");
676+ fprintf(stderr, " --requeue-last Requeue the last buffers before streamoff\n");
677+ fprintf(stderr, " --skip n Skip the first n frames\n");
678+ fprintf(stderr, " --sleep-forever Sleep forever after configuring the device\n");
679+ fprintf(stderr, " --stride value Line stride in bytes\n");
680 }
681
682 #define OPT_ENUM_FORMATS 256
683@@ -1229,6 +1249,7 @@ static void usage(const char *argv0)
684 #define OPT_USERPTR_OFFSET 261
685 #define OPT_REQUEUE_LAST 262
686 #define OPT_STRIDE 263
687+#define OPT_STDOUT 264
688
689 static struct option opts[] = {
690 {"capture", 2, 0, 'c'},
691@@ -1238,6 +1259,7 @@ static struct option opts[] = {
692 {"enum-inputs", 0, 0, OPT_ENUM_INPUTS},
693 {"file", 2, 0, 'F'},
694 {"fill-frames", 0, 0, 'I'},
695+ {"stdout", 0, 0, OPT_STDOUT},
696 {"format", 1, 0, 'f'},
697 {"help", 0, 0, 'h'},
698 {"input", 1, 0, 'i'},
699@@ -1274,7 +1296,8 @@ int main(int argc, char *argv[])
700 int do_list_controls = 0, do_get_control = 0, do_set_control = 0;
701 int do_sleep_forever = 0, do_requeue_last = 0;
702 int do_rt = 0;
703- int no_query = 0;
704+ int no_query = 0;
705+ int do_stdout = 0;
706 char *endptr;
707 int c;
708
709@@ -1321,7 +1344,7 @@ int main(int argc, char *argv[])
710 do_set_format = 1;
711 pixelformat = v4l2_format_code(optarg);
712 if (pixelformat == 0) {
713- printf("Unsupported video format '%s'\n", optarg);
714+ fprintf(stderr, "Unsupported video format '%s'\n", optarg);
715 return 1;
716 }
717 break;
718@@ -1357,7 +1380,7 @@ int main(int argc, char *argv[])
719 case 'r':
720 ctrl_name = strtol(optarg, &endptr, 0);
721 if (*endptr != 0) {
722- printf("Invalid control name '%s'\n", optarg);
723+ fprintf(stderr, "Invalid control name '%s'\n", optarg);
724 return 1;
725 }
726 do_get_control = 1;
727@@ -1371,12 +1394,12 @@ int main(int argc, char *argv[])
728 do_set_format = 1;
729 width = strtol(optarg, &endptr, 10);
730 if (*endptr != 'x' || endptr == optarg) {
731- printf("Invalid size '%s'\n", optarg);
732+ fprintf(stderr, "Invalid size '%s'\n", optarg);
733 return 1;
734 }
735 height = strtol(endptr + 1, &endptr, 10);
736 if (*endptr != 0) {
737- printf("Invalid size '%s'\n", optarg);
738+ fprintf(stderr, "Invalid size '%s'\n", optarg);
739 return 1;
740 }
741 break;
742@@ -1384,12 +1407,12 @@ int main(int argc, char *argv[])
743 do_set_time_per_frame = 1;
744 time_per_frame.numerator = strtol(optarg, &endptr, 10);
745 if (*endptr != '/' || endptr == optarg) {
746- printf("Invalid time per frame '%s'\n", optarg);
747+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg);
748 return 1;
749 }
750 time_per_frame.denominator = strtol(endptr + 1, &endptr, 10);
751 if (*endptr != 0) {
752- printf("Invalid time per frame '%s'\n", optarg);
753+ fprintf(stderr, "Invalid time per frame '%s'\n", optarg);
754 return 1;
755 }
756 break;
757@@ -1399,12 +1422,12 @@ int main(int argc, char *argv[])
758 case 'w':
759 ctrl_name = strtol(optarg, &endptr, 0);
760 if (*endptr != ' ' || endptr == optarg) {
761- printf("Invalid control name '%s'\n", optarg);
762+ fprintf(stderr, "Invalid control name '%s'\n", optarg);
763 return 1;
764 }
765 ctrl_value = strtol(endptr + 1, &endptr, 0);
766 if (*endptr != 0) {
767- printf("Invalid control value '%s'\n", optarg);
768+ fprintf(stderr, "Invalid control value '%s'\n", optarg);
769 return 1;
770 }
771 do_set_control = 1;
772@@ -1433,15 +1456,18 @@ int main(int argc, char *argv[])
773 case OPT_USERPTR_OFFSET:
774 userptr_offset = atoi(optarg);
775 break;
776+ case OPT_STDOUT:
777+ do_stdout = 1;
778+ break;
779 default:
780- printf("Invalid option -%c\n", c);
781- printf("Run %s -h for help.\n", argv[0]);
782+ fprintf(stderr, "Invalid option -%c\n", c);
783+ fprintf(stderr, "Run %s -h for help.\n", argv[0]);
784 return 1;
785 }
786 }
787
788 if ((fill_mode & BUFFER_FILL_PADDING) && memtype != V4L2_MEMORY_USERPTR) {
789- printf("Buffer overrun can only be checked in USERPTR mode.\n");
790+ fprintf(stderr, "Buffer overrun can only be checked in USERPTR mode.\n");
791 return 1;
792 }
793
794@@ -1470,7 +1496,7 @@ int main(int argc, char *argv[])
795 ret = get_control(&dev, ctrl_name,
796 get_control_type(&dev, ctrl_name), &val);
797 if (ret >= 0)
798- printf("Control 0x%08x value %" PRId64 "\n", ctrl_name, val);
799+ fprintf(stderr, "Control 0x%08x value %" PRId64 "\n", ctrl_name, val);
800 }
801
802 if (do_set_control)
803@@ -1481,21 +1507,21 @@ int main(int argc, char *argv[])
804 video_list_controls(&dev);
805
806 if (do_enum_formats) {
807- printf("- Available formats:\n");
808+ fprintf(stderr, "- Available formats:\n");
809 video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE);
810 video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_OUTPUT);
811 video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_OVERLAY);
812 }
813
814 if (do_enum_inputs) {
815- printf("- Available inputs:\n");
816+ fprintf(stderr, "- Available inputs:\n");
817 video_enum_inputs(&dev);
818 }
819
820 if (do_set_input) {
821 video_set_input(&dev, input);
822 ret = video_get_input(&dev);
823- printf("Input %d selected\n", ret);
824+ fprintf(stderr, "Input %d selected\n", ret);
825 }
826
827 /* Set the video format. */
828@@ -1537,7 +1563,7 @@ int main(int argc, char *argv[])
829 }
830
831 if (do_pause) {
832- printf("Press enter to start capture\n");
833+ fprintf(stderr, "Press enter to start capture\n");
834 getchar();
835 }
836
837@@ -1546,12 +1572,12 @@ int main(int argc, char *argv[])
838 sched.sched_priority = rt_priority;
839 ret = sched_setscheduler(0, SCHED_RR, &sched);
840 if (ret < 0)
841- printf("Failed to select RR scheduler: %s (%d)\n",
842+ fprintf(stderr, "Failed to select RR scheduler: %s (%d)\n",
843 strerror(errno), errno);
844 }
845
846 if (video_do_capture(&dev, nframes, skip, delay, filename,
847- do_requeue_last, fill_mode) < 0) {
848+ do_requeue_last, fill_mode, do_stdout) < 0) {
849 video_close(&dev);
850 return 1;
851 }
852--
8531.7.10
854
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
new file mode 100644
index 0000000000..a20f5915cf
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Yet Another V4L2 Test Application"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
4
5SRC_URI = "git://git.ideasonboard.org/yavta.git \
6 file://0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch"
7SRCREV = "82ff2efdb9787737b9f21b6f4759f077c827b238"
8
9PV = "0.0"
10PR = "r2"
11S = "${WORKDIR}/git"
12
13do_install() {
14 install -d ${D}${bindir}
15 install -m 0755 yavta ${D}${bindir}
16}
17
18
diff --git a/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
new file mode 100644
index 0000000000..cc5b84489c
--- /dev/null
+++ b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
@@ -0,0 +1,10 @@
1DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode."
2LICENSE = "BSD"
3LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8"
4
5SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2"
6SRC_URI[md5sum] = "7bb1528f910e4d0003426c02db856063"
7SRC_URI[sha256sum] = "175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5"
8
9inherit autotools lib_package
10
diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc
new file mode 100644
index 0000000000..4d8ba9d825
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx.inc
@@ -0,0 +1,38 @@
1DESCRIPTION = "vpx Multi-Format Codec SDK"
2LICENSE = "BSD"
3
4INC_PR = "r3"
5
6SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
7S = "${WORKDIR}/libvpx-v${PV}"
8
9# ffmpeg links with this and fails
10# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
11ARM_INSTRUCTION_SET = "arm"
12
13CFLAGS += "-fPIC"
14
15export CC
16export LD = "${CC}"
17
18VPXTARGET_armv5te = "armv5te-linux-gcc"
19VPXTARGET_armv6 = "armv6-linux-gcc"
20VPXTARGET_armv7a = "armv7-linux-gcc"
21VPXTARGET ?= "generic-gnu"
22
23CONFIGUREOPTS = " \
24 --target=${VPXTARGET} \
25 --enable-vp8 \
26 --enable-libs \
27 --disable-install-docs \
28"
29do_configure() {
30 ${S}/configure ${CONFIGUREOPTS}
31}
32do_compile() {
33 oe_runmake
34}
35do_install() {
36 oe_runmake install DESTDIR=${D}
37}
38
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch b/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch
new file mode 100644
index 0000000000..37f5108a51
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx/CVE-2010-4203.patch
@@ -0,0 +1,69 @@
1From: John Koleszar <jkoleszar@google.com>
2Date: Thu, 4 Nov 2010 20:59:26 +0000 (-0400)
3Subject: fix integer promotion bug in partition size check
4X-Git-Url: https://review.webmproject.org/gitweb?p=libvpx.git;a=commitdiff_plain;h=9fb80f7170ec48e23c3c7b477149eeb37081c699
5
6fix integer promotion bug in partition size check
7
8The check '(user_data_end - partition < partition_size)' must be
9evaluated as a signed comparison, but because partition_size was
10unsigned, the LHS was promoted to unsigned, causing an incorrect
11result on 32-bit. Instead, check the upper and lower bounds of
12the segment separately.
13
14Change-Id: I6266aba7fd7de084268712a3d2a81424ead7aa06
15---
16
17diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
18index 2d81d61..f5e49a1 100644
19--- a/vp8/decoder/decodframe.c
20+++ b/vp8/decoder/decodframe.c
21@@ -462,7 +462,8 @@ static void setup_token_decoder(VP8D_COMP *pbi,
22 partition_size = user_data_end - partition;
23 }
24
25- if (user_data_end - partition < partition_size)
26+ if (partition + partition_size > user_data_end
27+ || partition + partition_size < partition)
28 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
29 "Truncated packet or corrupt partition "
30 "%d length", i + 1);
31@@ -580,7 +581,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
32 (data[0] | (data[1] << 8) | (data[2] << 16)) >> 5;
33 data += 3;
34
35- if (data_end - data < first_partition_length_in_bytes)
36+ if (data + first_partition_length_in_bytes > data_end
37+ || data + first_partition_length_in_bytes < data)
38 vpx_internal_error(&pc->error, VPX_CODEC_CORRUPT_FRAME,
39 "Truncated packet or corrupt partition 0 length");
40 vp8_setup_version(pc);
41diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c
42index e7e5356..f0adf5b 100644
43--- a/vp8/vp8_dx_iface.c
44+++ b/vp8/vp8_dx_iface.c
45@@ -253,8 +253,11 @@ static vpx_codec_err_t vp8_peek_si(const uint8_t *data,
46 unsigned int data_sz,
47 vpx_codec_stream_info_t *si)
48 {
49-
50 vpx_codec_err_t res = VPX_CODEC_OK;
51+
52+ if(data + data_sz <= data)
53+ res = VPX_CODEC_INVALID_PARAM;
54+ else
55 {
56 /* Parse uncompresssed part of key frame header.
57 * 3 bytes:- including version, frame type and an offset
58@@ -331,7 +334,10 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx,
59
60 ctx->img_avail = 0;
61
62- /* Determine the stream parameters */
63+ /* Determine the stream parameters. Note that we rely on peek_si to
64+ * validate that we have a buffer that does not wrap around the top
65+ * of the heap.
66+ */
67 if (!ctx->si.h)
68 res = ctx->base.iface->dec.peek_si(data, data_sz, &ctx->si);
69
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch b/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch
new file mode 100644
index 0000000000..d871694215
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx/do-not-hardcode-softfp-float-api.patch
@@ -0,0 +1,28 @@
1From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
2
3Upstream-Status: Inappopriate [upstream has it done in other way]
4
5Problem is solved upstream but we have quite old version so backporting patches
6is waste of time.
7
8---
9 build/make/configure.sh | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12--- libvpx-v0.9.5.orig/build/make/configure.sh
13+++ libvpx-v0.9.5/build/make/configure.sh
14@@ -659,12 +659,12 @@ process_common_toolchain() {
15 if enabled iwmmxt || enabled iwmmxt2
16 then
17 check_add_asflags -mcpu=${tgt_isa}
18 elif enabled armv7
19 then
20- check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-ftree-vectorize
21- check_add_asflags -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-march=armv7-a
22+ check_add_cflags -march=armv7-a -mcpu=cortex-a8 -mfpu=neon #-ftree-vectorize
23+ check_add_asflags -mcpu=cortex-a8 -mfpu=neon #-march=armv7-a
24 else
25 check_add_cflags -march=${tgt_isa}
26 check_add_asflags -march=${tgt_isa}
27 fi
28
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
new file mode 100644
index 0000000000..1bf863dfa2
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
@@ -0,0 +1,43 @@
1Upstream: not yet
2
3Fix configure to accept "--prefix=" (a blank prefix).
4
5--- libvpx-0.9.1/build/make/configure.sh.orig 2010-06-17 09:08:56.000000000 -0400
6+++ libvpx-0.9.1/build/make/configure.sh 2010-09-23 14:27:48.000000000 -0400
7@@ -444,6 +444,8 @@
8 ;;
9 --prefix=*)
10 prefix="${optval}"
11+ # Distinguish between "prefix not set" and "prefix set to ''"
12+ prefixset=1
13 ;;
14 --libdir=*)
15 libdir="${optval}"
16@@ -471,13 +473,23 @@
17
18
19 post_process_common_cmdline() {
20- prefix="${prefix:-/usr/local}"
21+ if [ "$prefixset" != "1" ]
22+ then
23+ prefix=/usr/local
24+ fi
25+
26+ # Strip trailing slash
27 prefix="${prefix%/}"
28+
29 libdir="${libdir:-${prefix}/lib}"
30 libdir="${libdir%/}"
31- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
32- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
33- fi
34+
35+ case "$libdir" in
36+ "${prefix}/"*) ;;
37+ *)
38+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
39+ ;;
40+ esac
41 }
42
43
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb b/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb
new file mode 100644
index 0000000000..597d0e14ce
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb
@@ -0,0 +1,19 @@
1require libvpx.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=6e8dee932c26f2dab503abf70c96d8bb"
4
5PR = "${INC_PR}.0"
6
7SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \
8 file://do-not-hardcode-softfp-float-api.patch \
9 file://CVE-2010-4203.patch \
10"
11
12SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3"
13SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa"
14
15CONFIGUREOPTS += " \
16 --prefix=${prefix} \
17 --libdir=${libdir} \
18"
19
diff --git a/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
new file mode 100644
index 0000000000..da5841a132
--- /dev/null
+++ b/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
@@ -0,0 +1,13 @@
1--- configure.ac.old 2005-06-03 12:53:28.000000000 +0200
2+++ configure.ac 2005-06-03 12:54:29.000000000 +0200
3@@ -25,9 +25,9 @@
4
5 AC_PREREQ([2.57])
6 AC_INIT([spext], [1.0], [lauri.leukkunen@nokia.com], spext)
7+AC_CONFIG_AUX_DIR(.)
8 AM_INIT_AUTOMAKE([dist-bzip2])
9 AM_MAINTAINER_MODE
10-AC_CONFIG_AUX_DIR(.)
11
12 dnl PKG_CHECK_MODULES(FIXESEXT, fixesext)
13
diff --git a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
new file mode 100644
index 0000000000..7cb84ff390
--- /dev/null
+++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
@@ -0,0 +1,21 @@
1LICENSE= "MIT"
2SUMMARY = "X Server Nokia 770 extensions library"
3SECTION = "x11/libs"
4DEPENDS = "virtual/libx11 libxext"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=db043791349ba57ad1169e1c92477cb6"
7
8SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${PN}/${PN}_${PV}.tar.gz \
9 file://auxdir.patch;striplevel=0"
10S = "${WORKDIR}/xpext-1.0"
11
12inherit autotools pkgconfig
13
14do_configure_prepend () {
15 cd ${S}
16 chmod +x ./autogen.sh
17 ./autogen.sh
18}
19
20SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896"
21SRC_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
new file mode 100644
index 0000000000..18bc67cdd9
--- /dev/null
+++ b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
@@ -0,0 +1,10 @@
1--- Xsp/xsp.pc.in~ 2009-01-07 13:06:07.000000000 +0100
2+++ Xsp/xsp.pc.in 2009-01-07 13:06:07.000000000 +0100
3@@ -6,5 +6,5 @@
4 Name: Xsp
5 Description: X Sputnik Library
6 Version: @PACKAGE_VERSION@
7-Cflags: -I${includedir} @XSP_CFLAGS@ @X_CFLAGS@
8-Libs: -L${libdir} -lXsp @XSP_LIBS@ @X_LIBS@
9+Cflags: -I${includedir}
10+Libs: -L${libdir} -lXsp -lX11
diff --git a/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
new file mode 100644
index 0000000000..22d92ca7d8
--- /dev/null
+++ b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
@@ -0,0 +1,13 @@
1LICENSE= "MIT"
2SUMMARY = "X Server Nokia 770 extensions library"
3SECTION = "x11/libs"
4DEPENDS = "virtual/libx11 libxext xpext"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ea2bda168c508c7cd8afa567b2fcc549"
6SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz \
7 file://xsp-fix-pc.patch"
8S = "${WORKDIR}/Xsp"
9
10inherit autotools pkgconfig
11
12SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5"
13SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59"