diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-multimedia | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
53 files changed, 2426 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 000000000..a053e4c60 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Index: 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 | } | ||
27 | Index: 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 000000000..8966dbbc1 --- /dev/null +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Alsa OSS Compatibility Package" | ||
2 | SECTION = "libs/multimedia" | ||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | DEPENDS = "alsa-lib" | ||
6 | PR = "r1" | ||
7 | |||
8 | SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ | ||
9 | file://libio.patch \ | ||
10 | " | ||
11 | |||
12 | inherit autotools | ||
13 | |||
14 | LEAD_SONAME = "libaoss.so.0" | ||
15 | |||
16 | do_configure_prepend () { | ||
17 | touch NEWS README AUTHORS ChangeLog | ||
18 | sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in | ||
19 | } | ||
20 | |||
21 | SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" | ||
22 | SRC_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 000000000..61886599a --- /dev/null +++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | DESCRIPTION = "The Audio File Library provides a uniform and elegant \ | ||
2 | API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ | ||
3 | WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ | ||
4 | Research, Amiga IFF/8SVX, and NIST SPHERE." | ||
5 | HOMEPAGE = "http://www.68k.org/~michael/audiofile/" | ||
6 | SECTION = "libs" | ||
7 | LICENSE = "LGPLv2 & GPLv2" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
9 | file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
10 | |||
11 | SRC_URI = "${GNOME_MIRROR}/audiofile/0.2/${BP}.tar.gz" | ||
12 | SRC_URI[md5sum] = "a39be317a7b1971b408805dc5e371862" | ||
13 | SRC_URI[sha256sum] = "a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2" | ||
14 | |||
15 | inherit 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 000000000..8fdc35ad5 --- /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 000000000..719f5d09d --- /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 000000000..fc69f1a03 --- /dev/null +++ b/meta-oe/recipes-multimedia/esound/esound/no-docs.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | Index: 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 000000000..035358d54 --- /dev/null +++ b/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Enlightened Sound Daemon" | ||
2 | SECTION = "gpe/base" | ||
3 | LICENSE = "LGPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
5 | DEPENDS = "audiofile" | ||
6 | |||
7 | inherit gnome binconfig | ||
8 | |||
9 | PR = "r1" | ||
10 | |||
11 | SRC_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 | |||
16 | SRC_URI[archive.md5sum] = "3facb5aa0115cc1c31771b9ad454ae76" | ||
17 | SRC_URI[archive.sha256sum] = "68bf399fcbd45c5e9ba99cd13a3a479e4ef2bc5dc52e540ffa00aef1e1b19a76" | ||
18 | |||
19 | EXTRA_OECONF = " \ | ||
20 | --disable-alsa \ | ||
21 | --disable-arts \ | ||
22 | --disable-artstest \ | ||
23 | " | ||
24 | do_configure_prepend() { | ||
25 | sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' ${S}/configure.ac | ||
26 | } | ||
27 | |||
28 | PACKAGES =+ "esddsp esd esd-utils" | ||
29 | |||
30 | FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" | ||
31 | FILES_esd = "${bindir}/esd" | ||
32 | FILES_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 000000000..63e590c9e --- /dev/null +++ b/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Library for reading some sort of media format" | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "GPLv2" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | inherit autotools | ||
10 | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/faac/faad2-src/faad2-${PV}/${BP}.tar.bz2;name=faad2 \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[faad2.md5sum] = "4c332fa23febc0e4648064685a3d4332" | ||
15 | SRC_URI[faad2.sha256sum] = "14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5" | ||
16 | |||
17 | PACKAGES =+ "libfaad libfaad-dev libmp4ff libmp4ff-dev" | ||
18 | |||
19 | FILES_${PN} = "${bindir}/faad" | ||
20 | |||
21 | FILES_libfaad = "${libdir}/libfaad.so.*" | ||
22 | FILES_libfaad-dev = "${libdir}/libfaad.so ${libdir}/libfaad.la ${includedir}/faad.h" | ||
23 | FILES_libfaad-staticdev = "${libdir}/libfaad.a" | ||
24 | |||
25 | FILES_libmp4ff = "${libdir}/libmp4ff.so.*" | ||
26 | FILES_libmp4ff-dev = "${libdir}/libmp4ff.so ${libdir}/libmp4ff.la ${includedir}/mp4ff.h" | ||
27 | FILES_libmp4ff-staticdev = "${libdir}/libmp4ff.a" | ||
28 | |||
diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch new file mode 100644 index 000000000..09edecc96 --- /dev/null +++ b/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Add a description to the AC_DEFINE statements so that it appears in config.h and silences a fatal warning. | ||
2 | |||
3 | Upstream-Status:Pending | ||
4 | Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> | ||
5 | --- | ||
6 | configure.in | 6 +++--- | ||
7 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
8 | |||
9 | diff --git a/configure.in b/configure.in | ||
10 | index abfe4cd..ce0d380 100644 | ||
11 | --- a/configure.in | ||
12 | +++ b/configure.in | ||
13 | @@ -168,7 +168,7 @@ if test $has_iconv = 1; then | ||
14 | iconv_oldstyle=1, iconv_oldstyle=0) | ||
15 | if test $iconv_oldstyle = 1; then | ||
16 | AC_MSG_RESULT(const char **) | ||
17 | - AC_DEFINE(ID3LIB_ICONV_OLDSTYLE) | ||
18 | + AC_DEFINE(ID3LIB_ICONV_OLDSTYLE,[1],[Old iconv prototype definition in iconv.h]) | ||
19 | #we'll check out the need of | ||
20 | #typecast in the call of iconv_open | ||
21 | AC_MSG_CHECKING(whether to typecast in iconv) | ||
22 | @@ -184,7 +184,7 @@ if test $has_iconv = 1; then | ||
23 | iconv_cast=0, iconv_cast=1) | ||
24 | if test $iconv_cast = 1; then | ||
25 | AC_MSG_RESULT(yes) | ||
26 | - AC_DEFINE(ID3LIB_ICONV_CAST_OK) | ||
27 | + AC_DEFINE(ID3LIB_ICONV_CAST_OK,[1],[Accepting const char ** in iconv prototype]) | ||
28 | else | ||
29 | AC_MSG_RESULT(no) | ||
30 | fi | ||
31 | @@ -206,7 +206,7 @@ if test $has_iconv = 1; then | ||
32 | iconv_cast=0, iconv_cast=1) | ||
33 | if test $iconv_cast = 1; then | ||
34 | AC_MSG_RESULT(yes) | ||
35 | - AC_DEFINE(ID3LIB_ICONV_CAST_OK) | ||
36 | + AC_DEFINE(ID3LIB_ICONV_CAST_OK,[1],[Accepting const char ** in iconv prototype]) | ||
37 | else | ||
38 | AC_MSG_RESULT(no) | ||
39 | fi | ||
40 | -- | ||
41 | 2.0.0 | ||
42 | |||
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 000000000..fc80cc0ac --- /dev/null +++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Library for interacting with ID3 tags" | ||
2 | SECTION = "libs/multimedia" | ||
3 | LICENSE = "LGPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
5 | DEPENDS = "zlib" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | SRC_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 | file://acdefine.patch \ | ||
12 | " | ||
13 | SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7" | ||
14 | SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079" | ||
15 | SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b" | ||
16 | SRC_URI[patch.sha256sum] = "9f03b59ccc8826a5be55a3dcde2f889067d58bdc72bf846416a198c9b933704c" | ||
17 | |||
18 | inherit 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 000000000..77337ff6c --- /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 000000000..b41c98f2a --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack/remove-wrong-host-test.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From be5f1439a1f36c0bc714411d20186045bd3e9539 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 12 Jul 2011 12:48:14 +0200 | ||
4 | Subject: [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 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index 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 | -- | ||
67 | 1.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 000000000..7b3392721 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | DESCRIPTION = "JACK is a low-latency audio server. It can \ | ||
2 | connect a number of different applications to an audio \ | ||
3 | device, as well as allowing them to share audio between \ | ||
4 | themselves." | ||
5 | SECTION = "libs/multimedia" | ||
6 | |||
7 | LICENSE = "GPLv2 & LGPLv2.1" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \ | ||
9 | file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
10 | file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \ | ||
11 | " | ||
12 | |||
13 | DEPENDS = "alsa-lib libsamplerate0 readline" | ||
14 | |||
15 | SRCREV = "91a688c602b7ce1711d8ad10fb07ebcf2e530a64" | ||
16 | SRC_URI = "git://github.com/jackaudio/jack1.git \ | ||
17 | file://remove-wrong-host-test.patch \ | ||
18 | file://jack_fix_TWL4030_alsa_capture.patch \ | ||
19 | " | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | inherit autotools pkgconfig | ||
24 | |||
25 | EXTRA_OECONF = "--enable-timestamps \ | ||
26 | --disable-capabilities \ | ||
27 | --disable-oldtrans \ | ||
28 | --disable-portaudio \ | ||
29 | --disable-coreaudio \ | ||
30 | --disable-oss \ | ||
31 | --enable-alsa" | ||
32 | |||
33 | EXTRA_OEMAKE = 'transform="s,^,,"' | ||
34 | |||
35 | PACKAGES =+ "libjack jack-server jack-utils" | ||
36 | |||
37 | FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so" | ||
38 | FILES_jack-server = "${bindir}/jackd" | ||
39 | FILES_jack-utils = "${bindir}/*" | ||
40 | FILES_${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 000000000..328cd145c --- /dev/null +++ b/meta-oe/recipes-multimedia/libass/libass.inc | |||
@@ -0,0 +1,28 @@ | |||
1 | DESCRIPTION = "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format. It is mostly compatible with VSFilter." | ||
2 | HOMEPAGE = "http://code.google.com/p/libass/" | ||
3 | SECTION = "libs/multimedia" | ||
4 | |||
5 | LICENSE = "ISC" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ae98663bac55afe5d989919d296f28a" | ||
7 | |||
8 | DEPENDS = "enca fontconfig freetype libpng fribidi" | ||
9 | |||
10 | INC_PR = "r1" | ||
11 | |||
12 | SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
16 | PACKAGECONFIG ??= "" | ||
17 | PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz" | ||
18 | |||
19 | EXTRA_OECONF = " \ | ||
20 | --enable-enca \ | ||
21 | --enable-fontconfig \ | ||
22 | " | ||
23 | |||
24 | PACKAGES =+ "${PN}-tests" | ||
25 | |||
26 | FILES_${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 000000000..0b3227692 --- /dev/null +++ b/meta-oe/recipes-multimedia/libass/libass_0.10.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require ${PN}.inc | ||
2 | PR = "${INC_PR}.0" | ||
3 | |||
4 | SRC_URI[md5sum] = "6cace482a013a3c4bf3b31a68ac66026" | ||
5 | SRC_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 000000000..8cf393dca --- /dev/null +++ b/meta-oe/recipes-multimedia/libcdio/libcdio_0.82.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | ESCRIPTION = "The GNU Compact Disc Input and Control library (libcdio) contains a library for CD-ROM and CD image access." | ||
2 | HOMEPAGE = "http://www.gnu.org/software/libcdio/" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | LICENSE = "GPLv3+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
7 | |||
8 | DEPENDS = "ncurses" | ||
9 | |||
10 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" | ||
11 | SRC_URI[md5sum] = "1c29b18e01ab2b966162bc727bf3c360" | ||
12 | SRC_URI[sha256sum] = "1acb3de8e0927906ade7a34c5853173d3068b87b02dfba80d0bf11e47f0b5d39" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
16 | EXTRA_OECONF = "ac_cv_member_struct_tm_tm_gmtoff=no --disable-rpath" | ||
17 | DEBUG_OPTIMIZATION_thumb = "-Os -fno-omit-frame-pointer -g" | ||
18 | |||
19 | PACKAGES += "${PN}-utils" | ||
20 | |||
21 | FILES_${PN} = "${libdir}/${PN}${SOLIB}" | ||
22 | FILES_${PN}-utils = "${bindir}/*" | ||
23 | |||
24 | python 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 000000000..4895dd2e5 --- /dev/null +++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_4.2.0.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "DVD access multimeda library" | ||
2 | SECTION = "libs/multimedia" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" | ||
5 | SRC_URI = "http://dvdnav.mplayerhq.hu/releases/libdvdread-${PV}.tar.bz2" | ||
6 | |||
7 | SRC_URI[md5sum] = "ab7a19d3ab1a437ae754ef477d6231a4" | ||
8 | SRC_URI[sha256sum] = "0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097" | ||
9 | |||
10 | inherit autotools lib_package binconfig pkgconfig | ||
11 | |||
12 | CONFIGUREOPTS_remove = "--disable-silent-rules" | ||
13 | |||
14 | do_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 000000000..9e2d98b65 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmms/libmms_0.6.2.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "MMS stream protocol library" | ||
2 | HOMEPAGE = "http://sourceforge.net/projects/libmms/" | ||
3 | SECTION = "libs/multimedia" | ||
4 | |||
5 | LICENSE = "LGPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" | ||
7 | |||
8 | DEPENDS = "glib-2.0" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libmms/libmms/${PV}/${BPN}-${PV}.tar.gz" | ||
11 | SRC_URI[md5sum] = "9f63aa363deb4874e072a45850161bff" | ||
12 | SRC_URI[sha256sum] = "01931b62172d7d7050fc9ef9b1b64162f3b6e9f6cc4415170192a32a0b7ea432" | ||
13 | |||
14 | inherit 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 000000000..2361875c9 --- /dev/null +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Library for reading mod-like audio files" | ||
2 | HOMEPAGE = "http://modplug-xmms.sf.net" | ||
3 | |||
4 | LICENSE = "PD" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c9182faa1f7c316f7b97d404bcbe3685" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" | ||
8 | SRC_URI[md5sum] = "d2d9ccd8da22412999caed076140f786" | ||
9 | SRC_URI[sha256sum] = "3cfdebb60833a082e2f2b8faa3892bc9201d05c64051503e8007d8c98ae9e4c2" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
13 | EXTRA_OECONF = "--disable-option-checking" | ||
14 | |||
15 | # NOTE: autotools_stage_all does nothing here, we need to do it manually | ||
16 | do_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 000000000..8464664d8 --- /dev/null +++ b/meta-oe/recipes-multimedia/libopus/libopus-fpu.inc | |||
@@ -0,0 +1,6 @@ | |||
1 | |||
2 | def 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 000000000..15782a023 --- /dev/null +++ b/meta-oe/recipes-multimedia/libopus/libopus_1.1.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Opus Audio Codec" | ||
2 | DESCRIPTION = "The Opus codec is designed for interactive \ | ||
3 | speech and audio transmission over the Internet. It is \ | ||
4 | designed by the IETF Codec Working Group and incorporates \ | ||
5 | technology from Skype's SILK codec and Xiph.Org's CELT codec." | ||
6 | HOMEPAGE = "http://www.opus-codec.org/" | ||
7 | SECTION = "libs/multimedia" | ||
8 | LICENSE = "BSD" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3" | ||
10 | |||
11 | SRC_URI = "http://downloads.xiph.org/releases/opus/opus-${PV}.tar.gz" | ||
12 | SRC_URI[md5sum] = "c5a8cf7c0b066759542bc4ca46817ac6" | ||
13 | SRC_URI[sha256sum] = "b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95" | ||
14 | |||
15 | S = "${WORKDIR}/opus-${PV}" | ||
16 | |||
17 | inherit autotools pkgconfig | ||
18 | |||
19 | require libopus-fpu.inc | ||
20 | EXTRA_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 000000000..811175ce8 --- /dev/null +++ b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb | |||
@@ -0,0 +1,43 @@ | |||
1 | SUMMARY = "FFmpeg derived postprocessing library" | ||
2 | HOMEPAGE = "http://git.videolan.org/?p=libpostproc.git;a=summary" | ||
3 | SECTION = "libs" | ||
4 | DEPENDS = "libav" | ||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
7 | |||
8 | PV = "52.3.0+git${SRCPV}" | ||
9 | |||
10 | SRCREV = "811db3b957dfde24aef2d0f82e297e5bf552d873" | ||
11 | SRC_URI = "git://github.com/lu-zero/postproc;protocol=https" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit autotools lib_package pkgconfig | ||
16 | |||
17 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" | ||
18 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | ||
19 | |||
20 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | ||
21 | EXTRA_FFCONF ?= "" | ||
22 | |||
23 | EXTRA_OECONF = " \ | ||
24 | --enable-shared \ | ||
25 | --enable-pthreads \ | ||
26 | --enable-gpl \ | ||
27 | --enable-postproc \ | ||
28 | \ | ||
29 | --cross-prefix=${TARGET_PREFIX} \ | ||
30 | --prefix=${prefix} \ | ||
31 | \ | ||
32 | --arch=${TARGET_ARCH} \ | ||
33 | --target-os="linux" \ | ||
34 | --enable-cross-compile \ | ||
35 | --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ | ||
36 | --extra-ldflags="${TARGET_LDFLAGS}" \ | ||
37 | --sysroot="${STAGING_DIR_TARGET}" \ | ||
38 | ${EXTRA_FFCONF} \ | ||
39 | " | ||
40 | |||
41 | do_configure() { | ||
42 | ${S}/configure ${EXTRA_OECONF} | ||
43 | } | ||
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch new file mode 100644 index 000000000..5299d378e --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Index: SDL_image-1.2.12/configure.in | ||
2 | =================================================================== | ||
3 | --- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 | ||
4 | +++ SDL_image-1.2.12/configure.in 2014-07-18 06:56:56.853466678 +0000 | ||
5 | @@ -1,5 +1,4 @@ | ||
6 | dnl Process this file with autoconf to produce a configure script. | ||
7 | -AC_INIT(README) | ||
8 | |||
9 | dnl Set various version strings - taken gratefully from the GTk sources | ||
10 | |||
11 | @@ -11,12 +10,19 @@ | ||
12 | # if backwards compatibility has been broken, | ||
13 | # set BINARY_AGE and INTERFACE_AGE to 0. | ||
14 | |||
15 | -MAJOR_VERSION=1 | ||
16 | -MINOR_VERSION=2 | ||
17 | -MICRO_VERSION=12 | ||
18 | +m4_define([sdlimage_major_version],[1]) | ||
19 | +m4_define([sdlimage_minor_version],[2]) | ||
20 | +m4_define([sdlimage_micro_version],[12]) | ||
21 | +m4_define([sdlimage_version], [sdlimage_major_version.sdlimage_minor_version.sdlimage_micro_version]) | ||
22 | + | ||
23 | +AC_INIT([SDL_image], [sdlimage_version]) | ||
24 | + | ||
25 | +MAJOR_VERSION=sdlimage_major_version | ||
26 | +MINOR_VERSION=sdlimage_minor_version | ||
27 | +MICRO_VERSION=sdlimage_micro_version | ||
28 | INTERFACE_AGE=4 | ||
29 | BINARY_AGE=12 | ||
30 | -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION | ||
31 | +VERSION=sdlimage_version | ||
32 | |||
33 | AC_SUBST(MAJOR_VERSION) | ||
34 | AC_SUBST(MINOR_VERSION) | ||
35 | @@ -42,7 +48,7 @@ | ||
36 | AC_CANONICAL_HOST | ||
37 | |||
38 | dnl Setup for automake | ||
39 | -AM_INIT_AUTOMAKE(SDL_image, $VERSION) | ||
40 | +AM_INIT_AUTOMAKE([foreign]) | ||
41 | |||
42 | dnl Check for tools | ||
43 | AC_PROG_LIBTOOL | ||
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 000000000..ea8e9eaa3 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb | |||
@@ -0,0 +1,32 @@ | |||
1 | SUMMARY = "Simple DirectMedia Layer image library" | ||
2 | SECTION = "libs" | ||
3 | |||
4 | LICENSE = "Zlib" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" | ||
6 | |||
7 | DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" | ||
8 | |||
9 | SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ | ||
10 | file://configure.patch" | ||
11 | SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" | ||
12 | SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" | ||
13 | |||
14 | S = "${WORKDIR}/SDL_image-${PV}" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" | ||
19 | |||
20 | # Disable the run-time loading of the libs and bring back the soname dependencies. | ||
21 | EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" | ||
22 | |||
23 | do_configure_prepend() { | ||
24 | # Removing these files fixes a libtool version mismatch. | ||
25 | rm -f ${S}/acinclude/libtool.m4 | ||
26 | rm -f ${S}/acinclude/sdl.m4 | ||
27 | rm -f ${S}/acinclude/pkg.m4 | ||
28 | rm -f ${S}/acinclude/lt~obsolete.m4 | ||
29 | rm -f ${S}/acinclude/ltoptions.m4 | ||
30 | rm -f ${S}/acinclude/ltsugar.m4 | ||
31 | rm -f ${S}/acinclude/ltversion.m4 | ||
32 | } | ||
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 000000000..4c9e8d094 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | diff -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 000000000..f1a01b9d5 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | SUMMARY = "Simple DirectMedia Layer mixer library" | ||
2 | SECTION = "libs" | ||
3 | DEPENDS = "virtual/libsdl flac libmikmod libvorbis" | ||
4 | LICENSE = "Zlib" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" | ||
6 | |||
7 | SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ | ||
8 | file://configure.patch \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" | ||
12 | SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" | ||
13 | |||
14 | S = "${WORKDIR}/SDL_mixer-${PV}" | ||
15 | |||
16 | inherit autotools-brokensep | ||
17 | |||
18 | EXTRA_AUTORECONF += "--include=acinclude" | ||
19 | EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}" | ||
20 | |||
21 | PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad" | ||
22 | |||
23 | do_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 000000000..d1277da8d --- /dev/null +++ b/meta-oe/recipes-multimedia/live555/files/config.linux-cross | |||
@@ -0,0 +1,17 @@ | |||
1 | COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 | ||
2 | C = c | ||
3 | C_COMPILER = $(CC) | ||
4 | C_FLAGS = $(COMPILE_OPTS) | ||
5 | CPP = cpp | ||
6 | CPLUSPLUS_COMPILER = $(CXX) | ||
7 | CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 | ||
8 | OBJ = o | ||
9 | LINK = $(CXX) -o | ||
10 | LINK_OPTS = -L. | ||
11 | CONSOLE_LINK_OPTS = $(LINK_OPTS) | ||
12 | LIBRARY_LINK = $(LD) -o | ||
13 | LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -Bstatic | ||
14 | LIB_SUFFIX = a | ||
15 | LIBS_FOR_CONSOLE_APPLICATION = | ||
16 | LIBS_FOR_GUI_APPLICATION = | ||
17 | EXE = | ||
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc new file mode 100644 index 000000000..0c8208a22 --- /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 | |||
5 | DESCRIPTION = "LIVE555 Streaming Media libraries" | ||
6 | HOMEPAGE = "http://live.com/" | ||
7 | LICENSE = "LGPLv3" | ||
8 | SECTION = "devel" | ||
9 | |||
10 | INC_PR = "r1" | ||
11 | |||
12 | URLV = "${@d.getVar('PV',1)[0:4]}.${@d.getVar('PV',1)[4:6]}.${@d.getVar('PV',1)[6:8]}" | ||
13 | SRC_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 | ||
16 | MIRRORS += "http://www.live555.com/liveMedia/public/ http://distcache.FreeBSD.org/ports-distfiles/ \n" | ||
17 | |||
18 | S = "${WORKDIR}/live" | ||
19 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
20 | |||
21 | do_configure() { | ||
22 | cp ${WORKDIR}/config.linux-cross . | ||
23 | echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross | ||
24 | ./genMakefiles linux-cross | ||
25 | } | ||
26 | |||
27 | do_compile() { | ||
28 | make | ||
29 | } | ||
30 | |||
31 | do_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 | |||
54 | PACKAGES =+ " live555-openrtsp live555-playsip live555-mediaserver" | ||
55 | FILES_${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" | ||
56 | FILES_live555-openrtsp = "${bindir}/openRTSP" | ||
57 | FILES_live555-playsip = "${bindir}/playSIP" | ||
58 | FILES_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 000000000..f83285cff --- /dev/null +++ b/meta-oe/recipes-multimedia/live555/live555_20130430.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require live555.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=68ad62c64cc6c620126241fd429e68fe" | ||
4 | |||
5 | SRC_URI[md5sum] = "95533d91bd196e42fd748076dc244b09" | ||
6 | SRC_URI[sha256sum] = "e549af608c9961d85cb647bc3b99804fec0fbaf5338c1b72d057558ae5cd2aea" | ||
7 | |||
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb new file mode 100644 index 000000000..2e1b9bf05 --- /dev/null +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | DESCRIPTION = "libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm." | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "LGPLv2.1" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | DEPENDS = "alsa-lib texinfo pulseaudio" | ||
7 | |||
8 | SRC_URI = "\ | ||
9 | ${SOURCEFORGE_MIRROR}/project/mikmod/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ | ||
10 | " | ||
11 | SRC_URI[md5sum] = "9dd9bed30c6f7607a55480234606071b" | ||
12 | SRC_URI[sha256sum] = "3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330" | ||
13 | |||
14 | inherit autotools binconfig lib_package | ||
15 | |||
16 | EXTRA_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 000000000..829c3b243 --- /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 | |||
4 | SUMMARY = "Preconfigured mplayer preferences" | ||
5 | |||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | ||
8 | |||
9 | PV = "0.0.1" | ||
10 | PR = "r1" | ||
11 | |||
12 | SRC_URI = "file://mplayer.conf" | ||
13 | |||
14 | # Yes, really /usr/etc!!! | ||
15 | do_install() { | ||
16 | install -d "${D}/usr${sysconfdir}/mplayer" | ||
17 | |||
18 | install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer" | ||
19 | } | ||
20 | |||
21 | FILES_${PN} = "/usr${sysconfdir}/mplayer" | ||
22 | |||
23 | inherit 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 000000000..37ad65fa2 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf | |||
@@ -0,0 +1,15 @@ | |||
1 | |||
2 | # You probably shouldn't touch these | ||
3 | ac=mad, | ||
4 | ao=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 | ||
14 | framedrop=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 000000000..e232595cd --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2/0001-configure-don-t-disable-ASS-support-when-explicitly-.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 3541649b711a773aa2e42ac80d9b4c1b36fce23f Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 27 Mar 2014 00:08:54 +0100 | ||
4 | Subject: [PATCH] configure: don't disable ASS support when explicitly enabled | ||
5 | |||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
7 | --- | ||
8 | configure | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/configure b/configure | ||
12 | index 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 | -- | ||
25 | 1.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 000000000..7c04ff178 --- /dev/null +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | |||
@@ -0,0 +1,145 @@ | |||
1 | SUMMARY = "Open Source multimedia player" | ||
2 | SECTION = "multimedia" | ||
3 | HOMEPAGE = "http://www.mplayerhq.hu/" | ||
4 | DEPENDS = "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 | |||
8 | RDEPENDS_${PN} = "mplayer-common" | ||
9 | PROVIDES = "mplayer" | ||
10 | RPROVIDES_${PN} = "mplayer" | ||
11 | RCONFLICTS_${PN} = "mplayer" | ||
12 | |||
13 | LICENSE = "GPLv3" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | ||
15 | |||
16 | PNBLACKLIST[mplayer2] ?= "Requires newer libav which has negative D_P" | ||
17 | |||
18 | SRC_URI = "git://repo.or.cz/mplayer.git \ | ||
19 | file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ | ||
20 | " | ||
21 | |||
22 | SRCREV = "2c378c71a4d9b1df382db9aa787b646628b4e3f9" | ||
23 | |||
24 | ARM_INSTRUCTION_SET = "arm" | ||
25 | |||
26 | PV = "2.0+gitr${SRCPV}" | ||
27 | PR = "r13" | ||
28 | |||
29 | PARALLEL_MAKE = "" | ||
30 | |||
31 | S = "${WORKDIR}/git" | ||
32 | |||
33 | FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" | ||
34 | CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ | ||
35 | /usr/etc/mplayer/example.conf \ | ||
36 | /usr/etc/mplayer/codecs.conf \ | ||
37 | " | ||
38 | |||
39 | inherit autotools-brokensep pkgconfig | ||
40 | |||
41 | EXTRA_OECONF = " \ | ||
42 | --prefix=/usr \ | ||
43 | --mandir=${mandir} \ | ||
44 | --target=${SIMPLE_TARGET_SYS} \ | ||
45 | \ | ||
46 | --disable-lirc \ | ||
47 | --disable-lircc \ | ||
48 | --disable-joystick \ | ||
49 | --disable-vm \ | ||
50 | --disable-xf86keysym \ | ||
51 | --enable-tv \ | ||
52 | --enable-tv-v4l2 \ | ||
53 | --disable-tv-bsdbt848 \ | ||
54 | --enable-rtc \ | ||
55 | --enable-networking \ | ||
56 | --disable-smb \ | ||
57 | --disable-dvdnav \ | ||
58 | --enable-dvdread \ | ||
59 | --disable-dvdread-internal \ | ||
60 | --disable-libdvdcss-internal \ | ||
61 | --disable-enca \ | ||
62 | --disable-ftp \ | ||
63 | --disable-vstream \ | ||
64 | \ | ||
65 | --disable-gif \ | ||
66 | --enable-png \ | ||
67 | --enable-jpeg \ | ||
68 | --disable-libcdio \ | ||
69 | --disable-qtx \ | ||
70 | --disable-xanim \ | ||
71 | --disable-real \ | ||
72 | --disable-xvid \ | ||
73 | \ | ||
74 | --enable-speex \ | ||
75 | --enable-theora \ | ||
76 | --disable-ladspa \ | ||
77 | --disable-libdv \ | ||
78 | --enable-mad \ | ||
79 | --disable-xmms \ | ||
80 | --disable-musepack \ | ||
81 | \ | ||
82 | --disable-gl \ | ||
83 | --enable-sdl \ | ||
84 | --disable-caca \ | ||
85 | --disable-directx \ | ||
86 | --disable-dvb \ | ||
87 | --enable-xv \ | ||
88 | --disable-vm \ | ||
89 | --disable-xinerama \ | ||
90 | --enable-x11 \ | ||
91 | --disable-directfb \ | ||
92 | --disable-tga \ | ||
93 | --disable-pnm \ | ||
94 | --disable-md5sum \ | ||
95 | \ | ||
96 | --enable-alsa \ | ||
97 | --enable-ossaudio \ | ||
98 | --disable-pulse \ | ||
99 | --disable-jack \ | ||
100 | --disable-openal \ | ||
101 | --enable-select \ | ||
102 | --enable-libass \ | ||
103 | \ | ||
104 | --extra-libs=' -lXext -lX11 -lvorbis -ltheoradec -lasound ' \ | ||
105 | " | ||
106 | # -ltheoradec is missing in: | ||
107 | # libmpcodecs/vd_theora.o: undefined reference to symbol 'theora_decode_init@@libtheora.so.1.0' | ||
108 | |||
109 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | ||
110 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" | ||
111 | |||
112 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | ||
113 | PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" | ||
114 | PACKAGECONFIG[lame] = ",,lame" | ||
115 | |||
116 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" | ||
117 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | ||
118 | |||
119 | CFLAGS_append = " -I${S}/libdvdread4 " | ||
120 | |||
121 | do_configure() { | ||
122 | sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure | ||
123 | sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure | ||
124 | sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure | ||
125 | sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure | ||
126 | sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure | ||
127 | sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile | ||
128 | |||
129 | export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" | ||
130 | ./configure ${EXTRA_OECONF} | ||
131 | |||
132 | } | ||
133 | |||
134 | do_compile () { | ||
135 | oe_runmake | ||
136 | } | ||
137 | |||
138 | do_install() { | ||
139 | oe_runmake 'DESTDIR=${D}' install-no-man | ||
140 | install -d ${D}/usr/etc/mplayer | ||
141 | install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ | ||
142 | install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ | ||
143 | install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ | ||
144 | [ -e ${D}/usr/lib ] && rmdir ${D}/usr/lib | ||
145 | } | ||
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 000000000..96429fd6c --- /dev/null +++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/fix-makefile.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | Fix 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 | |||
7 | Upstream-status: Pending | ||
8 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
9 | |||
10 | Index: 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 000000000..573d88c81 --- /dev/null +++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna/search-for-headers-in-staging-dir.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Search for headers in STAGING_DIR_GOST. | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
5 | |||
6 | Index: 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 000000000..9264bc224 --- /dev/null +++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | DESCRIPTION = "MiniDLNA (aka ReadyDLNA) is server software with the aim of \ | ||
2 | being fully compliant with DLNA/UPnP-AV clients." | ||
3 | LICENSE = "GPL-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENCE;md5=b1a795ac1a06805cf8fd74920bc46b5c" | ||
5 | |||
6 | DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag" | ||
7 | |||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}_${PV}_src.tar.gz \ | ||
9 | file://search-for-headers-in-staging-dir.patch \ | ||
10 | file://fix-makefile.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5" | ||
14 | SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851" | ||
15 | |||
16 | export STAGING_DIR_HOST | ||
17 | |||
18 | inherit 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 000000000..ff6311147 --- /dev/null +++ b/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | SUMMARY = "Opus Audio Tools" | ||
2 | HOMEPAGE = "http://www.opus-codec.org/" | ||
3 | |||
4 | LICENSE = "BSD" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=843a066da9f1facfcc6ea6f616ffecb1" | ||
6 | |||
7 | SRC_URI = "http://downloads.xiph.org/releases/opus/opus-tools-${PV}.tar.gz" | ||
8 | SRC_URI[md5sum] = "b424790eda9357a4df394e2d7ca19eac" | ||
9 | SRC_URI[sha256sum] = "e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6" | ||
10 | |||
11 | S = "${WORKDIR}/opus-tools-${PV}" | ||
12 | |||
13 | DEPENDS = "libopus flac" | ||
14 | |||
15 | inherit 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 000000000..b648351ca --- /dev/null +++ b/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_1.0.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | DESCRIPTION = "PulseAudio Volume Control (pavucontrol) is a simple GTK based volume control tool ("mixer") for the PulseAudio sound server." | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | |||
5 | DEPENDS = "intltool gtkmm libcanberra pulseaudio" | ||
6 | |||
7 | inherit gnome | ||
8 | |||
9 | SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" | ||
10 | SRC_URI[md5sum] = "0ab6b13542af9b4417438527d2524316" | ||
11 | SRC_URI[sha256sum] = "3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde" | ||
12 | |||
13 | EXTRA_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 000000000..ebcfd127f --- /dev/null +++ b/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Freedesktop sound theme" | ||
2 | HOMEPAGE = "http://freedesktop.org/wiki/Specifications/sound-theme-spec" | ||
3 | LICENSE = "GPLv2+ CC-BY-3.0 CC-BY-SA-3.0" | ||
4 | LIC_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 | ||
8 | DEPENDS = "glib-2.0 intltool-native" | ||
9 | |||
10 | inherit autotools gettext | ||
11 | |||
12 | DEPENDS += "glib-2.0-native intltool-native" | ||
13 | |||
14 | SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2" | ||
15 | SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62" | ||
16 | SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14" | ||
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 000000000..86e5364df --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/media-ctl_git.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Media controller control application" | ||
2 | LICENSE = "LGPLv2+" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0" | ||
4 | |||
5 | DEPENDS = "linux-libc-headers" | ||
6 | |||
7 | SRC_URI = "git://git.ideasonboard.org/media-ctl.git" | ||
8 | SRCREV = "a6ec4a37028952ffd6e62eb52648cf66248eb519" | ||
9 | |||
10 | PV = "0.0.1" | ||
11 | PR = "r4" | ||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
16 | EXTRA_OECONF = "--with-kernel-headers=${STAGING_EXECPREFIXDIR}" | ||
17 | |||
18 | PACKAGES =+ "libmediactl libv4l2subdev" | ||
19 | FILES_libmediactl = "${libdir}/libmediactl${SOLIBS}" | ||
20 | FILES_libv4l2subdev = "${libdir}/libv4l2subdev${SOLIBS}" | ||
21 | |||
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.0.1.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.0.1.bb new file mode 100644 index 000000000..c3a13703a --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.0.1.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "v4l2 and IR applications" | ||
2 | LICENSE = "GPLv2 & LGPLv2.1" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ | ||
4 | file://COPYING.libv4l;md5=d749e86a105281d7a44c2328acebc4b0" | ||
5 | |||
6 | DEPENDS = "jpeg \ | ||
7 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" | ||
8 | |||
9 | inherit autotools gettext pkgconfig | ||
10 | |||
11 | # libv4l was absorbed into this, let OE know that | ||
12 | PROVIDES = "libv4l" | ||
13 | |||
14 | SRC_URI = "http://linuxtv.org/downloads/v4l-utils/v4l-utils-${PV}.tar.bz2" | ||
15 | SRC_URI[md5sum] = "b06ea8b15e27cff352b4536e835448bc" | ||
16 | SRC_URI[sha256sum] = "fc0132e82a18dfad9619be3abf50c206e2f449b1c14440cde36f25874fdce7df" | ||
17 | |||
18 | EXTRA_OECONF = "--disable-qv4l2 --enable-shared --with-udevdir=${base_libdir}/udev" | ||
19 | |||
20 | PACKAGES =+ "rc-keymaps libv4l libv4l-dbg libv4l-dev" | ||
21 | |||
22 | FILES_rc-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev/rc*" | ||
23 | FILES_${PN} = "${bindir} ${sbindir} ${base_libdir}/udev/rules.d/70-infrared.rules" | ||
24 | FILES_libv4l += "${libdir}/libv4l*${SOLIBS} ${libdir}/libv4l/*.so ${libdir}/libv4l/plugins/*.so \ | ||
25 | ${libdir}/libv4l/*-decomp" | ||
26 | FILES_libv4l-dbg += "${libdir}/libv4l/.debug ${libdir}/libv4l/plugins/.debug" | ||
27 | FILES_libv4l-dev += "${libdir}/v4l*${SOLIBSDEV} ${libdir}/libv4l/*.la ${libdir}/libv4l/plugins/*.la" | ||
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 000000000..41a5dbf4f --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch | |||
@@ -0,0 +1,961 @@ | |||
1 | From 141d3b3593722eb3d588e7c4b1542f810bc25853 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Thu, 5 Jun 2014 11:29:20 -0500 | ||
4 | Subject: [PATCH] Add stdout mode to allow streaming over the network with nc | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> | ||
8 | --- | ||
9 | yavta.c | 315 ++++++++++++++++++++++++++++++++++----------------------------- | ||
10 | 1 file changed, 169 insertions(+), 146 deletions(-) | ||
11 | |||
12 | diff --git a/yavta.c b/yavta.c | ||
13 | index 32adc26..b398da0 100644 | ||
14 | --- a/yavta.c | ||
15 | +++ b/yavta.c | ||
16 | @@ -309,7 +309,7 @@ static bool video_has_fd(struct device *dev) | ||
17 | static int video_set_fd(struct device *dev, int fd) | ||
18 | { | ||
19 | if (video_has_fd(dev)) { | ||
20 | - printf("Can't set fd (already open).\n"); | ||
21 | + fprintf(stderr, "Can't set fd (already open).\n"); | ||
22 | return -1; | ||
23 | } | ||
24 | |||
25 | @@ -321,18 +321,18 @@ static int video_set_fd(struct device *dev, int fd) | ||
26 | static int video_open(struct device *dev, const char *devname) | ||
27 | { | ||
28 | if (video_has_fd(dev)) { | ||
29 | - printf("Can't open device (already open).\n"); | ||
30 | + fprintf(stderr, "Can't open device (already open).\n"); | ||
31 | return -1; | ||
32 | } | ||
33 | |||
34 | dev->fd = open(devname, O_RDWR); | ||
35 | if (dev->fd < 0) { | ||
36 | - printf("Error opening device %s: %s (%d).\n", devname, | ||
37 | + fprintf(stderr, "Error opening device %s: %s (%d).\n", devname, | ||
38 | strerror(errno), errno); | ||
39 | return dev->fd; | ||
40 | } | ||
41 | |||
42 | - printf("Device %s opened.\n", devname); | ||
43 | + fprintf(stderr, "Device %s opened.\n", devname); | ||
44 | |||
45 | dev->opened = 1; | ||
46 | |||
47 | @@ -352,7 +352,7 @@ static int video_querycap(struct device *dev, unsigned int *capabilities) | ||
48 | *capabilities = cap.capabilities & V4L2_CAP_DEVICE_CAPS | ||
49 | ? cap.device_caps : cap.capabilities; | ||
50 | |||
51 | - printf("Device `%s' on `%s' is a video %s (%s mplanes) device.\n", | ||
52 | + fprintf(stderr, "Device `%s' on `%s' is a video %s (%s mplanes) device.\n", | ||
53 | cap.card, cap.bus_info, | ||
54 | video_is_capture(dev) ? "capture" : "output", | ||
55 | video_is_mplane(dev) ? "with" : "without"); | ||
56 | @@ -370,7 +370,7 @@ static int cap_get_buf_type(unsigned int capabilities) | ||
57 | } else if (capabilities & V4L2_CAP_VIDEO_OUTPUT) { | ||
58 | return V4L2_BUF_TYPE_VIDEO_OUTPUT; | ||
59 | } else { | ||
60 | - printf("Device supports neither capture nor output.\n"); | ||
61 | + fprintf(stderr, "Device supports neither capture nor output.\n"); | ||
62 | return -EINVAL; | ||
63 | } | ||
64 | |||
65 | @@ -440,7 +440,7 @@ static int get_control(struct device *dev, unsigned int id, int type, | ||
66 | } | ||
67 | } | ||
68 | |||
69 | - printf("unable to get control 0x%8.8x: %s (%d).\n", | ||
70 | + fprintf(stderr, "unable to get control 0x%8.8x: %s (%d).\n", | ||
71 | id, strerror(errno), errno); | ||
72 | return -1; | ||
73 | } | ||
74 | @@ -484,12 +484,12 @@ static void set_control(struct device *dev, unsigned int id, int type, | ||
75 | val = old.value; | ||
76 | } | ||
77 | if (ret == -1) { | ||
78 | - printf("unable to set control 0x%8.8x: %s (%d).\n", | ||
79 | + fprintf(stderr, "unable to set control 0x%8.8x: %s (%d).\n", | ||
80 | id, strerror(errno), errno); | ||
81 | return; | ||
82 | } | ||
83 | |||
84 | - printf("Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", | ||
85 | + fprintf(stderr, "Control 0x%08x set to %" PRId64 ", is %" PRId64 "\n", | ||
86 | id, old_val, val); | ||
87 | } | ||
88 | |||
89 | @@ -504,7 +504,7 @@ static int video_get_format(struct device *dev) | ||
90 | |||
91 | ret = ioctl(dev->fd, VIDIOC_G_FMT, &fmt); | ||
92 | if (ret < 0) { | ||
93 | - printf("Unable to get format: %s (%d).\n", strerror(errno), | ||
94 | + fprintf(stderr, "Unable to get format: %s (%d).\n", strerror(errno), | ||
95 | errno); | ||
96 | return ret; | ||
97 | } | ||
98 | @@ -514,7 +514,7 @@ static int video_get_format(struct device *dev) | ||
99 | dev->height = fmt.fmt.pix_mp.height; | ||
100 | dev->num_planes = fmt.fmt.pix_mp.num_planes; | ||
101 | |||
102 | - printf("Video format: %s (%08x) %ux%u field %s, %u planes: \n", | ||
103 | + fprintf(stderr, "Video format: %s (%08x) %ux%u field %s, %u planes: \n", | ||
104 | v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, | ||
105 | fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, | ||
106 | v4l2_field_name(fmt.fmt.pix_mp.field), | ||
107 | @@ -527,7 +527,7 @@ static int video_get_format(struct device *dev) | ||
108 | fmt.fmt.pix_mp.plane_fmt[i].bytesperline ? | ||
109 | fmt.fmt.pix_mp.plane_fmt[i].sizeimage : 0; | ||
110 | |||
111 | - printf(" * Stride %u, buffer size %u\n", | ||
112 | + fprintf(stderr, " * Stride %u, buffer size %u\n", | ||
113 | fmt.fmt.pix_mp.plane_fmt[i].bytesperline, | ||
114 | fmt.fmt.pix_mp.plane_fmt[i].sizeimage); | ||
115 | } | ||
116 | @@ -539,7 +539,7 @@ static int video_get_format(struct device *dev) | ||
117 | dev->plane_fmt[0].bytesperline = fmt.fmt.pix.bytesperline; | ||
118 | dev->plane_fmt[0].sizeimage = fmt.fmt.pix.bytesperline ? fmt.fmt.pix.sizeimage : 0; | ||
119 | |||
120 | - printf("Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", | ||
121 | + fprintf(stderr, "Video format: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", | ||
122 | v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, | ||
123 | fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, | ||
124 | v4l2_field_name(fmt.fmt.pix_mp.field), | ||
125 | @@ -581,25 +581,25 @@ static int video_set_format(struct device *dev, unsigned int w, unsigned int h, | ||
126 | |||
127 | ret = ioctl(dev->fd, VIDIOC_S_FMT, &fmt); | ||
128 | if (ret < 0) { | ||
129 | - printf("Unable to set format: %s (%d).\n", strerror(errno), | ||
130 | + fprintf(stderr, "Unable to set format: %s (%d).\n", strerror(errno), | ||
131 | errno); | ||
132 | return ret; | ||
133 | } | ||
134 | |||
135 | if (video_is_mplane(dev)) { | ||
136 | - printf("Video format set: %s (%08x) %ux%u field %s, %u planes: \n", | ||
137 | + fprintf(stderr, "Video format set: %s (%08x) %ux%u field %s, %u planes: \n", | ||
138 | v4l2_format_name(fmt.fmt.pix_mp.pixelformat), fmt.fmt.pix_mp.pixelformat, | ||
139 | fmt.fmt.pix_mp.width, fmt.fmt.pix_mp.height, | ||
140 | v4l2_field_name(fmt.fmt.pix_mp.field), | ||
141 | fmt.fmt.pix_mp.num_planes); | ||
142 | |||
143 | for (i = 0; i < fmt.fmt.pix_mp.num_planes; i++) { | ||
144 | - printf(" * Stride %u, buffer size %u\n", | ||
145 | + fprintf(stderr, " * Stride %u, buffer size %u\n", | ||
146 | fmt.fmt.pix_mp.plane_fmt[i].bytesperline, | ||
147 | fmt.fmt.pix_mp.plane_fmt[i].sizeimage); | ||
148 | } | ||
149 | } else { | ||
150 | - printf("Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", | ||
151 | + fprintf(stderr, "Video format set: %s (%08x) %ux%u (stride %u) field %s buffer size %u\n", | ||
152 | v4l2_format_name(fmt.fmt.pix.pixelformat), fmt.fmt.pix.pixelformat, | ||
153 | fmt.fmt.pix.width, fmt.fmt.pix.height, fmt.fmt.pix.bytesperline, | ||
154 | v4l2_field_name(fmt.fmt.pix.field), | ||
155 | @@ -619,16 +619,16 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f | ||
156 | |||
157 | ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); | ||
158 | if (ret < 0) { | ||
159 | - printf("Unable to get frame rate: %s (%d).\n", | ||
160 | + fprintf(stderr, "Unable to get frame rate: %s (%d).\n", | ||
161 | strerror(errno), errno); | ||
162 | return ret; | ||
163 | } | ||
164 | |||
165 | - printf("Current frame rate: %u/%u\n", | ||
166 | + fprintf(stderr, "Current frame rate: %u/%u\n", | ||
167 | parm.parm.capture.timeperframe.numerator, | ||
168 | parm.parm.capture.timeperframe.denominator); | ||
169 | |||
170 | - printf("Setting frame rate to: %u/%u\n", | ||
171 | + fprintf(stderr, "Setting frame rate to: %u/%u\n", | ||
172 | time_per_frame->numerator, | ||
173 | time_per_frame->denominator); | ||
174 | |||
175 | @@ -637,19 +637,19 @@ static int video_set_framerate(struct device *dev, struct v4l2_fract *time_per_f | ||
176 | |||
177 | ret = ioctl(dev->fd, VIDIOC_S_PARM, &parm); | ||
178 | if (ret < 0) { | ||
179 | - printf("Unable to set frame rate: %s (%d).\n", strerror(errno), | ||
180 | + fprintf(stderr, "Unable to set frame rate: %s (%d).\n", strerror(errno), | ||
181 | errno); | ||
182 | return ret; | ||
183 | } | ||
184 | |||
185 | ret = ioctl(dev->fd, VIDIOC_G_PARM, &parm); | ||
186 | if (ret < 0) { | ||
187 | - printf("Unable to get frame rate: %s (%d).\n", strerror(errno), | ||
188 | + fprintf(stderr, "Unable to get frame rate: %s (%d).\n", strerror(errno), | ||
189 | errno); | ||
190 | return ret; | ||
191 | } | ||
192 | |||
193 | - printf("Frame rate set: %u/%u\n", | ||
194 | + fprintf(stderr, "Frame rate set: %u/%u\n", | ||
195 | parm.parm.capture.timeperframe.numerator, | ||
196 | parm.parm.capture.timeperframe.denominator); | ||
197 | return 0; | ||
198 | @@ -674,7 +674,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, | ||
199 | buffer->mem[i] = mmap(0, length, PROT_READ | PROT_WRITE, MAP_SHARED, | ||
200 | dev->fd, offset); | ||
201 | if (buffer->mem[i] == MAP_FAILED) { | ||
202 | - printf("Unable to map buffer %u/%u: %s (%d)\n", | ||
203 | + fprintf(stderr, "Unable to map buffer %u/%u: %s (%d)\n", | ||
204 | buffer->idx, i, strerror(errno), errno); | ||
205 | return -1; | ||
206 | } | ||
207 | @@ -682,7 +682,7 @@ static int video_buffer_mmap(struct device *dev, struct buffer *buffer, | ||
208 | buffer->size[i] = length; | ||
209 | buffer->padding[i] = 0; | ||
210 | |||
211 | - printf("Buffer %u/%u mapped at address %p.\n", | ||
212 | + fprintf(stderr, "Buffer %u/%u mapped at address %p.\n", | ||
213 | buffer->idx, i, buffer->mem[i]); | ||
214 | } | ||
215 | |||
216 | @@ -697,7 +697,7 @@ static int video_buffer_munmap(struct device *dev, struct buffer *buffer) | ||
217 | for (i = 0; i < dev->num_planes; i++) { | ||
218 | ret = munmap(buffer->mem[i], buffer->size[i]); | ||
219 | if (ret < 0) { | ||
220 | - printf("Unable to unmap buffer %u/%u: %s (%d)\n", | ||
221 | + fprintf(stderr, "Unable to unmap buffer %u/%u: %s (%d)\n", | ||
222 | buffer->idx, i, strerror(errno), errno); | ||
223 | } | ||
224 | |||
225 | @@ -725,7 +725,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, | ||
226 | ret = posix_memalign(&buffer->mem[i], page_size, | ||
227 | length + offset + padding); | ||
228 | if (ret < 0) { | ||
229 | - printf("Unable to allocate buffer %u/%u (%d)\n", | ||
230 | + fprintf(stderr, "Unable to allocate buffer %u/%u (%d)\n", | ||
231 | buffer->idx, i, ret); | ||
232 | return -ENOMEM; | ||
233 | } | ||
234 | @@ -734,7 +734,7 @@ static int video_buffer_alloc_userptr(struct device *dev, struct buffer *buffer, | ||
235 | buffer->size[i] = length; | ||
236 | buffer->padding[i] = padding; | ||
237 | |||
238 | - printf("Buffer %u/%u allocated at address %p.\n", | ||
239 | + fprintf(stderr, "Buffer %u/%u allocated at address %p.\n", | ||
240 | buffer->idx, i, buffer->mem[i]); | ||
241 | } | ||
242 | |||
243 | @@ -809,12 +809,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, | ||
244 | |||
245 | ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); | ||
246 | if (ret < 0) { | ||
247 | - printf("Unable to request buffers: %s (%d).\n", strerror(errno), | ||
248 | + fprintf(stderr, "Unable to request buffers: %s (%d).\n", strerror(errno), | ||
249 | errno); | ||
250 | return ret; | ||
251 | } | ||
252 | |||
253 | - printf("%u buffers requested.\n", rb.count); | ||
254 | + fprintf(stderr, "%u buffers requested.\n", rb.count); | ||
255 | |||
256 | buffers = malloc(rb.count * sizeof buffers[0]); | ||
257 | if (buffers == NULL) | ||
258 | @@ -835,12 +835,12 @@ static int video_alloc_buffers(struct device *dev, int nbufs, | ||
259 | |||
260 | ret = ioctl(dev->fd, VIDIOC_QUERYBUF, &buf); | ||
261 | if (ret < 0) { | ||
262 | - printf("Unable to query buffer %u: %s (%d).\n", i, | ||
263 | + fprintf(stderr, "Unable to query buffer %u: %s (%d).\n", i, | ||
264 | strerror(errno), errno); | ||
265 | return ret; | ||
266 | } | ||
267 | get_ts_flags(buf.flags, &ts_type, &ts_source); | ||
268 | - printf("length: %u offset: %u timestamp type/source: %s/%s\n", | ||
269 | + fprintf(stderr, "length: %u offset: %u timestamp type/source: %s/%s\n", | ||
270 | buf.length, buf.m.offset, ts_type, ts_source); | ||
271 | |||
272 | buffers[i].idx = i; | ||
273 | @@ -899,12 +899,12 @@ static int video_free_buffers(struct device *dev) | ||
274 | |||
275 | ret = ioctl(dev->fd, VIDIOC_REQBUFS, &rb); | ||
276 | if (ret < 0) { | ||
277 | - printf("Unable to release buffers: %s (%d).\n", | ||
278 | + fprintf(stderr, "Unable to release buffers: %s (%d).\n", | ||
279 | strerror(errno), errno); | ||
280 | return ret; | ||
281 | } | ||
282 | |||
283 | - printf("%u buffers released.\n", dev->nbufs); | ||
284 | + fprintf(stderr, "%u buffers released.\n", dev->nbufs); | ||
285 | |||
286 | free(dev->buffers); | ||
287 | dev->nbufs = 0; | ||
288 | @@ -974,7 +974,7 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo | ||
289 | |||
290 | ret = ioctl(dev->fd, VIDIOC_QBUF, &buf); | ||
291 | if (ret < 0) | ||
292 | - printf("Unable to queue buffer: %s (%d).\n", | ||
293 | + fprintf(stderr, "Unable to queue buffer: %s (%d).\n", | ||
294 | strerror(errno), errno); | ||
295 | |||
296 | return ret; | ||
297 | @@ -987,7 +987,7 @@ static int video_enable(struct device *dev, int enable) | ||
298 | |||
299 | ret = ioctl(dev->fd, enable ? VIDIOC_STREAMON : VIDIOC_STREAMOFF, &type); | ||
300 | if (ret < 0) { | ||
301 | - printf("Unable to %s streaming: %s (%d).\n", | ||
302 | + fprintf(stderr, "Unable to %s streaming: %s (%d).\n", | ||
303 | enable ? "start" : "stop", strerror(errno), errno); | ||
304 | return ret; | ||
305 | } | ||
306 | @@ -1009,10 +1009,10 @@ static void video_query_menu(struct device *dev, struct v4l2_queryctrl *query, | ||
307 | continue; | ||
308 | |||
309 | if (query->type == V4L2_CTRL_TYPE_MENU) | ||
310 | - printf(" %u: %.32s%s\n", menu.index, menu.name, | ||
311 | + fprintf(stderr, " %u: %.32s%s\n", menu.index, menu.name, | ||
312 | menu.index == value ? " (*)" : ""); | ||
313 | else | ||
314 | - printf(" %u: %lld%s\n", menu.index, menu.value, | ||
315 | + fprintf(stderr, " %u: %lld%s\n", menu.index, menu.value, | ||
316 | menu.index == value ? " (*)" : ""); | ||
317 | }; | ||
318 | } | ||
319 | @@ -1043,7 +1043,7 @@ static void video_list_controls(struct device *dev) | ||
320 | continue; | ||
321 | |||
322 | if (query.type == V4L2_CTRL_TYPE_CTRL_CLASS) { | ||
323 | - printf("--- %s (class 0x%08x) ---\n", query.name, query.id); | ||
324 | + fprintf(stderr, "--- %s (class 0x%08x) ---\n", query.name, query.id); | ||
325 | continue; | ||
326 | } | ||
327 | |||
328 | @@ -1053,7 +1053,7 @@ static void video_list_controls(struct device *dev) | ||
329 | else | ||
330 | sprintf(value, "%" PRId64, val64); | ||
331 | |||
332 | - printf("control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", | ||
333 | + fprintf(stderr, "control 0x%08x `%s' min %d max %d step %d default %d current %s.\n", | ||
334 | query.id, query.name, query.minimum, query.maximum, | ||
335 | query.step, query.default_value, value); | ||
336 | |||
337 | @@ -1065,9 +1065,9 @@ static void video_list_controls(struct device *dev) | ||
338 | } | ||
339 | |||
340 | if (nctrls) | ||
341 | - printf("%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); | ||
342 | + fprintf(stderr, "%u control%s found.\n", nctrls, nctrls > 1 ? "s" : ""); | ||
343 | else | ||
344 | - printf("No control found.\n"); | ||
345 | + fprintf(stderr, "No control found.\n"); | ||
346 | } | ||
347 | |||
348 | static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, | ||
349 | @@ -1088,30 +1088,30 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, | ||
350 | break; | ||
351 | |||
352 | if (i != ival.index) | ||
353 | - printf("Warning: driver returned wrong ival index " | ||
354 | + fprintf(stderr, "Warning: driver returned wrong ival index " | ||
355 | "%u.\n", ival.index); | ||
356 | if (pixelformat != ival.pixel_format) | ||
357 | - printf("Warning: driver returned wrong ival pixel " | ||
358 | + fprintf(stderr, "Warning: driver returned wrong ival pixel " | ||
359 | "format %08x.\n", ival.pixel_format); | ||
360 | if (width != ival.width) | ||
361 | - printf("Warning: driver returned wrong ival width " | ||
362 | + fprintf(stderr, "Warning: driver returned wrong ival width " | ||
363 | "%u.\n", ival.width); | ||
364 | if (height != ival.height) | ||
365 | - printf("Warning: driver returned wrong ival height " | ||
366 | + fprintf(stderr, "Warning: driver returned wrong ival height " | ||
367 | "%u.\n", ival.height); | ||
368 | |||
369 | if (i != 0) | ||
370 | - printf(", "); | ||
371 | + fprintf(stderr, ", "); | ||
372 | |||
373 | switch (ival.type) { | ||
374 | case V4L2_FRMIVAL_TYPE_DISCRETE: | ||
375 | - printf("%u/%u", | ||
376 | + fprintf(stderr, "%u/%u", | ||
377 | ival.discrete.numerator, | ||
378 | ival.discrete.denominator); | ||
379 | break; | ||
380 | |||
381 | case V4L2_FRMIVAL_TYPE_CONTINUOUS: | ||
382 | - printf("%u/%u - %u/%u", | ||
383 | + fprintf(stderr, "%u/%u - %u/%u", | ||
384 | ival.stepwise.min.numerator, | ||
385 | ival.stepwise.min.denominator, | ||
386 | ival.stepwise.max.numerator, | ||
387 | @@ -1119,7 +1119,7 @@ static void video_enum_frame_intervals(struct device *dev, __u32 pixelformat, | ||
388 | return; | ||
389 | |||
390 | case V4L2_FRMIVAL_TYPE_STEPWISE: | ||
391 | - printf("%u/%u - %u/%u (by %u/%u)", | ||
392 | + fprintf(stderr, "%u/%u - %u/%u (by %u/%u)", | ||
393 | ival.stepwise.min.numerator, | ||
394 | ival.stepwise.min.denominator, | ||
395 | ival.stepwise.max.numerator, | ||
396 | @@ -1149,23 +1149,23 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) | ||
397 | break; | ||
398 | |||
399 | if (i != frame.index) | ||
400 | - printf("Warning: driver returned wrong frame index " | ||
401 | + fprintf(stderr, "Warning: driver returned wrong frame index " | ||
402 | "%u.\n", frame.index); | ||
403 | if (pixelformat != frame.pixel_format) | ||
404 | - printf("Warning: driver returned wrong frame pixel " | ||
405 | + fprintf(stderr, "Warning: driver returned wrong frame pixel " | ||
406 | "format %08x.\n", frame.pixel_format); | ||
407 | |||
408 | switch (frame.type) { | ||
409 | case V4L2_FRMSIZE_TYPE_DISCRETE: | ||
410 | - printf("\tFrame size: %ux%u (", frame.discrete.width, | ||
411 | + fprintf(stderr, "\tFrame size: %ux%u (", frame.discrete.width, | ||
412 | frame.discrete.height); | ||
413 | video_enum_frame_intervals(dev, frame.pixel_format, | ||
414 | frame.discrete.width, frame.discrete.height); | ||
415 | - printf(")\n"); | ||
416 | + fprintf(stderr, ")\n"); | ||
417 | break; | ||
418 | |||
419 | case V4L2_FRMSIZE_TYPE_CONTINUOUS: | ||
420 | - printf("\tFrame size: %ux%u - %ux%u (", | ||
421 | + fprintf(stderr, "\tFrame size: %ux%u - %ux%u (", | ||
422 | frame.stepwise.min_width, | ||
423 | frame.stepwise.min_height, | ||
424 | frame.stepwise.max_width, | ||
425 | @@ -1173,11 +1173,11 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) | ||
426 | video_enum_frame_intervals(dev, frame.pixel_format, | ||
427 | frame.stepwise.max_width, | ||
428 | frame.stepwise.max_height); | ||
429 | - printf(")\n"); | ||
430 | + fprintf(stderr, ")\n"); | ||
431 | break; | ||
432 | |||
433 | case V4L2_FRMSIZE_TYPE_STEPWISE: | ||
434 | - printf("\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", | ||
435 | + fprintf(stderr, "\tFrame size: %ux%u - %ux%u (by %ux%u) (\n", | ||
436 | frame.stepwise.min_width, | ||
437 | frame.stepwise.min_height, | ||
438 | frame.stepwise.max_width, | ||
439 | @@ -1187,7 +1187,7 @@ static void video_enum_frame_sizes(struct device *dev, __u32 pixelformat) | ||
440 | video_enum_frame_intervals(dev, frame.pixel_format, | ||
441 | frame.stepwise.max_width, | ||
442 | frame.stepwise.max_height); | ||
443 | - printf(")\n"); | ||
444 | + fprintf(stderr, ")\n"); | ||
445 | break; | ||
446 | |||
447 | default: | ||
448 | @@ -1211,19 +1211,19 @@ static void video_enum_formats(struct device *dev, enum v4l2_buf_type type) | ||
449 | break; | ||
450 | |||
451 | if (i != fmt.index) | ||
452 | - printf("Warning: driver returned wrong format index " | ||
453 | + fprintf(stderr, "Warning: driver returned wrong format index " | ||
454 | "%u.\n", fmt.index); | ||
455 | if (type != fmt.type) | ||
456 | - printf("Warning: driver returned wrong format type " | ||
457 | + fprintf(stderr, "Warning: driver returned wrong format type " | ||
458 | "%u.\n", fmt.type); | ||
459 | |||
460 | - printf("\tFormat %u: %s (%08x)\n", i, | ||
461 | + fprintf(stderr, "\tFormat %u: %s (%08x)\n", i, | ||
462 | v4l2_format_name(fmt.pixelformat), fmt.pixelformat); | ||
463 | - printf("\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), | ||
464 | + fprintf(stderr, "\tType: %s (%u)\n", v4l2_buf_type_name(fmt.type), | ||
465 | fmt.type); | ||
466 | - printf("\tName: %.32s\n", fmt.description); | ||
467 | + fprintf(stderr, "\tName: %.32s\n", fmt.description); | ||
468 | video_enum_frame_sizes(dev, fmt.pixelformat); | ||
469 | - printf("\n"); | ||
470 | + fprintf(stderr, "\n"); | ||
471 | } | ||
472 | } | ||
473 | |||
474 | @@ -1241,13 +1241,13 @@ static void video_enum_inputs(struct device *dev) | ||
475 | break; | ||
476 | |||
477 | if (i != input.index) | ||
478 | - printf("Warning: driver returned wrong input index " | ||
479 | + fprintf(stderr, "Warning: driver returned wrong input index " | ||
480 | "%u.\n", input.index); | ||
481 | |||
482 | - printf("\tInput %u: %s.\n", i, input.name); | ||
483 | + fprintf(stderr, "\tInput %u: %s.\n", i, input.name); | ||
484 | } | ||
485 | |||
486 | - printf("\n"); | ||
487 | + fprintf(stderr, "\n"); | ||
488 | } | ||
489 | |||
490 | static int video_get_input(struct device *dev) | ||
491 | @@ -1257,7 +1257,7 @@ static int video_get_input(struct device *dev) | ||
492 | |||
493 | ret = ioctl(dev->fd, VIDIOC_G_INPUT, &input); | ||
494 | if (ret < 0) { | ||
495 | - printf("Unable to get current input: %s (%d).\n", | ||
496 | + fprintf(stderr, "Unable to get current input: %s (%d).\n", | ||
497 | strerror(errno), errno); | ||
498 | return ret; | ||
499 | } | ||
500 | @@ -1272,7 +1272,7 @@ static int video_set_input(struct device *dev, unsigned int input) | ||
501 | |||
502 | ret = ioctl(dev->fd, VIDIOC_S_INPUT, &_input); | ||
503 | if (ret < 0) | ||
504 | - printf("Unable to select input %u: %s (%d).\n", input, | ||
505 | + fprintf(stderr, "Unable to select input %u: %s (%d).\n", input, | ||
506 | strerror(errno), errno); | ||
507 | |||
508 | return ret; | ||
509 | @@ -1291,14 +1291,14 @@ static int video_set_quality(struct device *dev, unsigned int quality) | ||
510 | |||
511 | ret = ioctl(dev->fd, VIDIOC_S_JPEGCOMP, &jpeg); | ||
512 | if (ret < 0) { | ||
513 | - printf("Unable to set quality to %u: %s (%d).\n", quality, | ||
514 | + fprintf(stderr, "Unable to set quality to %u: %s (%d).\n", quality, | ||
515 | strerror(errno), errno); | ||
516 | return ret; | ||
517 | } | ||
518 | |||
519 | ret = ioctl(dev->fd, VIDIOC_G_JPEGCOMP, &jpeg); | ||
520 | if (ret >= 0) | ||
521 | - printf("Quality set to %u\n", jpeg.quality); | ||
522 | + fprintf(stderr, "Quality set to %u\n", jpeg.quality); | ||
523 | |||
524 | return 0; | ||
525 | } | ||
526 | @@ -1313,7 +1313,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) | ||
527 | if (filename != NULL) { | ||
528 | fd = open(filename, O_RDONLY); | ||
529 | if (fd == -1) { | ||
530 | - printf("Unable to open test pattern file '%s': %s (%d).\n", | ||
531 | + fprintf(stderr, "Unable to open test pattern file '%s': %s (%d).\n", | ||
532 | filename, strerror(errno), errno); | ||
533 | return -errno; | ||
534 | } | ||
535 | @@ -1331,7 +1331,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) | ||
536 | if (filename != NULL) { | ||
537 | ret = read(fd, dev->pattern[plane], size); | ||
538 | if (ret != (int)size && dev->plane_fmt[plane].bytesperline != 0) { | ||
539 | - printf("Test pattern file size %u doesn't match image size %u\n", | ||
540 | + fprintf(stderr, "Test pattern file size %u doesn't match image size %u\n", | ||
541 | ret, size); | ||
542 | ret = -EINVAL; | ||
543 | goto done; | ||
544 | @@ -1341,7 +1341,7 @@ static int video_load_test_pattern(struct device *dev, const char *filename) | ||
545 | unsigned int i; | ||
546 | |||
547 | if (dev->plane_fmt[plane].bytesperline == 0) { | ||
548 | - printf("Compressed format detected for plane %u and no test pattern filename given.\n" | ||
549 | + fprintf(stderr, "Compressed format detected for plane %u and no test pattern filename given.\n" | ||
550 | "The test pattern can't be generated automatically.\n", plane); | ||
551 | ret = -EINVAL; | ||
552 | goto done; | ||
553 | @@ -1410,7 +1410,7 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) | ||
554 | |||
555 | if (dev->plane_fmt[plane].sizeimage && | ||
556 | dev->plane_fmt[plane].sizeimage != length) | ||
557 | - printf("Warning: bytes used %u != image size %u for plane %u\n", | ||
558 | + fprintf(stderr, "Warning: bytes used %u != image size %u for plane %u\n", | ||
559 | length, dev->plane_fmt[plane].sizeimage, plane); | ||
560 | |||
561 | if (buffer->padding[plane] == 0) | ||
562 | @@ -1424,16 +1424,16 @@ static void video_verify_buffer(struct device *dev, struct v4l2_buffer *buf) | ||
563 | } | ||
564 | |||
565 | if (errors) { | ||
566 | - printf("Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", | ||
567 | + fprintf(stderr, "Warning: %u bytes overwritten among %u first padding bytes for plane %u\n", | ||
568 | errors, dirty, plane); | ||
569 | |||
570 | dirty = (dirty + 15) & ~15; | ||
571 | dirty = dirty > 32 ? 32 : dirty; | ||
572 | |||
573 | for (i = 0; i < dirty; ++i) { | ||
574 | - printf("%02x ", data[i]); | ||
575 | + fprintf(stderr, "%02x ", data[i]); | ||
576 | if (i % 16 == 15) | ||
577 | - printf("\n"); | ||
578 | + fprintf(stderr, "\n"); | ||
579 | } | ||
580 | } | ||
581 | } | ||
582 | @@ -1481,18 +1481,32 @@ static void video_save_image(struct device *dev, struct v4l2_buffer *buf, | ||
583 | |||
584 | ret = write(fd, dev->buffers[buf->index].mem[i], length); | ||
585 | if (ret < 0) { | ||
586 | - printf("write error: %s (%d)\n", strerror(errno), errno); | ||
587 | + fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); | ||
588 | break; | ||
589 | } else if (ret != (int)length) | ||
590 | - printf("write error: only %d bytes written instead of %u\n", | ||
591 | + fprintf(stderr, "write error: only %d bytes written instead of %u\n", | ||
592 | ret, length); | ||
593 | } | ||
594 | close(fd); | ||
595 | } | ||
596 | |||
597 | +static void video_stdout_image(struct device *dev, struct v4l2_buffer *buf) | ||
598 | +{ | ||
599 | + int ret; | ||
600 | + | ||
601 | + fprintf(stderr, "stdout"); | ||
602 | + ret = fwrite(dev->buffers[buf->index].mem, buf->bytesused, 1, stdout); | ||
603 | + | ||
604 | + if (ret < 0) | ||
605 | + fprintf(stderr, "write error: %s (%d)\n", strerror(errno), errno); | ||
606 | + else if (ret != (int)buf->bytesused) | ||
607 | + fprintf(stderr, "write error: only %d bytes written instead of %u\n", | ||
608 | + ret, buf->bytesused); | ||
609 | +} | ||
610 | + | ||
611 | static int video_do_capture(struct device *dev, unsigned int nframes, | ||
612 | unsigned int skip, unsigned int delay, const char *pattern, | ||
613 | - int do_requeue_last, enum buffer_fill_mode fill) | ||
614 | + int do_requeue_last, enum buffer_fill_mode fill, int do_stdout) | ||
615 | { | ||
616 | struct v4l2_plane planes[VIDEO_MAX_PLANES]; | ||
617 | struct v4l2_buffer buf; | ||
618 | @@ -1529,7 +1543,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
619 | ret = ioctl(dev->fd, VIDIOC_DQBUF, &buf); | ||
620 | if (ret < 0) { | ||
621 | if (errno != EIO) { | ||
622 | - printf("Unable to dequeue buffer: %s (%d).\n", | ||
623 | + fprintf(stderr, "Unable to dequeue buffer: %s (%d).\n", | ||
624 | strerror(errno), errno); | ||
625 | goto done; | ||
626 | } | ||
627 | @@ -1550,7 +1564,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
628 | |||
629 | clock_gettime(CLOCK_MONOTONIC, &ts); | ||
630 | get_ts_flags(buf.flags, &ts_type, &ts_source); | ||
631 | - printf("%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, | ||
632 | + fprintf(stderr, "%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index, | ||
633 | (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-', | ||
634 | v4l2_field_name(buf.field), | ||
635 | buf.sequence, buf.bytesused, buf.timestamp.tv_sec, | ||
636 | @@ -1563,6 +1577,9 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
637 | if (video_is_capture(dev) && pattern && !skip) | ||
638 | video_save_image(dev, &buf, pattern, i); | ||
639 | |||
640 | + if (video_is_capture(dev) && do_stdout && !skip) | ||
641 | + video_stdout_image(dev, &buf); | ||
642 | + | ||
643 | if (skip) | ||
644 | --skip; | ||
645 | |||
646 | @@ -1577,7 +1594,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
647 | |||
648 | ret = video_queue_buffer(dev, buf.index, fill); | ||
649 | if (ret < 0) { | ||
650 | - printf("Unable to requeue buffer: %s (%d).\n", | ||
651 | + fprintf(stderr, "Unable to requeue buffer: %s (%d).\n", | ||
652 | strerror(errno), errno); | ||
653 | goto done; | ||
654 | } | ||
655 | @@ -1587,7 +1604,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
656 | video_enable(dev, 0); | ||
657 | |||
658 | if (nframes == 0) { | ||
659 | - printf("No frames captured.\n"); | ||
660 | + fprintf(stderr, "No frames captured.\n"); | ||
661 | goto done; | ||
662 | } | ||
663 | |||
664 | @@ -1604,7 +1621,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, | ||
665 | bps = size/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; | ||
666 | fps = i/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0; | ||
667 | |||
668 | - printf("Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", | ||
669 | + fprintf(stderr, "Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n", | ||
670 | i, ts.tv_sec, ts.tv_nsec/1000, fps, bps); | ||
671 | |||
672 | done: | ||
673 | @@ -1616,42 +1633,42 @@ done: | ||
674 | |||
675 | static void usage(const char *argv0) | ||
676 | { | ||
677 | - printf("Usage: %s [options] device\n", argv0); | ||
678 | - printf("Supported options:\n"); | ||
679 | - printf("-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); | ||
680 | - printf(" \"capture-mplane\" or \"output-mplane\")\n"); | ||
681 | - printf("-c, --capture[=nframes] Capture frames\n"); | ||
682 | - printf("-C, --check-overrun Verify dequeued frames for buffer overrun\n"); | ||
683 | - printf("-d, --delay Delay (in ms) before requeuing buffers\n"); | ||
684 | - printf("-f, --format format Set the video format\n"); | ||
685 | - printf("-F, --file[=name] Read/write frames from/to disk\n"); | ||
686 | - printf("\tFor video capture devices, the first '#' character in the file name is\n"); | ||
687 | - printf("\texpanded to the frame sequence number. The default file name is\n"); | ||
688 | - printf("\t'frame-#.bin'.\n"); | ||
689 | - printf("-h, --help Show this help screen\n"); | ||
690 | - printf("-i, --input input Select the video input\n"); | ||
691 | - printf("-I, --fill-frames Fill frames with check pattern before queuing them\n"); | ||
692 | - printf("-l, --list-controls List available controls\n"); | ||
693 | - printf("-n, --nbufs n Set the number of video buffers\n"); | ||
694 | - printf("-p, --pause Pause before starting the video stream\n"); | ||
695 | - printf("-q, --quality n MJPEG quality (0-100)\n"); | ||
696 | - printf("-r, --get-control ctrl Get control 'ctrl'\n"); | ||
697 | - printf("-R, --realtime=[priority] Enable realtime RR scheduling\n"); | ||
698 | - printf("-s, --size WxH Set the frame size\n"); | ||
699 | - printf("-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); | ||
700 | - printf("-u, --userptr Use the user pointers streaming method\n"); | ||
701 | - printf("-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); | ||
702 | - printf(" --enum-formats Enumerate formats\n"); | ||
703 | - printf(" --enum-inputs Enumerate inputs\n"); | ||
704 | - printf(" --fd Use a numeric file descriptor insted of a device\n"); | ||
705 | - printf(" --field Interlaced format field order\n"); | ||
706 | - printf(" --no-query Don't query capabilities on open\n"); | ||
707 | - printf(" --offset User pointer buffer offset from page start\n"); | ||
708 | - printf(" --requeue-last Requeue the last buffers before streamoff\n"); | ||
709 | - printf(" --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); | ||
710 | - printf(" --skip n Skip the first n frames\n"); | ||
711 | - printf(" --sleep-forever Sleep forever after configuring the device\n"); | ||
712 | - printf(" --stride value Line stride in bytes\n"); | ||
713 | + fprintf(stderr, "Usage: %s [options] device\n", argv0); | ||
714 | + fprintf(stderr, "Supported options:\n"); | ||
715 | + fprintf(stderr, "-B, --buffer-type Buffer type (\"capture\", \"output\",\n"); | ||
716 | + fprintf(stderr, " \"capture-mplane\" or \"output-mplane\")\n"); | ||
717 | + fprintf(stderr, "-c, --capture[=nframes] Capture frames\n"); | ||
718 | + fprintf(stderr, "-C, --check-overrun Verify dequeued frames for buffer overrun\n"); | ||
719 | + fprintf(stderr, "-d, --delay Delay (in ms) before requeuing buffers\n"); | ||
720 | + fprintf(stderr, "-f, --format format Set the video format\n"); | ||
721 | + fprintf(stderr, "-F, --file[=name] Read/write frames from/to disk\n"); | ||
722 | + fprintf(stderr, "\tFor video capture devices, the first '#' character in the file name is\n"); | ||
723 | + fprintf(stderr, "\texpanded to the frame sequence number. The default file name is\n"); | ||
724 | + fprintf(stderr, "\t'frame-#.bin'.\n"); | ||
725 | + fprintf(stderr, "-h, --help Show this help screen\n"); | ||
726 | + fprintf(stderr, "-i, --input input Select the video input\n"); | ||
727 | + fprintf(stderr, "-I, --fill-frames Fill frames with check pattern before queuing them\n"); | ||
728 | + fprintf(stderr, "-l, --list-controls List available controls\n"); | ||
729 | + fprintf(stderr, "-n, --nbufs n Set the number of video buffers\n"); | ||
730 | + fprintf(stderr, "-p, --pause Pause before starting the video stream\n"); | ||
731 | + fprintf(stderr, "-q, --quality n MJPEG quality (0-100)\n"); | ||
732 | + fprintf(stderr, "-r, --get-control ctrl Get control 'ctrl'\n"); | ||
733 | + fprintf(stderr, "-R, --realtime=[priority] Enable realtime RR scheduling\n"); | ||
734 | + fprintf(stderr, "-s, --size WxH Set the frame size\n"); | ||
735 | + fprintf(stderr, "-t, --time-per-frame num/denom Set the time per frame (eg. 1/25 = 25 fps)\n"); | ||
736 | + fprintf(stderr, "-u, --userptr Use the user pointers streaming method\n"); | ||
737 | + fprintf(stderr, "-w, --set-control 'ctrl value' Set control 'ctrl' to 'value'\n"); | ||
738 | + fprintf(stderr, " --enum-formats Enumerate formats\n"); | ||
739 | + fprintf(stderr, " --enum-inputs Enumerate inputs\n"); | ||
740 | + fprintf(stderr, " --fd Use a numeric file descriptor insted of a device\n"); | ||
741 | + fprintf(stderr, " --field Interlaced format field order\n"); | ||
742 | + fprintf(stderr, " --no-query Don't query capabilities on open\n"); | ||
743 | + fprintf(stderr, " --offset User pointer buffer offset from page start\n"); | ||
744 | + fprintf(stderr, " --requeue-last Requeue the last buffers before streamoff\n"); | ||
745 | + fprintf(stderr, " --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); | ||
746 | + fprintf(stderr, " --skip n Skip the first n frames\n"); | ||
747 | + fprintf(stderr, " --sleep-forever Sleep forever after configuring the device\n"); | ||
748 | + fprintf(stderr, " --stride value Line stride in bytes\n"); | ||
749 | } | ||
750 | |||
751 | #define OPT_ENUM_FORMATS 256 | ||
752 | @@ -1665,6 +1682,7 @@ static void usage(const char *argv0) | ||
753 | #define OPT_FD 264 | ||
754 | #define OPT_TSTAMP_SRC 265 | ||
755 | #define OPT_FIELD 266 | ||
756 | +#define OPT_STDOUT 267 | ||
757 | |||
758 | static struct option opts[] = { | ||
759 | {"buffer-type", 1, 0, 'B'}, | ||
760 | @@ -1677,6 +1695,7 @@ static struct option opts[] = { | ||
761 | {"field", 1, 0, OPT_FIELD}, | ||
762 | {"file", 2, 0, 'F'}, | ||
763 | {"fill-frames", 0, 0, 'I'}, | ||
764 | + {"stdout", 0, 0, OPT_STDOUT}, | ||
765 | {"format", 1, 0, 'f'}, | ||
766 | {"help", 0, 0, 'h'}, | ||
767 | {"input", 1, 0, 'i'}, | ||
768 | @@ -1717,7 +1736,8 @@ int main(int argc, char *argv[]) | ||
769 | int do_list_controls = 0, do_get_control = 0, do_set_control = 0; | ||
770 | int do_sleep_forever = 0, do_requeue_last = 0; | ||
771 | int do_rt = 0; | ||
772 | - int no_query = 0; | ||
773 | + int no_query = 0; | ||
774 | + int do_stdout = 0; | ||
775 | char *endptr; | ||
776 | int c; | ||
777 | |||
778 | @@ -1755,7 +1775,7 @@ int main(int argc, char *argv[]) | ||
779 | case 'B': | ||
780 | ret = v4l2_buf_type_from_string(optarg); | ||
781 | if (ret == -1) { | ||
782 | - printf("Bad buffer type \"%s\"\n", optarg); | ||
783 | + fprintf(stderr, "Bad buffer type \"%s\"\n", optarg); | ||
784 | return 1; | ||
785 | } | ||
786 | video_set_buf_type(&dev, ret); | ||
787 | @@ -1775,7 +1795,7 @@ int main(int argc, char *argv[]) | ||
788 | do_set_format = 1; | ||
789 | info = v4l2_format_by_name(optarg); | ||
790 | if (info == NULL) { | ||
791 | - printf("Unsupported video format '%s'\n", optarg); | ||
792 | + fprintf(stderr, "Unsupported video format '%s'\n", optarg); | ||
793 | return 1; | ||
794 | } | ||
795 | pixelformat = info->fourcc; | ||
796 | @@ -1812,7 +1832,7 @@ int main(int argc, char *argv[]) | ||
797 | case 'r': | ||
798 | ctrl_name = strtol(optarg, &endptr, 0); | ||
799 | if (*endptr != 0) { | ||
800 | - printf("Invalid control name '%s'\n", optarg); | ||
801 | + fprintf(stderr, "Invalid control name '%s'\n", optarg); | ||
802 | return 1; | ||
803 | } | ||
804 | do_get_control = 1; | ||
805 | @@ -1826,12 +1846,12 @@ int main(int argc, char *argv[]) | ||
806 | do_set_format = 1; | ||
807 | width = strtol(optarg, &endptr, 10); | ||
808 | if (*endptr != 'x' || endptr == optarg) { | ||
809 | - printf("Invalid size '%s'\n", optarg); | ||
810 | + fprintf(stderr, "Invalid size '%s'\n", optarg); | ||
811 | return 1; | ||
812 | } | ||
813 | height = strtol(endptr + 1, &endptr, 10); | ||
814 | if (*endptr != 0) { | ||
815 | - printf("Invalid size '%s'\n", optarg); | ||
816 | + fprintf(stderr, "Invalid size '%s'\n", optarg); | ||
817 | return 1; | ||
818 | } | ||
819 | break; | ||
820 | @@ -1839,12 +1859,12 @@ int main(int argc, char *argv[]) | ||
821 | do_set_time_per_frame = 1; | ||
822 | time_per_frame.numerator = strtol(optarg, &endptr, 10); | ||
823 | if (*endptr != '/' || endptr == optarg) { | ||
824 | - printf("Invalid time per frame '%s'\n", optarg); | ||
825 | + fprintf(stderr, "Invalid time per frame '%s'\n", optarg); | ||
826 | return 1; | ||
827 | } | ||
828 | time_per_frame.denominator = strtol(endptr + 1, &endptr, 10); | ||
829 | if (*endptr != 0) { | ||
830 | - printf("Invalid time per frame '%s'\n", optarg); | ||
831 | + fprintf(stderr, "Invalid time per frame '%s'\n", optarg); | ||
832 | return 1; | ||
833 | } | ||
834 | break; | ||
835 | @@ -1854,12 +1874,12 @@ int main(int argc, char *argv[]) | ||
836 | case 'w': | ||
837 | ctrl_name = strtol(optarg, &endptr, 0); | ||
838 | if (*endptr != ' ' || endptr == optarg) { | ||
839 | - printf("Invalid control name '%s'\n", optarg); | ||
840 | + fprintf(stderr, "Invalid control name '%s'\n", optarg); | ||
841 | return 1; | ||
842 | } | ||
843 | ctrl_value = strtol(endptr + 1, &endptr, 0); | ||
844 | if (*endptr != 0) { | ||
845 | - printf("Invalid control value '%s'\n", optarg); | ||
846 | + fprintf(stderr, "Invalid control value '%s'\n", optarg); | ||
847 | return 1; | ||
848 | } | ||
849 | do_set_control = 1; | ||
850 | @@ -1873,16 +1893,16 @@ int main(int argc, char *argv[]) | ||
851 | case OPT_FD: | ||
852 | ret = atoi(optarg); | ||
853 | if (ret < 0) { | ||
854 | - printf("Bad file descriptor %d\n", ret); | ||
855 | + fprintf(stderr, "Bad file descriptor %d\n", ret); | ||
856 | return 1; | ||
857 | } | ||
858 | - printf("Using file descriptor %d\n", ret); | ||
859 | + fprintf(stderr, "Using file descriptor %d\n", ret); | ||
860 | video_set_fd(&dev, ret); | ||
861 | break; | ||
862 | case OPT_FIELD: | ||
863 | field = v4l2_field_from_string(optarg); | ||
864 | if (field == (enum v4l2_field)-1) { | ||
865 | - printf("Invalid field order '%s'\n", optarg); | ||
866 | + fprintf(stderr, "Invalid field order '%s'\n", optarg); | ||
867 | return 1; | ||
868 | } | ||
869 | break; | ||
870 | @@ -1907,22 +1927,25 @@ int main(int argc, char *argv[]) | ||
871 | } else if (!strcmp(optarg, "soe")) { | ||
872 | dev.buffer_output_flags |= V4L2_BUF_FLAG_TSTAMP_SRC_SOE; | ||
873 | } else { | ||
874 | - printf("Invalid timestamp source %s\n", optarg); | ||
875 | + fprintf(stderr, "Invalid timestamp source %s\n", optarg); | ||
876 | return 1; | ||
877 | } | ||
878 | break; | ||
879 | case OPT_USERPTR_OFFSET: | ||
880 | userptr_offset = atoi(optarg); | ||
881 | break; | ||
882 | + case OPT_STDOUT: | ||
883 | + do_stdout = 1; | ||
884 | + break; | ||
885 | default: | ||
886 | - printf("Invalid option -%c\n", c); | ||
887 | - printf("Run %s -h for help.\n", argv[0]); | ||
888 | + fprintf(stderr, "Invalid option -%c\n", c); | ||
889 | + fprintf(stderr, "Run %s -h for help.\n", argv[0]); | ||
890 | return 1; | ||
891 | } | ||
892 | } | ||
893 | |||
894 | if ((fill_mode & BUFFER_FILL_PADDING) && memtype != V4L2_MEMORY_USERPTR) { | ||
895 | - printf("Buffer overrun can only be checked in USERPTR mode.\n"); | ||
896 | + fprintf(stderr, "Buffer overrun can only be checked in USERPTR mode.\n"); | ||
897 | return 1; | ||
898 | } | ||
899 | |||
900 | @@ -1959,7 +1982,7 @@ int main(int argc, char *argv[]) | ||
901 | ret = get_control(&dev, ctrl_name, | ||
902 | get_control_type(&dev, ctrl_name), &val); | ||
903 | if (ret >= 0) | ||
904 | - printf("Control 0x%08x value %" PRId64 "\n", ctrl_name, val); | ||
905 | + fprintf(stderr, "Control 0x%08x value %" PRId64 "\n", ctrl_name, val); | ||
906 | } | ||
907 | |||
908 | if (do_set_control) | ||
909 | @@ -1970,7 +1993,7 @@ int main(int argc, char *argv[]) | ||
910 | video_list_controls(&dev); | ||
911 | |||
912 | if (do_enum_formats) { | ||
913 | - printf("- Available formats:\n"); | ||
914 | + fprintf(stderr, "- Available formats:\n"); | ||
915 | video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE); | ||
916 | video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); | ||
917 | video_enum_formats(&dev, V4L2_BUF_TYPE_VIDEO_OUTPUT); | ||
918 | @@ -1979,14 +2002,14 @@ int main(int argc, char *argv[]) | ||
919 | } | ||
920 | |||
921 | if (do_enum_inputs) { | ||
922 | - printf("- Available inputs:\n"); | ||
923 | + fprintf(stderr, "- Available inputs:\n"); | ||
924 | video_enum_inputs(&dev); | ||
925 | } | ||
926 | |||
927 | if (do_set_input) { | ||
928 | video_set_input(&dev, input); | ||
929 | ret = video_get_input(&dev); | ||
930 | - printf("Input %d selected\n", ret); | ||
931 | + fprintf(stderr, "Input %d selected\n", ret); | ||
932 | } | ||
933 | |||
934 | /* Set the video format. */ | ||
935 | @@ -2028,7 +2051,7 @@ int main(int argc, char *argv[]) | ||
936 | } | ||
937 | |||
938 | if (do_pause) { | ||
939 | - printf("Press enter to start capture\n"); | ||
940 | + fprintf(stderr, "Press enter to start capture\n"); | ||
941 | getchar(); | ||
942 | } | ||
943 | |||
944 | @@ -2037,12 +2060,12 @@ int main(int argc, char *argv[]) | ||
945 | sched.sched_priority = rt_priority; | ||
946 | ret = sched_setscheduler(0, SCHED_RR, &sched); | ||
947 | if (ret < 0) | ||
948 | - printf("Failed to select RR scheduler: %s (%d)\n", | ||
949 | + fprintf(stderr, "Failed to select RR scheduler: %s (%d)\n", | ||
950 | strerror(errno), errno); | ||
951 | } | ||
952 | |||
953 | if (video_do_capture(&dev, nframes, skip, delay, filename, | ||
954 | - do_requeue_last, fill_mode) < 0) { | ||
955 | + do_requeue_last, fill_mode, do_stdout) < 0) { | ||
956 | video_close(&dev); | ||
957 | return 1; | ||
958 | } | ||
959 | -- | ||
960 | 1.7.9.5 | ||
961 | |||
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 000000000..d4e32dea4 --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "Yet Another V4L2 Test Application" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | |||
5 | SRC_URI = "git://git.ideasonboard.org/yavta.git \ | ||
6 | file://0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch" | ||
7 | SRCREV = "7e9f28bedc1ed3205fb5164f686aea96f27a0de2" | ||
8 | |||
9 | PV = "0.0" | ||
10 | PR = "r2" | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | # The yavta sources include copies of the headers required to build in the | ||
14 | # include directory. The Makefile uses CFLAGS to include these, but since | ||
15 | # we override the CFLAGS then we need to add this include path back in. | ||
16 | CFLAGS += "-I${S}/include" | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${bindir} | ||
20 | install -m 0755 yavta ${D}${bindir} | ||
21 | } | ||
22 | |||
23 | |||
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 000000000..cc5b84489 --- /dev/null +++ b/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | DESCRIPTION = "WavPack is a completely open audio compression format providing lossless, high-quality lossy, and a unique hybrid compression mode." | ||
2 | LICENSE = "BSD" | ||
3 | LIC_FILES_CHKSUM = "file://license.txt;md5=f596650807588c61fcab60bec8242df8" | ||
4 | |||
5 | SRC_URI = "http://wavpack.com/wavpack-${PV}.tar.bz2" | ||
6 | SRC_URI[md5sum] = "7bb1528f910e4d0003426c02db856063" | ||
7 | SRC_URI[sha256sum] = "175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5" | ||
8 | |||
9 | inherit autotools lib_package | ||
10 | |||
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch new file mode 100644 index 000000000..bf94b2dce --- /dev/null +++ b/meta-oe/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From f45fe1668401d72c2937a52385b492216715c0f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: James Zern <jzern@google.com> | ||
3 | Date: Thu, 6 Mar 2014 15:58:37 -0800 | ||
4 | Subject: [PATCH] configure.sh: quote local variables | ||
5 | |||
6 | fixes issue #711 | ||
7 | |||
8 | specifying a multiword CC, e.g., CC='gcc -m32', would cause the failure | ||
9 | under dash | ||
10 | |||
11 | reported in | ||
12 | https://bugs.gentoo.org/show_bug.cgi?id=498136 | ||
13 | |||
14 | patch by floppymaster at gmail dot com | ||
15 | |||
16 | Upstream-Status: Backport [f45fe1668401d72c2937a52385b492216715c0f9] | ||
17 | |||
18 | Change-Id: I2ba246f765646161538622739961ec0f6c2d8c2d | ||
19 | --- | ||
20 | build/make/configure.sh | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/build/make/configure.sh b/build/make/configure.sh | ||
24 | index 449d1b9..43f8e77 100755 | ||
25 | --- a/build/make/configure.sh | ||
26 | +++ b/build/make/configure.sh | ||
27 | @@ -405,8 +405,8 @@ true | ||
28 | } | ||
29 | |||
30 | write_common_target_config_mk() { | ||
31 | - local CC=${CC} | ||
32 | - local CXX=${CXX} | ||
33 | + local CC="${CC}" | ||
34 | + local CXX="${CXX}" | ||
35 | enabled ccache && CC="ccache ${CC}" | ||
36 | enabled ccache && CXX="ccache ${CXX}" | ||
37 | print_webm_license $1 "##" "" | ||
38 | -- | ||
39 | 1.8.3.2 | ||
40 | |||
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 000000000..1bf863dfa --- /dev/null +++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Upstream: not yet | ||
2 | |||
3 | Fix 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_1.3.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb new file mode 100644 index 000000000..eb19a576d --- /dev/null +++ b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb | |||
@@ -0,0 +1,55 @@ | |||
1 | SUMMARY = "VPX multi-format codec" | ||
2 | DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams." | ||
3 | HOMEPAGE = "http://www.webmproject.org/code/" | ||
4 | BUGTRACKER = "http://code.google.com/p/webm/issues/list" | ||
5 | SECTION = "libs/multimedia" | ||
6 | LICENSE = "BSD" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" | ||
9 | |||
10 | SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \ | ||
11 | file://libvpx-configure-support-blank-prefix.patch \ | ||
12 | file://0001-configure.sh-quote-local-variables.patch" | ||
13 | SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f" | ||
14 | SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9" | ||
15 | |||
16 | S = "${WORKDIR}/libvpx-v${PV}" | ||
17 | |||
18 | # ffmpeg links with this and fails | ||
19 | # 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' | ||
20 | ARM_INSTRUCTION_SET = "arm" | ||
21 | |||
22 | CFLAGS += "-fPIC" | ||
23 | |||
24 | export CC | ||
25 | export LD = "${CC}" | ||
26 | |||
27 | VPXTARGET_armv5te = "armv5te-linux-gcc" | ||
28 | VPXTARGET_armv6 = "armv6-linux-gcc" | ||
29 | VPXTARGET_armv7a = "armv7-linux-gcc" | ||
30 | VPXTARGET ?= "generic-gnu" | ||
31 | |||
32 | CONFIGUREOPTS = " \ | ||
33 | --target=${VPXTARGET} \ | ||
34 | --enable-vp8 \ | ||
35 | --enable-vp9 \ | ||
36 | --enable-libs \ | ||
37 | --disable-install-docs \ | ||
38 | --disable-static \ | ||
39 | --enable-shared \ | ||
40 | --prefix=${prefix} \ | ||
41 | --libdir=${libdir} \ | ||
42 | " | ||
43 | |||
44 | do_configure() { | ||
45 | ${S}/configure ${CONFIGUREOPTS} | ||
46 | } | ||
47 | |||
48 | do_compile() { | ||
49 | oe_runmake | ||
50 | } | ||
51 | |||
52 | do_install() { | ||
53 | oe_runmake install DESTDIR=${D} | ||
54 | } | ||
55 | |||
diff --git a/meta-oe/recipes-multimedia/webp/libwebp_0.4.0.bb b/meta-oe/recipes-multimedia/webp/libwebp_0.4.0.bb new file mode 100644 index 000000000..7663b3b0b --- /dev/null +++ b/meta-oe/recipes-multimedia/webp/libwebp_0.4.0.bb | |||
@@ -0,0 +1,47 @@ | |||
1 | SUMMARY = "WebP is an image format designed for the Web" | ||
2 | DESCRIPTION = "WebP is a method of lossy and lossless compression that can be \ | ||
3 | used on a large variety of photographic, translucent and \ | ||
4 | graphical images found on the web. The degree of lossy \ | ||
5 | compression is adjustable so a user can choose the trade-off \ | ||
6 | between file size and image quality. WebP typically achieves \ | ||
7 | an average of 30% more compression than JPEG and JPEG 2000, \ | ||
8 | without loss of image quality." | ||
9 | HOMEPAGE = "https://developers.google.com/speed/webp/" | ||
10 | SECTION = "libs" | ||
11 | |||
12 | LICENSE = "BSD" | ||
13 | LIC_FILES_CHKSUM = "file://PATENTS;md5=7ec8a34de2073ea13ea2991006246d20" | ||
14 | |||
15 | DEPENDS = "giflib" | ||
16 | |||
17 | SRC_URI = "https://webp.googlecode.com/files/${BP}.tar.gz" | ||
18 | SRC_URI[md5sum] = "c8dd1d26eb9566833aba269b86d97e68" | ||
19 | SRC_URI[sha256sum] = "31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69" | ||
20 | |||
21 | EXTRA_OECONF = " \ | ||
22 | --disable-experimental \ | ||
23 | --disable-wic \ | ||
24 | --enable-libwebpmux \ | ||
25 | --enable-libwebpdemux \ | ||
26 | --enable-threading \ | ||
27 | " | ||
28 | |||
29 | inherit autotools lib_package | ||
30 | |||
31 | PACKAGECONFIG ??= "" | ||
32 | |||
33 | # libwebpdecoder is a subset of libwebp, don't build it unless requested | ||
34 | PACKAGECONFIG[decoder] = "--enable-libwebpdecoder,--disable-libwebpdecoder" | ||
35 | |||
36 | # Apply for examples programs: cwebp and dwebp | ||
37 | PACKAGECONFIG[jpeg] = ",ac_cv_header_jpeglib_h=no,jpeg" | ||
38 | PACKAGECONFIG[png] = ",ac_cv_header_png_h=no,libpng" | ||
39 | PACKAGECONFIG[tiff] = ",ac_cv_header_tiffio_h=no,tiff" | ||
40 | |||
41 | # Apply only for example program vwebp | ||
42 | PACKAGECONFIG[gl] = ",,mesa-glut" | ||
43 | |||
44 | PACKAGES =+ "${PN}-gif2webp" | ||
45 | |||
46 | DESCRIPTION_${PN}-gif2webp = "Simple tool to convert animated GIFs to WebP" | ||
47 | FILES_${PN}-gif2webp = "${bindir}/gif2webp" | ||
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 000000000..da5841a13 --- /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 000000000..1ca8b1ff7 --- /dev/null +++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | LICENSE= "MIT" | ||
2 | SUMMARY = "X Server Nokia 770 extensions library" | ||
3 | SECTION = "x11/libs" | ||
4 | DEPENDS = "virtual/libx11 libxext" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=db043791349ba57ad1169e1c92477cb6" | ||
7 | |||
8 | SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${BPN}/${BPN}_${PV}.tar.gz \ | ||
9 | file://auxdir.patch;striplevel=0" | ||
10 | S = "${WORKDIR}/xpext-1.0" | ||
11 | |||
12 | inherit autotools pkgconfig | ||
13 | |||
14 | SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896" | ||
15 | SRC_URI[sha256sum] = "a3b06f5188fd9effd0799ae31352b3cd65cb913b964e2c1a923ffa9d3c08abbe" | ||
diff --git a/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch b/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch new file mode 100644 index 000000000..18bc67cdd --- /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 000000000..968d342b1 --- /dev/null +++ b/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | LICENSE= "MIT" | ||
2 | SUMMARY = "X Server Nokia 770 extensions library" | ||
3 | SECTION = "x11/libs" | ||
4 | DEPENDS = "virtual/libx11 libxext xpext" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea2bda168c508c7cd8afa567b2fcc549" | ||
6 | SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${BPN}_${PV}.tar.gz \ | ||
7 | file://xsp-fix-pc.patch" | ||
8 | S = "${WORKDIR}/Xsp" | ||
9 | |||
10 | inherit autotools pkgconfig | ||
11 | |||
12 | SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5" | ||
13 | SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59" | ||