summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-multimedia
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-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-multimedia')
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/gupnp.inc4
-rw-r--r--meta-multimedia/recipes-connectivity/gupnp/no-vala.inc6
-rw-r--r--meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb54
-rw-r--r--meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb16
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb36
-rw-r--r--meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb30
-rw-r--r--meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb30
-rw-r--r--meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb8
-rw-r--r--meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb12
-rw-r--r--meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb2
13 files changed, 105 insertions, 105 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
index f79323649..b63f2232d 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
@@ -16,6 +16,6 @@ FILES_${PN}-dev += "${bindir}/gupnp-binding-tool"
16SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" 16SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"
17 17
18gupnp_sysroot_preprocess () { 18gupnp_sysroot_preprocess () {
19 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ 19 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
20 install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ 20 install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/
21} 21}
diff --git a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
index a4f3fb679..5a45cd125 100644
--- a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
+++ b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc
@@ -1,5 +1,5 @@
1do_configure_prepend () { 1do_configure_prepend () {
2 # Vala needs gobject-introspection so won't work. Instead of depending 2 # Vala needs gobject-introspection so won't work. Instead of depending
3 # on vala-native just to run configure, comment out the Vala macro. 3 # on vala-native just to run configure, comment out the Vala macro.
4 sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac 4 sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac
5} 5}
diff --git a/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
index c39acacb6..e259db678 100644
--- a/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
+++ b/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb
@@ -10,36 +10,36 @@ SRCREV = "3fc7dfa68484"
10S = "${WORKDIR}/${BPN}" 10S = "${WORKDIR}/${BPN}"
11 11
12do_configure() { 12do_configure() {
13 sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh 13 sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
14} 14}
15 15
16do_install() { 16do_install() {
17 make DESTDIR=${D} install 17 make DESTDIR=${D} install
18 install -d ${D}/${bindir} 18 install -d ${D}/${bindir}
19 install -d ${D}/${docdir}/dvb-apps 19 install -d ${D}/${docdir}/dvb-apps
20 install -d ${D}/${docdir}/dvb-apps/scan 20 install -d ${D}/${docdir}/dvb-apps/scan
21 install -d ${D}/${docdir}/dvb-apps/szap 21 install -d ${D}/${docdir}/dvb-apps/szap
22 chmod a+rx ${D}/${libdir}/*.so* 22 chmod a+rx ${D}/${libdir}/*.so*
23 23
24 # Install tests 24 # Install tests
25 install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage 25 install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage
26 install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k 26 install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k
27 install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst 27 install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst
28 install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc 28 install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc
29 install -m 0755 ${S}/test/test_sections ${D}${bindir}/ 29 install -m 0755 ${S}/test/test_sections ${D}${bindir}/
30 install -m 0755 ${S}/test/test_av_play ${D}${bindir}/ 30 install -m 0755 ${S}/test/test_av_play ${D}${bindir}/
31 install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/ 31 install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/
32 install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/ 32 install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/
33 install -m 0755 ${S}/test/test_tt ${D}${bindir}/ 33 install -m 0755 ${S}/test/test_tt ${D}${bindir}/
34 install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/ 34 install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/
35 install -m 0755 ${S}/test/test_stc ${D}${bindir}/ 35 install -m 0755 ${S}/test/test_stc ${D}${bindir}/
36 install -m 0755 ${S}/test/test_av ${D}${bindir}/ 36 install -m 0755 ${S}/test/test_av ${D}${bindir}/
37 install -m 0755 ${S}/test/test_vevent ${D}${bindir}/ 37 install -m 0755 ${S}/test/test_vevent ${D}${bindir}/
38 install -m 0755 ${S}/test/test_pes ${D}${bindir}/ 38 install -m 0755 ${S}/test/test_pes ${D}${bindir}/
39 install -m 0755 ${S}/test/test_dvr ${D}${bindir}/ 39 install -m 0755 ${S}/test/test_dvr ${D}${bindir}/
40 40
41 cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ 41 cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
42 cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ 42 cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
43} 43}
44 44
45python populate_packages_prepend () { 45python populate_packages_prepend () {
diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
index 212bca16e..7c8b95935 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
@@ -8,23 +8,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746"
8 8
9SRC_URI = "git://github.com/tvheadend/tvheadend.git \ 9SRC_URI = "git://github.com/tvheadend/tvheadend.git \
10 file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \ 10 file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \
11 " 11"
12SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe" 12SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe"
13PV = "3.3" 13PV = "3.3"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17do_configure() { 17do_configure() {
18 ./configure --prefix=${prefix} \ 18 ./configure --prefix=${prefix} \
19 --libdir=${libdir} \ 19 --libdir=${libdir} \
20 --bindir=${bindir} \ 20 --bindir=${bindir} \
21 --datadir=${datadir} \ 21 --datadir=${datadir} \
22 --arch=${TARGET_ARCH} \ 22 --arch=${TARGET_ARCH} \
23 --disable-bundle 23 --disable-bundle
24} 24}
25 25
26do_install() { 26do_install() {
27 oe_runmake install DESTDIR=${D} 27 oe_runmake install DESTDIR=${D}
28} 28}
29 29
30FILES_${PN} += "${datadir}/${BPN}" 30FILES_${PN} += "${datadir}/${BPN}"
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
index 74bf71066..605348959 100644
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
@@ -16,23 +16,23 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=eden;protocol=git \
16 file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \ 16 file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \
17 file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \ 17 file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \
18 file://configure.in-Avoid-running-code.patch \ 18 file://configure.in-Avoid-running-code.patch \
19 " 19"
20 20
21inherit autotools gettext python-dir 21inherit autotools gettext python-dir
22 22
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
25CACHED_CONFIGUREVARS += " \ 25CACHED_CONFIGUREVARS += " \
26 ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ 26 ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
27" 27"
28 28
29EXTRA_OECONF = " \ 29EXTRA_OECONF = " \
30 --disable-rpath \ 30 --disable-rpath \
31 --enable-gles \ 31 --enable-gles \
32 --enable-libusb \ 32 --enable-libusb \
33 --enable-airplay \ 33 --enable-airplay \
34 --disable-optical-drive \ 34 --disable-optical-drive \
35 --enable-external-libraries \ 35 --enable-external-libraries \
36" 36"
37 37
38FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" 38FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
@@ -48,27 +48,27 @@ export STAGING_INCDIR
48export PYTHON_DIR 48export PYTHON_DIR
49 49
50do_configure() { 50do_configure() {
51 sh bootstrap 51 sh bootstrap
52 oe_runconf 52 oe_runconf
53} 53}
54 54
55PARALLEL_MAKE = "" 55PARALLEL_MAKE = ""
56 56
57do_compile_prepend() { 57do_compile_prepend() {
58 for i in $(find . -name "Makefile") ; do 58 for i in $(find . -name "Makefile") ; do
59 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i 59 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
60 done 60 done
61 61
62 for i in $(find . -name "*.mak*" -o -name "Makefile") ; do 62 for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
63 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i 63 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
64 done 64 done
65} 65}
66 66
67INSANE_SKIP_${PN} = "rpaths" 67INSANE_SKIP_${PN} = "rpaths"
68 68
69# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly 69# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly
70do_install_append_arm() { 70do_install_append_arm() {
71 sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop 71 sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
72} 72}
73 73
74FILES_${PN} += "${datadir}/xsessions ${datadir}/icons" 74FILES_${PN} += "${datadir}/xsessions ${datadir}/icons"
@@ -81,5 +81,5 @@ RRECOMMENDS_${PN}_append = " libcec \
81 python-re \ 81 python-re \
82 python-netclient \ 82 python-netclient \
83 libcurl \ 83 libcurl \
84 " 84"
85RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850" 85RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
diff --git a/meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb b/meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb
index 210a40995..b66160d59 100644
--- a/meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb
+++ b/meta-multimedia/recipes-mkv/libebml/libebml_1.2.2.bb
@@ -7,25 +7,25 @@ SRC_URI[md5sum] = "726cc2bd1a525929ff35ff9854c0ebab"
7SRC_URI[sha256sum] = "476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5" 7SRC_URI[sha256sum] = "476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5"
8 8
9do_compile() { 9do_compile() {
10 cd ${S}/make/linux 10 cd ${S}/make/linux
11 oe_runmake CROSS="${TARGET_PREFIX}" 11 oe_runmake CROSS="${TARGET_PREFIX}"
12} 12}
13 13
14do_install() { 14do_install() {
15 cd ${S}/make/linux 15 cd ${S}/make/linux
16 16
17 install -d ${D}${libdir} 17 install -d ${D}${libdir}
18 install -m 0644 libebml.a ${D}${libdir} 18 install -m 0644 libebml.a ${D}${libdir}
19 install -m 0755 libebml.so.* ${D}${libdir} 19 install -m 0755 libebml.so.* ${D}${libdir}
20 cp -a libebml.so ${D}${libdir} 20 cp -a libebml.so ${D}${libdir}
21 21
22 install -d ${D}${includedir}/ebml 22 install -d ${D}${includedir}/ebml
23 for i in ../../ebml/*.h; do 23 for i in ../../ebml/*.h; do
24 install -m 0644 $i ${D}${includedir}/ebml 24 install -m 0644 $i ${D}${includedir}/ebml
25 done 25 done
26 26
27 install -d ${D}${includedir}/ebml/c 27 install -d ${D}${includedir}/ebml/c
28 for i in ../../ebml/c/*.h; do 28 for i in ../../ebml/c/*.h; do
29 install -m 0644 $i ${D}${includedir}/ebml/c 29 install -m 0644 $i ${D}${includedir}/ebml/c
30 done 30 done
31} 31}
diff --git a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb
index 3a3dd0e95..cedd283b1 100644
--- a/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb
+++ b/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.3.0.bb
@@ -9,25 +9,25 @@ SRC_URI[md5sum] = "f4a8c411f09d39c754eb726efd616043"
9SRC_URI[sha256sum] = "5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69" 9SRC_URI[sha256sum] = "5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69"
10 10
11do_compile() { 11do_compile() {
12 cd ${S}/make/linux 12 cd ${S}/make/linux
13 oe_runmake CROSS="${TARGET_PREFIX}" 13 oe_runmake CROSS="${TARGET_PREFIX}"
14} 14}
15 15
16do_install() { 16do_install() {
17 cd ${S}/make/linux 17 cd ${S}/make/linux
18 18
19 install -d ${D}${libdir} 19 install -d ${D}${libdir}
20 install -m 0644 libmatroska.a ${D}${libdir} 20 install -m 0644 libmatroska.a ${D}${libdir}
21 install -m 0755 libmatroska.so.* ${D}${libdir} 21 install -m 0755 libmatroska.so.* ${D}${libdir}
22 cp -a libmatroska.so ${D}${libdir} 22 cp -a libmatroska.so ${D}${libdir}
23 23
24 install -d ${D}${includedir}/matroska 24 install -d ${D}${includedir}/matroska
25 for i in ../../matroska/*.h; do 25 for i in ../../matroska/*.h; do
26 install -m 0644 $i ${D}${includedir}/matroska 26 install -m 0644 $i ${D}${includedir}/matroska
27 done 27 done
28 28
29 install -d ${D}${includedir}/matroska/c 29 install -d ${D}${includedir}/matroska/c
30 for i in ../../matroska/c/*.h; do 30 for i in ../../matroska/c/*.h; do
31 install -m 0644 $i ${D}${includedir}/matroska/c 31 install -m 0644 $i ${D}${includedir}/matroska/c
32 done 32 done
33} 33}
diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
index e7f93d2c2..13edaa95f 100644
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
@@ -13,18 +13,18 @@ SRC_URI[sha256sum] = "d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4e
13inherit autotools 13inherit autotools
14 14
15EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \ 15EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
16 " 16"
17 17
18# remove some hardcoded searchpaths 18# remove some hardcoded searchpaths
19do_configure_prepend() { 19do_configure_prepend() {
20 sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4 20 sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4
21} 21}
22 22
23# Yeah, no makefile 23# Yeah, no makefile
24do_compile() { 24do_compile() {
25 ./drake 25 ./drake
26} 26}
27 27
28do_install() { 28do_install() {
29 ./drake install DESTDIR=${D} 29 ./drake install DESTDIR=${D}
30} 30}
diff --git a/meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb b/meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb
index a76409a8a..6d81ed273 100644
--- a/meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/dleyna/media-service-upnp_0.4.0.bb
@@ -14,8 +14,8 @@ SRC_URI[sha256sum] = "9cdee47bbbfa3de5aaa5cf3fc9e208ccd97e5079f6d8fa84a6d1f24a1b
14inherit autotools 14inherit autotools
15 15
16do_install_append() { 16do_install_append() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 install -m 0755 dms-info ${D}${bindir} 18 install -m 0755 dms-info ${D}${bindir}
19} 19}
20 20
21PACKAGES =+ "${PN}-tests" 21PACKAGES =+ "${PN}-tests"
diff --git a/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb b/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
index cdce8d527..d23babe59 100644
--- a/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
+++ b/meta-multimedia/recipes-multimedia/dleyna/renderer-service-upnp_0.3.0.bb
@@ -14,8 +14,8 @@ SRC_URI[sha256sum] = "d6623d98dd35ee32bc08349b4a22d12101dda38a2ece1e468ff0160e51
14inherit autotools 14inherit autotools
15 15
16do_install_append() { 16do_install_append() {
17 install -d ${D}${bindir} 17 install -d ${D}${bindir}
18 install -m 0755 test/rendererconsole.py ${D}${bindir} 18 install -m 0755 test/rendererconsole.py ${D}${bindir}
19} 19}
20 20
21PACKAGES =+ "${PN}-tests" 21PACKAGES =+ "${PN}-tests"
diff --git a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
index e2e41ea41..595235cd2 100644
--- a/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
+++ b/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.15.3.bb
@@ -20,10 +20,10 @@ S = "${WORKDIR}/mpg123-${PV}"
20inherit autotools pkgconfig 20inherit autotools pkgconfig
21 21
22EXTRA_OECONF = " \ 22EXTRA_OECONF = " \
23 --enable-shared \ 23 --enable-shared \
24 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ 24 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
25 ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ 25 ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
26 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \
28 " 28"
29 29
diff --git a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
index 81de6e761..086339d7b 100644
--- a/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
+++ b/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
@@ -7,7 +7,7 @@ inherit cmake
7 7
8DEPENDS = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ 8DEPENDS = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \
9 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 9 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
10 " 10"
11 11
12SRC_URI = "http://kcat.strangesoft.net/openal-releases/${PN}-${PV}.tar.bz2" 12SRC_URI = "http://kcat.strangesoft.net/openal-releases/${PN}-${PV}.tar.bz2"
13SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71" 13SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71"
@@ -15,6 +15,6 @@ SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de523
15 15
16EXTRA_OECMAKE = "-DALSA=${@base_contains('DISTRO_FEATURES', 'alsa', 'TRUE', 'FALSE', d)} \ 16EXTRA_OECMAKE = "-DALSA=${@base_contains('DISTRO_FEATURES', 'alsa', 'TRUE', 'FALSE', d)} \
17 -DPULSEAUDIO=${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'TRUE', 'FALSE', d)} \ 17 -DPULSEAUDIO=${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'TRUE', 'FALSE', d)} \
18 " 18"
19 19
20FILES_${PN} += "${datadir}/openal" 20FILES_${PN} += "${datadir}/openal"
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index 200a3d823..715860b4a 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -10,7 +10,7 @@ PR = "r1"
10 10
11PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 11PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
12 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 12 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
13 " 13"
14PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," 14PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio,"
15PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," 15PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib,"
16 16