diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-oe/recipes-multimedia | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz |
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-multimedia')
23 files changed, 309 insertions, 309 deletions
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 index 52634c156..a455cad65 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb | |||
@@ -6,16 +6,16 @@ DEPENDS = "alsa-lib" | |||
6 | PR = "r1" | 6 | PR = "r1" |
7 | 7 | ||
8 | SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ | 8 | SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ |
9 | file://libio.patch \ | 9 | file://libio.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | inherit autotools | 12 | inherit autotools |
13 | 13 | ||
14 | LEAD_SONAME = "libaoss.so.0" | 14 | LEAD_SONAME = "libaoss.so.0" |
15 | 15 | ||
16 | do_configure_prepend () { | 16 | do_configure_prepend () { |
17 | touch NEWS README AUTHORS ChangeLog | 17 | touch NEWS README AUTHORS ChangeLog |
18 | sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in | 18 | sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in |
19 | } | 19 | } |
20 | 20 | ||
21 | SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" | 21 | SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" |
diff --git a/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb b/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb index d5cfb3f08..ee4a7b152 100644 --- a/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb +++ b/meta-oe/recipes-multimedia/esound/esound_0.2.36.bb | |||
@@ -22,7 +22,7 @@ EXTRA_OECONF = " \ | |||
22 | --disable-artstest \ | 22 | --disable-artstest \ |
23 | " | 23 | " |
24 | do_configure_prepend() { | 24 | do_configure_prepend() { |
25 | sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac | 25 | sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac |
26 | } | 26 | } |
27 | 27 | ||
28 | PACKAGES =+ "esddsp esd esd-utils" | 28 | PACKAGES =+ "esddsp esd esd-utils" |
diff --git a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb index a0b0935e0..6818413b4 100644 --- a/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +++ b/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb | |||
@@ -8,7 +8,7 @@ PR = "r1" | |||
8 | 8 | ||
9 | SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \ | 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 \ | 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 | " | 11 | " |
12 | SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7" | 12 | SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7" |
13 | SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079" | 13 | SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079" |
14 | SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b" | 14 | SRC_URI[patch.md5sum] = "805c0320a2efb21c40ce06fa13cd7c4b" |
diff --git a/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb index 111c61ed7..e3d5e7e33 100644 --- a/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb +++ b/meta-oe/recipes-multimedia/jack/jack_0.121.0.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \ |
9 | file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ | 9 | file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ |
10 | file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \ | 10 | file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \ |
11 | " | 11 | " |
12 | 12 | ||
13 | 13 | ||
14 | DEPENDS = "alsa-lib" | 14 | DEPENDS = "alsa-lib" |
@@ -18,7 +18,7 @@ SRCREV = "4484" | |||
18 | SRC_URI = "svn://subversion.jackaudio.org/jack/tags;module=RELEASE_${SVNPV};protocol=http \ | 18 | SRC_URI = "svn://subversion.jackaudio.org/jack/tags;module=RELEASE_${SVNPV};protocol=http \ |
19 | file://remove-wrong-host-test.patch \ | 19 | file://remove-wrong-host-test.patch \ |
20 | file://jack_fix_TWL4030_alsa_capture.patch \ | 20 | file://jack_fix_TWL4030_alsa_capture.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | S = "${WORKDIR}/RELEASE_${SVNPV}" | 23 | S = "${WORKDIR}/RELEASE_${SVNPV}" |
24 | 24 | ||
diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc index 28d6caafd..4dd5181df 100644 --- a/meta-oe/recipes-multimedia/libass/libass.inc +++ b/meta-oe/recipes-multimedia/libass/libass.inc | |||
@@ -14,13 +14,13 @@ SRC_URI = "http://${PN}.googlecode.com/files/${P}.tar.gz" | |||
14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
15 | 15 | ||
16 | EXTRA_OECONF = " \ | 16 | EXTRA_OECONF = " \ |
17 | --enable-enca \ | 17 | --enable-enca \ |
18 | --enable-fontconfig \ | 18 | --enable-fontconfig \ |
19 | --enable-png \ | 19 | --enable-png \ |
20 | " | 20 | " |
21 | 21 | ||
22 | PACKAGES =+ "${PN}-tests" | 22 | PACKAGES =+ "${PN}-tests" |
23 | 23 | ||
24 | FILES_${PN}-tests = " \ | 24 | FILES_${PN}-tests = " \ |
25 | ${libdir}/test/test \ | 25 | ${libdir}/test/test \ |
26 | " | 26 | " |
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc index 54307afda..6e91061d0 100644 --- a/meta-oe/recipes-multimedia/libav/libav.inc +++ b/meta-oe/recipes-multimedia/libav/libav.inc | |||
@@ -15,10 +15,10 @@ INC_PR = "r8" | |||
15 | 15 | ||
16 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
17 | 17 | ||
18 | # --enable-libgsm | 18 | # --enable-libgsm |
19 | # --enable-libmp3lame | 19 | # --enable-libmp3lame |
20 | # --enable-libschroedinger | 20 | # --enable-libschroedinger |
21 | # --enable-libvpx | 21 | # --enable-libvpx |
22 | 22 | ||
23 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" | 23 | B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" |
24 | 24 | ||
@@ -29,28 +29,28 @@ EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | |||
29 | EXTRA_FFCONF ?= "" | 29 | EXTRA_FFCONF ?= "" |
30 | 30 | ||
31 | EXTRA_OECONF = " \ | 31 | EXTRA_OECONF = " \ |
32 | --enable-shared \ | 32 | --enable-shared \ |
33 | --enable-pthreads \ | 33 | --enable-pthreads \ |
34 | --enable-gpl \ | 34 | --enable-gpl \ |
35 | --enable-avfilter \ | 35 | --enable-avfilter \ |
36 | \ | 36 | \ |
37 | --cross-prefix=${TARGET_PREFIX} \ | 37 | --cross-prefix=${TARGET_PREFIX} \ |
38 | --prefix=${prefix} \ | 38 | --prefix=${prefix} \ |
39 | \ | 39 | \ |
40 | --enable-avserver \ | 40 | --enable-avserver \ |
41 | --enable-avplay \ | 41 | --enable-avplay \ |
42 | --enable-x11grab \ | 42 | --enable-x11grab \ |
43 | --enable-libtheora \ | 43 | --enable-libtheora \ |
44 | --enable-libvorbis \ | 44 | --enable-libvorbis \ |
45 | --enable-libx264 \ | 45 | --enable-libx264 \ |
46 | --arch=${TARGET_ARCH} \ | 46 | --arch=${TARGET_ARCH} \ |
47 | --target-os="linux" \ | 47 | --target-os="linux" \ |
48 | --enable-cross-compile \ | 48 | --enable-cross-compile \ |
49 | --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ | 49 | --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ |
50 | --extra-ldflags="${TARGET_LDFLAGS}" \ | 50 | --extra-ldflags="${TARGET_LDFLAGS}" \ |
51 | --sysroot="${STAGING_DIR_TARGET}" \ | 51 | --sysroot="${STAGING_DIR_TARGET}" \ |
52 | --enable-hardcoded-tables \ | 52 | --enable-hardcoded-tables \ |
53 | ${EXTRA_FFCONF} \ | 53 | ${EXTRA_FFCONF} \ |
54 | " | 54 | " |
55 | 55 | ||
56 | #| yasm not found, use --disable-yasm for a crippled build | 56 | #| yasm not found, use --disable-yasm for a crippled build |
@@ -58,16 +58,16 @@ EXTRA_OECONF_append_x86-64 = " --disable-yasm" | |||
58 | EXTRA_OECONF_append_x86 = " --disable-yasm" | 58 | EXTRA_OECONF_append_x86 = " --disable-yasm" |
59 | 59 | ||
60 | do_configure() { | 60 | do_configure() { |
61 | # We don't have TARGET_PREFIX-pkgconfig | 61 | # We don't have TARGET_PREFIX-pkgconfig |
62 | sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure | 62 | sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure |
63 | mkdir -p ${B} | 63 | mkdir -p ${B} |
64 | cd ${B} | 64 | cd ${B} |
65 | ${S}/configure ${EXTRA_OECONF} | 65 | ${S}/configure ${EXTRA_OECONF} |
66 | sed -i -e s:Os:O4:g ${B}/config.h | 66 | sed -i -e s:Os:O4:g ${B}/config.h |
67 | } | 67 | } |
68 | 68 | ||
69 | do_install_append() { | 69 | do_install_append() { |
70 | install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ | 70 | install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ |
71 | } | 71 | } |
72 | 72 | ||
73 | FFMPEG_LIBS = "libavcodec libavdevice libavformat \ | 73 | FFMPEG_LIBS = "libavcodec libavdevice libavformat \ |
diff --git a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb b/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb index ebab2c10f..b48ae96ad 100644 --- a/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb +++ b/meta-oe/recipes-multimedia/libav/libav_0.8.4.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | require libav.inc | 1 | require libav.inc |
2 | 2 | ||
3 | EXTRA_OECONF += " \ | 3 | EXTRA_OECONF += " \ |
4 | --enable-postproc \ | 4 | --enable-postproc \ |
5 | " | 5 | " |
6 | 6 | ||
7 | FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:" | 7 | FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:" |
8 | 8 | ||
9 | SRC_URI_append = " \ | 9 | SRC_URI_append = " \ |
10 | file://0001-configure-enable-pic-for-AArch64.patch \ | 10 | file://0001-configure-enable-pic-for-AArch64.patch \ |
11 | " | 11 | " |
12 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 12 | LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
13 | file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ | 13 | file://COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ |
diff --git a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb index f65270dcf..30289856e 100644 --- a/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb +++ b/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.7.bb | |||
@@ -14,8 +14,8 @@ EXTRA_OECONF = "--disable-option-checking" | |||
14 | 14 | ||
15 | # NOTE: autotools_stage_all does nothing here, we need to do it manually | 15 | # NOTE: autotools_stage_all does nothing here, we need to do it manually |
16 | do_install_append() { | 16 | do_install_append() { |
17 | install -d ${D}${includedir}/libmodplug | 17 | install -d ${D}${includedir}/libmodplug |
18 | install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug | 18 | install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug |
19 | install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ | 19 | install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ |
20 | } | 20 | } |
21 | 21 | ||
diff --git a/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb index 152062849..b39f20815 100644 --- a/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb +++ b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb | |||
@@ -24,21 +24,21 @@ EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | |||
24 | EXTRA_FFCONF ?= "" | 24 | EXTRA_FFCONF ?= "" |
25 | 25 | ||
26 | EXTRA_OECONF = " \ | 26 | EXTRA_OECONF = " \ |
27 | --enable-shared \ | 27 | --enable-shared \ |
28 | --enable-pthreads \ | 28 | --enable-pthreads \ |
29 | --enable-gpl \ | 29 | --enable-gpl \ |
30 | --enable-postproc \ | 30 | --enable-postproc \ |
31 | \ | 31 | \ |
32 | --cross-prefix=${TARGET_PREFIX} \ | 32 | --cross-prefix=${TARGET_PREFIX} \ |
33 | --prefix=${prefix} \ | 33 | --prefix=${prefix} \ |
34 | \ | 34 | \ |
35 | --arch=${TARGET_ARCH} \ | 35 | --arch=${TARGET_ARCH} \ |
36 | --target-os="linux" \ | 36 | --target-os="linux" \ |
37 | --enable-cross-compile \ | 37 | --enable-cross-compile \ |
38 | --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ | 38 | --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ |
39 | --extra-ldflags="${TARGET_LDFLAGS}" \ | 39 | --extra-ldflags="${TARGET_LDFLAGS}" \ |
40 | --sysroot="${STAGING_DIR_TARGET}" \ | 40 | --sysroot="${STAGING_DIR_TARGET}" \ |
41 | ${EXTRA_FFCONF} \ | 41 | ${EXTRA_FFCONF} \ |
42 | " | 42 | " |
43 | 43 | ||
44 | do_configure() { | 44 | do_configure() { |
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 index ccc3d4003..4317d9369 100644 --- 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 | |||
@@ -22,12 +22,12 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" | |||
22 | EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" | 22 | EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared" |
23 | 23 | ||
24 | do_configure_prepend() { | 24 | do_configure_prepend() { |
25 | # Removing this file fixes a libtool version mismatch. | 25 | # Removing this file fixes a libtool version mismatch. |
26 | rm -f acinclude/libtool.m4 | 26 | rm -f acinclude/libtool.m4 |
27 | rm -f acinclude/sdl.m4 | 27 | rm -f acinclude/sdl.m4 |
28 | rm -f acinclude/pkg.m4 | 28 | rm -f acinclude/pkg.m4 |
29 | rm -f acinclude/lt~obsolete.m4 | 29 | rm -f acinclude/lt~obsolete.m4 |
30 | rm -f acinclude/ltoptions.m4 | 30 | rm -f acinclude/ltoptions.m4 |
31 | rm -f acinclude/ltsugar.m4 | 31 | rm -f acinclude/ltsugar.m4 |
32 | rm -f acinclude/ltversion.m4 | 32 | rm -f acinclude/ltversion.m4 |
33 | } | 33 | } |
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 index c8fa6ca46..00c7ec8c0 100644 --- 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 | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d" | |||
6 | 6 | ||
7 | SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ | 7 | SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \ |
8 | file://configure.patch \ | 8 | file://configure.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" | 11 | SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1" |
12 | SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" | 12 | SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" |
@@ -19,20 +19,20 @@ EXTRA_AUTORECONF += "--include=acinclude" | |||
19 | EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}" | 19 | EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}" |
20 | 20 | ||
21 | do_configure () { | 21 | do_configure () { |
22 | # Remove old libtool macros. | 22 | # Remove old libtool macros. |
23 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | 23 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" |
24 | for i in ${MACROS}; do | 24 | for i in ${MACROS}; do |
25 | rm -f acinclude/$i | 25 | rm -f acinclude/$i |
26 | done | 26 | done |
27 | cp build-scripts/* . || true | 27 | cp build-scripts/* . || true |
28 | rm -rf build-scripts/ | 28 | rm -rf build-scripts/ |
29 | export SYSROOT=$PKG_CONFIG_SYSROOT_DIR | 29 | export SYSROOT=$PKG_CONFIG_SYSROOT_DIR |
30 | 30 | ||
31 | autotools_do_configure | 31 | autotools_do_configure |
32 | 32 | ||
33 | rm config.log | 33 | rm config.log |
34 | for i in $(find -name "Makefile") ; do | 34 | for i in $(find -name "Makefile") ; do |
35 | sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i | 35 | sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i |
36 | done | 36 | done |
37 | } | 37 | } |
38 | 38 | ||
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 443f81818..966224d7f 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc | |||
@@ -19,36 +19,36 @@ S = "${WORKDIR}/live" | |||
19 | TARGET_CC_ARCH += "${LDFLAGS}" | 19 | TARGET_CC_ARCH += "${LDFLAGS}" |
20 | 20 | ||
21 | do_configure() { | 21 | do_configure() { |
22 | cp ${WORKDIR}/config.linux-cross . | 22 | cp ${WORKDIR}/config.linux-cross . |
23 | echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross | 23 | echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross |
24 | ./genMakefiles linux-cross | 24 | ./genMakefiles linux-cross |
25 | } | 25 | } |
26 | 26 | ||
27 | do_compile() { | 27 | do_compile() { |
28 | make | 28 | make |
29 | } | 29 | } |
30 | 30 | ||
31 | do_install() { | 31 | do_install() { |
32 | install -d ${D}${includedir}/BasicUsageEnvironment | 32 | install -d ${D}${includedir}/BasicUsageEnvironment |
33 | install -d ${D}${includedir}/groupsock | 33 | install -d ${D}${includedir}/groupsock |
34 | install -d ${D}${includedir}/liveMedia | 34 | install -d ${D}${includedir}/liveMedia |
35 | install -d ${D}${includedir}/UsageEnvironment | 35 | install -d ${D}${includedir}/UsageEnvironment |
36 | install -d ${D}${libdir} | 36 | install -d ${D}${libdir} |
37 | cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ | 37 | cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ |
38 | cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ | 38 | cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ |
39 | cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ | 39 | cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ |
40 | cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ | 40 | cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ |
41 | cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ | 41 | cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ |
42 | # Find all the headers | 42 | # Find all the headers |
43 | for i in $(find . -name "*.hh") $(find . -name "*.h") ; do | 43 | for i in $(find . -name "*.hh") $(find . -name "*.h") ; do |
44 | install ${i} ${D}${includedir} | 44 | install ${i} ${D}${includedir} |
45 | done | 45 | done |
46 | cp ${S}/*/*.a ${D}${libdir} | 46 | cp ${S}/*/*.a ${D}${libdir} |
47 | install -d ${D}${bindir} | 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 | 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}/ | 49 | install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/ |
50 | done | 50 | done |
51 | install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ | 51 | install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/ |
52 | } | 52 | } |
53 | 53 | ||
54 | PACKAGES =+ " live555-openrtsp live555-playsip live555-mediaserver" | 54 | PACKAGES =+ " live555-openrtsp live555-playsip live555-mediaserver" |
diff --git a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb index af5b5ffe0..efef5d225 100644 --- a/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb +++ b/meta-oe/recipes-multimedia/mikmod/libmikmod_3.1.12.bb | |||
@@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=b2b941d484c442e5c031a51463d8e11b" | |||
6 | DEPENDS = "alsa-lib" | 6 | DEPENDS = "alsa-lib" |
7 | 7 | ||
8 | SRC_URI = "\ | 8 | SRC_URI = "\ |
9 | ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ | 9 | ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ |
10 | file://m4.patch \ | 10 | file://m4.patch \ |
11 | file://autofoo.patch \ | 11 | file://autofoo.patch \ |
12 | file://ldflags.patch \ | 12 | file://ldflags.patch \ |
13 | file://CVE-2010-2971.patch \ | 13 | file://CVE-2010-2971.patch \ |
14 | file://obsolete_automake_macros.patch \ | 14 | file://obsolete_automake_macros.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16" | 17 | SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16" |
@@ -20,13 +20,13 @@ SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01 | |||
20 | inherit autotools binconfig lib_package | 20 | inherit autotools binconfig lib_package |
21 | 21 | ||
22 | EXTRA_OECONF = "\ | 22 | EXTRA_OECONF = "\ |
23 | --disable-af \ | 23 | --disable-af \ |
24 | --enable-alsa \ | 24 | --enable-alsa \ |
25 | --disable-esd \ | 25 | --disable-esd \ |
26 | --enable-oss \ | 26 | --enable-oss \ |
27 | --disable-sam9407 \ | 27 | --disable-sam9407 \ |
28 | --disable-ultra \ | 28 | --disable-ultra \ |
29 | --disable-esdtest \ | 29 | --disable-esdtest \ |
30 | --enable-threads \ | 30 | --enable-threads \ |
31 | " | 31 | " |
32 | 32 | ||
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb index 889bb9522..9a42b82d6 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb | |||
@@ -12,9 +12,9 @@ SRC_URI = "file://mplayer.conf" | |||
12 | 12 | ||
13 | # Yes, really /usr/etc!!! | 13 | # Yes, really /usr/etc!!! |
14 | do_install() { | 14 | do_install() { |
15 | install -d "${D}/usr${sysconfdir}/mplayer" | 15 | install -d "${D}/usr${sysconfdir}/mplayer" |
16 | 16 | ||
17 | install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer" | 17 | install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer" |
18 | } | 18 | } |
19 | 19 | ||
20 | FILES_${PN} = "/usr${sysconfdir}/mplayer" | 20 | FILES_${PN} = "/usr${sysconfdir}/mplayer" |
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 0dfc1ed99..2e04d3c73 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/" | |||
4 | DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ | 4 | DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ |
5 | libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ | 5 | libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ |
6 | libxv virtual/libx11 libass speex faad2 \ | 6 | libxv virtual/libx11 libass speex faad2 \ |
7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" | 7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" |
8 | 8 | ||
9 | RDEPENDS_${PN} = "mplayer-common" | 9 | RDEPENDS_${PN} = "mplayer-common" |
10 | PROVIDES = "mplayer" | 10 | PROVIDES = "mplayer" |
@@ -33,100 +33,100 @@ FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/" | |||
33 | CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ | 33 | CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \ |
34 | /usr/etc/mplayer/example.conf \ | 34 | /usr/etc/mplayer/example.conf \ |
35 | /usr/etc/mplayer/codecs.conf \ | 35 | /usr/etc/mplayer/codecs.conf \ |
36 | " | 36 | " |
37 | 37 | ||
38 | inherit autotools pkgconfig | 38 | inherit autotools pkgconfig |
39 | 39 | ||
40 | EXTRA_OECONF = " \ | 40 | EXTRA_OECONF = " \ |
41 | --prefix=/usr \ | 41 | --prefix=/usr \ |
42 | --mandir=${mandir} \ | 42 | --mandir=${mandir} \ |
43 | --target=${SIMPLE_TARGET_SYS} \ | 43 | --target=${SIMPLE_TARGET_SYS} \ |
44 | \ | 44 | \ |
45 | --disable-lirc \ | 45 | --disable-lirc \ |
46 | --disable-lircc \ | 46 | --disable-lircc \ |
47 | --disable-joystick \ | 47 | --disable-joystick \ |
48 | --disable-vm \ | 48 | --disable-vm \ |
49 | --disable-xf86keysym \ | 49 | --disable-xf86keysym \ |
50 | --enable-tv \ | 50 | --enable-tv \ |
51 | --disable-tv-v4l1 \ | 51 | --disable-tv-v4l1 \ |
52 | --enable-tv-v4l2 \ | 52 | --enable-tv-v4l2 \ |
53 | --disable-tv-bsdbt848 \ | 53 | --disable-tv-bsdbt848 \ |
54 | --enable-rtc \ | 54 | --enable-rtc \ |
55 | --enable-networking \ | 55 | --enable-networking \ |
56 | --disable-smb \ | 56 | --disable-smb \ |
57 | --enable-live \ | 57 | --enable-live \ |
58 | --disable-dvdnav \ | 58 | --disable-dvdnav \ |
59 | --enable-dvdread \ | 59 | --enable-dvdread \ |
60 | --disable-dvdread-internal \ | 60 | --disable-dvdread-internal \ |
61 | --disable-libdvdcss-internal \ | 61 | --disable-libdvdcss-internal \ |
62 | --disable-cdparanoia \ | 62 | --disable-cdparanoia \ |
63 | --enable-freetype \ | 63 | --enable-freetype \ |
64 | --enable-sortsub \ | 64 | --enable-sortsub \ |
65 | --disable-fribidi \ | 65 | --disable-fribidi \ |
66 | --disable-enca \ | 66 | --disable-enca \ |
67 | --disable-ftp \ | 67 | --disable-ftp \ |
68 | --disable-vstream \ | 68 | --disable-vstream \ |
69 | \ | 69 | \ |
70 | --disable-gif \ | 70 | --disable-gif \ |
71 | --enable-png \ | 71 | --enable-png \ |
72 | --enable-jpeg \ | 72 | --enable-jpeg \ |
73 | --disable-libcdio \ | 73 | --disable-libcdio \ |
74 | --disable-qtx \ | 74 | --disable-qtx \ |
75 | --disable-xanim \ | 75 | --disable-xanim \ |
76 | --disable-real \ | 76 | --disable-real \ |
77 | --disable-xvid \ | 77 | --disable-xvid \ |
78 | \ | 78 | \ |
79 | --enable-speex \ | 79 | --enable-speex \ |
80 | --enable-theora \ | 80 | --enable-theora \ |
81 | --disable-ladspa \ | 81 | --disable-ladspa \ |
82 | --disable-libdv \ | 82 | --disable-libdv \ |
83 | --enable-mad \ | 83 | --enable-mad \ |
84 | --disable-xmms \ | 84 | --disable-xmms \ |
85 | --disable-musepack \ | 85 | --disable-musepack \ |
86 | \ | 86 | \ |
87 | --disable-gl \ | 87 | --disable-gl \ |
88 | --disable-vesa \ | 88 | --disable-vesa \ |
89 | --disable-svga \ | 89 | --disable-svga \ |
90 | --enable-sdl \ | 90 | --enable-sdl \ |
91 | --disable-aa \ | 91 | --disable-aa \ |
92 | --disable-caca \ | 92 | --disable-caca \ |
93 | --disable-ggi \ | 93 | --disable-ggi \ |
94 | --disable-ggiwmh \ | 94 | --disable-ggiwmh \ |
95 | --disable-directx \ | 95 | --disable-directx \ |
96 | --disable-dxr3 \ | 96 | --disable-dxr3 \ |
97 | --disable-dvb \ | 97 | --disable-dvb \ |
98 | --disable-mga \ | 98 | --disable-mga \ |
99 | --disable-xmga \ | 99 | --disable-xmga \ |
100 | --enable-xv \ | 100 | --enable-xv \ |
101 | --disable-vm \ | 101 | --disable-vm \ |
102 | --disable-xinerama \ | 102 | --disable-xinerama \ |
103 | --enable-x11 \ | 103 | --enable-x11 \ |
104 | --enable-fbdev \ | 104 | --enable-fbdev \ |
105 | --disable-3dfx \ | 105 | --disable-3dfx \ |
106 | --disable-tdfxfb \ | 106 | --disable-tdfxfb \ |
107 | --disable-s3fb \ | 107 | --disable-s3fb \ |
108 | --disable-directfb \ | 108 | --disable-directfb \ |
109 | --disable-bl \ | 109 | --disable-bl \ |
110 | --disable-tdfxvid \ | 110 | --disable-tdfxvid \ |
111 | --disable-tga \ | 111 | --disable-tga \ |
112 | --disable-pnm \ | 112 | --disable-pnm \ |
113 | --disable-md5sum \ | 113 | --disable-md5sum \ |
114 | \ | 114 | \ |
115 | --enable-alsa \ | 115 | --enable-alsa \ |
116 | --enable-ossaudio \ | 116 | --enable-ossaudio \ |
117 | --disable-arts \ | 117 | --disable-arts \ |
118 | --disable-esd \ | 118 | --disable-esd \ |
119 | --disable-pulse \ | 119 | --disable-pulse \ |
120 | --disable-jack \ | 120 | --disable-jack \ |
121 | --disable-openal \ | 121 | --disable-openal \ |
122 | --disable-nas \ | 122 | --disable-nas \ |
123 | --disable-sgiaudio \ | 123 | --disable-sgiaudio \ |
124 | --disable-sunaudio \ | 124 | --disable-sunaudio \ |
125 | --disable-win32waveout \ | 125 | --disable-win32waveout \ |
126 | --enable-select \ | 126 | --enable-select \ |
127 | --enable-libass \ | 127 | --enable-libass \ |
128 | \ | 128 | \ |
129 | --extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \ | 129 | --extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \ |
130 | " | 130 | " |
131 | 131 | ||
132 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | 132 | EXTRA_OECONF_append_armv6 = " --enable-armv6" |
@@ -138,25 +138,25 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | |||
138 | CFLAGS_append = " -I${S}/libdvdread4 " | 138 | CFLAGS_append = " -I${S}/libdvdread4 " |
139 | 139 | ||
140 | do_configure() { | 140 | do_configure() { |
141 | sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure | 141 | sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure |
142 | sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure | 142 | sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure |
143 | sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure | 143 | sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure |
144 | sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure | 144 | sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure |
145 | sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure | 145 | sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure |
146 | sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile | 146 | sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile |
147 | 147 | ||
148 | export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" | 148 | export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)" |
149 | ./configure ${EXTRA_OECONF} | 149 | ./configure ${EXTRA_OECONF} |
150 | 150 | ||
151 | } | 151 | } |
152 | 152 | ||
153 | do_compile () { | 153 | do_compile () { |
154 | oe_runmake | 154 | oe_runmake |
155 | } | 155 | } |
156 | 156 | ||
157 | do_install_append() { | 157 | do_install_append() { |
158 | install -d ${D}/usr/etc/mplayer | 158 | install -d ${D}/usr/etc/mplayer |
159 | install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ | 159 | install ${S}/etc/input.conf ${D}/usr/etc/mplayer/ |
160 | install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ | 160 | install ${S}/etc/example.conf ${D}/usr/etc/mplayer/ |
161 | install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ | 161 | install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/ |
162 | } | 162 | } |
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 index 4c1773742..7ceab7b5b 100644 --- a/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb +++ b/meta-oe/recipes-multimedia/nonworking/minidlna/minidlna_1.0.25.bb | |||
@@ -8,7 +8,7 @@ DEPENDS = "flac libav jpeg sqlite3 libexif libogg libid3tag" | |||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}_${PV}_src.tar.gz \ | 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}_${PV}_src.tar.gz \ |
9 | file://search-for-headers-in-staging-dir.patch \ | 9 | file://search-for-headers-in-staging-dir.patch \ |
10 | file://fix-makefile.patch \ | 10 | file://fix-makefile.patch \ |
11 | " | 11 | " |
12 | 12 | ||
13 | SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5" | 13 | SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5" |
14 | SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851" | 14 | SRC_URI[sha256sum] = "170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851" |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb index ce5c5e1fc..91a4ab8cd 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb | |||
@@ -13,7 +13,7 @@ inherit autotools gettext | |||
13 | PROVIDES = "libv4l" | 13 | PROVIDES = "libv4l" |
14 | 14 | ||
15 | SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \ | 15 | SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \ |
16 | " | 16 | " |
17 | # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag | 17 | # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag |
18 | SRCREV = "0298efdcd1153b8f719b9164548a3f0546f0cb7c" | 18 | SRCREV = "0298efdcd1153b8f719b9164548a3f0546f0cb7c" |
19 | 19 | ||
@@ -22,10 +22,10 @@ S = "${WORKDIR}/git" | |||
22 | EXTRA_OECONF = "--disable-qv4l2 --enable-shared" | 22 | EXTRA_OECONF = "--disable-qv4l2 --enable-shared" |
23 | 23 | ||
24 | do_configure() { | 24 | do_configure() { |
25 | # autotools_do_configure fails with: | 25 | # autotools_do_configure fails with: |
26 | # | configure.ac:139: error: required file 'build-aux/config.rpath' not found | 26 | # | configure.ac:139: error: required file 'build-aux/config.rpath' not found |
27 | autoreconf -vfi | 27 | autoreconf -vfi |
28 | oe_runconf | 28 | oe_runconf |
29 | } | 29 | } |
30 | 30 | ||
31 | PACKAGES =+ "rc-keymaps libv4l libv4l-dbg libv4l-dev" | 31 | PACKAGES =+ "rc-keymaps libv4l libv4l-dbg libv4l-dev" |
diff --git a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index d007bcb60..98b5e0efb 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb | |||
@@ -11,8 +11,8 @@ PR = "r2" | |||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | do_install() { | 13 | do_install() { |
14 | install -d ${D}${bindir} | 14 | install -d ${D}${bindir} |
15 | install -m 0755 yavta ${D}${bindir} | 15 | install -m 0755 yavta ${D}${bindir} |
16 | } | 16 | } |
17 | 17 | ||
18 | 18 | ||
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc index 00d8663cd..1fe2d04f2 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc.inc +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc | |||
@@ -21,65 +21,65 @@ PACKAGES =+ "libvlc-dbg libvlc-dev libvlc" | |||
21 | FILES_libvlc-dev = "${libdir}/lib*.so" | 21 | FILES_libvlc-dev = "${libdir}/lib*.so" |
22 | 22 | ||
23 | FILES_libvlc-dbg = "\ | 23 | FILES_libvlc-dbg = "\ |
24 | ${libdir}/.debug \ | 24 | ${libdir}/.debug \ |
25 | ${libdir}/vlc/meta_engine/.debug \ | 25 | ${libdir}/vlc/meta_engine/.debug \ |
26 | ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \ | 26 | ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \ |
27 | ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \ | 27 | ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \ |
28 | ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \ | 28 | ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \ |
29 | ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \ | 29 | ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \ |
30 | ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \ | 30 | ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \ |
31 | ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \ | 31 | ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \ |
32 | ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \ | 32 | ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \ |
33 | ${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \ | 33 | ${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \ |
34 | ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \ | 34 | ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \ |
35 | ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \ | 35 | ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \ |
36 | " | 36 | " |
37 | 37 | ||
38 | FILES_libvlc = "${libdir}/lib*.so.*" | 38 | FILES_libvlc = "${libdir}/lib*.so.*" |
39 | 39 | ||
40 | FILES_${PN} += "${bindir}/vlc \ | 40 | FILES_${PN} += "${bindir}/vlc \ |
41 | ${datadir}/applications \ | 41 | ${datadir}/applications \ |
42 | ${datadir}/vlc/ \ | 42 | ${datadir}/vlc/ \ |
43 | ${datadir}/icons \ | 43 | ${datadir}/icons \ |
44 | " | 44 | " |
45 | 45 | ||
46 | FILES_${PN}-dbg += "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug" | 46 | FILES_${PN}-dbg += "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug" |
47 | 47 | ||
48 | EXTRA_OECONF = "\ | 48 | EXTRA_OECONF = "\ |
49 | --enable-dvdread \ | 49 | --enable-dvdread \ |
50 | --enable-libtool \ | 50 | --enable-libtool \ |
51 | --with-contrib \ | 51 | --with-contrib \ |
52 | --enable-run-as-root \ | 52 | --enable-run-as-root \ |
53 | --disable-wxwidgets \ | 53 | --disable-wxwidgets \ |
54 | --enable-x11 --enable-xvideo \ | 54 | --enable-x11 --enable-xvideo \ |
55 | --disable-screen --disable-caca \ | 55 | --disable-screen --disable-caca \ |
56 | --enable-httpd --enable-vlm \ | 56 | --enable-httpd --enable-vlm \ |
57 | --enable-freetype \ | 57 | --enable-freetype \ |
58 | --enable-sdl \ | 58 | --enable-sdl \ |
59 | --enable-png \ | 59 | --enable-png \ |
60 | --enable-live555 --enable-tremor \ | 60 | --enable-live555 --enable-tremor \ |
61 | --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \ | 61 | --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \ |
62 | --enable-dbus \ | 62 | --enable-dbus \ |
63 | --disable-hal \ | 63 | --disable-hal \ |
64 | --without-contrib \ | 64 | --without-contrib \ |
65 | --without-kde-solid \ | 65 | --without-kde-solid \ |
66 | --disable-opengl --disable-glx \ | 66 | --disable-opengl --disable-glx \ |
67 | --enable-realrtsp \ | 67 | --enable-realrtsp \ |
68 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ | 68 | ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ |
69 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ | 69 | ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ |
70 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ | 70 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ |
71 | " | 71 | " |
72 | 72 | ||
73 | 73 | ||
74 | do_configure() { | 74 | do_configure() { |
75 | cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ | 75 | cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ |
76 | ./bootstrap | 76 | ./bootstrap |
77 | gnu-configize --force | 77 | gnu-configize --force |
78 | libtoolize --force | 78 | libtoolize --force |
79 | #autoreconf --force -i | 79 | #autoreconf --force -i |
80 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true | 80 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true |
81 | oe_runconf | 81 | oe_runconf |
82 | rm config.log | 82 | rm config.log |
83 | sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config | 83 | sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config |
84 | sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile | 84 | sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile |
85 | } | 85 | } |
diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc index 31dafb8c8..4d8ba9d82 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx.inc +++ b/meta-oe/recipes-multimedia/webm/libvpx.inc | |||
@@ -21,18 +21,18 @@ VPXTARGET_armv7a = "armv7-linux-gcc" | |||
21 | VPXTARGET ?= "generic-gnu" | 21 | VPXTARGET ?= "generic-gnu" |
22 | 22 | ||
23 | CONFIGUREOPTS = " \ | 23 | CONFIGUREOPTS = " \ |
24 | --target=${VPXTARGET} \ | 24 | --target=${VPXTARGET} \ |
25 | --enable-vp8 \ | 25 | --enable-vp8 \ |
26 | --enable-libs \ | 26 | --enable-libs \ |
27 | --disable-install-docs \ | 27 | --disable-install-docs \ |
28 | " | 28 | " |
29 | do_configure() { | 29 | do_configure() { |
30 | ${S}/configure ${CONFIGUREOPTS} | 30 | ${S}/configure ${CONFIGUREOPTS} |
31 | } | 31 | } |
32 | do_compile() { | 32 | do_compile() { |
33 | oe_runmake | 33 | oe_runmake |
34 | } | 34 | } |
35 | do_install() { | 35 | do_install() { |
36 | oe_runmake install DESTDIR=${D} | 36 | oe_runmake install DESTDIR=${D} |
37 | } | 37 | } |
38 | 38 | ||
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb b/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb index 878d5e25e..597d0e14c 100644 --- a/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb +++ b/meta-oe/recipes-multimedia/webm/libvpx_0.9.5.bb | |||
@@ -7,13 +7,13 @@ PR = "${INC_PR}.0" | |||
7 | SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \ | 7 | SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \ |
8 | file://do-not-hardcode-softfp-float-api.patch \ | 8 | file://do-not-hardcode-softfp-float-api.patch \ |
9 | file://CVE-2010-4203.patch \ | 9 | file://CVE-2010-4203.patch \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3" | 12 | SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3" |
13 | SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa" | 13 | SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa" |
14 | 14 | ||
15 | CONFIGUREOPTS += " \ | 15 | CONFIGUREOPTS += " \ |
16 | --prefix=${prefix} \ | 16 | --prefix=${prefix} \ |
17 | --libdir=${libdir} \ | 17 | --libdir=${libdir} \ |
18 | " | 18 | " |
19 | 19 | ||
diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb index 056c25c41..5222d1d4d 100644 --- a/meta-oe/recipes-multimedia/x264/x264_git.bb +++ b/meta-oe/recipes-multimedia/x264/x264_git.bb | |||
@@ -10,7 +10,7 @@ DEPENDS = "yasm-native" | |||
10 | 10 | ||
11 | SRC_URI = "git://git.videolan.org/x264.git \ | 11 | SRC_URI = "git://git.videolan.org/x264.git \ |
12 | file://don-t-default-to-cortex-a9-with-neon.patch \ | 12 | file://don-t-default-to-cortex-a9-with-neon.patch \ |
13 | " | 13 | " |
14 | SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" | 14 | SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" |
15 | 15 | ||
16 | PV = "r2230+git" | 16 | PV = "r2230+git" |
@@ -34,7 +34,7 @@ EXTRA_OECONF = '--prefix=${prefix} \ | |||
34 | ' | 34 | ' |
35 | 35 | ||
36 | do_configure() { | 36 | do_configure() { |
37 | ./configure ${EXTRA_OECONF} | 37 | ./configure ${EXTRA_OECONF} |
38 | } | 38 | } |
39 | 39 | ||
40 | # Get rid of -e | 40 | # Get rid of -e |
@@ -42,5 +42,5 @@ EXTRA_OEMAKE = "" | |||
42 | AS = "${TARGET_PREFIX}gcc" | 42 | AS = "${TARGET_PREFIX}gcc" |
43 | 43 | ||
44 | do_install() { | 44 | do_install() { |
45 | oe_runmake install DESTDIR=${D} | 45 | oe_runmake install DESTDIR=${D} |
46 | } | 46 | } |
diff --git a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb index cc66f2454..772079970 100644 --- a/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb +++ b/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb | |||
@@ -12,9 +12,9 @@ S = "${WORKDIR}/xpext-1.0" | |||
12 | inherit autotools pkgconfig | 12 | inherit autotools pkgconfig |
13 | 13 | ||
14 | do_configure_prepend () { | 14 | do_configure_prepend () { |
15 | cd ${S} | 15 | cd ${S} |
16 | chmod +x ./autogen.sh | 16 | chmod +x ./autogen.sh |
17 | ./autogen.sh | 17 | ./autogen.sh |
18 | } | 18 | } |
19 | 19 | ||
20 | SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896" | 20 | SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896" |