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>

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 52634c1565..a455cad659 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"
 PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
-	   file://libio.patch \
-	  "
+    file://libio.patch \
+"
 
 inherit autotools
 
 LEAD_SONAME = "libaoss.so.0"
 
 do_configure_prepend () {
-	touch NEWS README AUTHORS ChangeLog
-	sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in
+    touch NEWS README AUTHORS ChangeLog
+    sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in
 }
 
 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 d5cfb3f087..ee4a7b1520 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 = " \
     --disable-artstest \
 "
 do_configure_prepend() {
-	sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac
+    sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac
 }
 
 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 a0b0935e08..6818413b4e 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"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/id3lib/id3lib-${PV}.tar.gz;name=archive \
            http://ftp.de.debian.org/debian/pool/main/i/id3lib3.8.3/id3lib3.8.3_3.8.3-7.2.diff.gz;name=patch \
-          "
+"
 SRC_URI[archive.md5sum] = "19f27ddd2dda4b2d26a559a4f0f402a7"
 SRC_URI[archive.sha256sum] = "2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079"
 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 111c61ed7b..e3d5e7e336 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c030468238b2cf89925a57f2780396a7 \
                     file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LGPL;md5=e77fe93202736b47c07035910f47974a \
-                   "
+"
 
 
 DEPENDS = "alsa-lib"
@@ -18,7 +18,7 @@ SRCREV = "4484"
 SRC_URI = "svn://subversion.jackaudio.org/jack/tags;module=RELEASE_${SVNPV};protocol=http \
            file://remove-wrong-host-test.patch \
            file://jack_fix_TWL4030_alsa_capture.patch \
-          "
+"
 
 S = "${WORKDIR}/RELEASE_${SVNPV}"
 
diff --git a/meta-oe/recipes-multimedia/libass/libass.inc b/meta-oe/recipes-multimedia/libass/libass.inc
index 28d6caafd4..4dd5181df9 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"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = " \
-	--enable-enca \
-	--enable-fontconfig \
-	--enable-png \
+    --enable-enca \
+    --enable-fontconfig \
+    --enable-png \
 "
 
 PACKAGES =+ "${PN}-tests"
 
 FILES_${PN}-tests = " \
-	${libdir}/test/test \
+    ${libdir}/test/test \
 "
diff --git a/meta-oe/recipes-multimedia/libav/libav.inc b/meta-oe/recipes-multimedia/libav/libav.inc
index 54307afda5..6e91061d0c 100644
--- a/meta-oe/recipes-multimedia/libav/libav.inc
+++ b/meta-oe/recipes-multimedia/libav/libav.inc
@@ -15,10 +15,10 @@ INC_PR = "r8"
 
 inherit autotools pkgconfig
 
-#        --enable-libgsm
-#        --enable-libmp3lame
-#        --enable-libschroedinger
-#        --enable-libvpx
+#    --enable-libgsm
+#    --enable-libmp3lame
+#    --enable-libschroedinger
+#    --enable-libvpx
 
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
@@ -29,28 +29,28 @@ EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
 EXTRA_FFCONF ?= ""
 
 EXTRA_OECONF = " \
-        --enable-shared \
-        --enable-pthreads \
-        --enable-gpl \
-        --enable-avfilter \
-        \
-        --cross-prefix=${TARGET_PREFIX} \
-        --prefix=${prefix} \
-        \
-        --enable-avserver \
-        --enable-avplay \
-        --enable-x11grab \
-        --enable-libtheora  \
-        --enable-libvorbis \
-        --enable-libx264 \
-        --arch=${TARGET_ARCH} \
-        --target-os="linux" \
-        --enable-cross-compile \
-        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
-        --sysroot="${STAGING_DIR_TARGET}" \
-        --enable-hardcoded-tables \
-        ${EXTRA_FFCONF} \
+    --enable-shared \
+    --enable-pthreads \
+    --enable-gpl \
+    --enable-avfilter \
+    \
+    --cross-prefix=${TARGET_PREFIX} \
+    --prefix=${prefix} \
+    \
+    --enable-avserver \
+    --enable-avplay \
+    --enable-x11grab \
+    --enable-libtheora  \
+    --enable-libvorbis \
+    --enable-libx264 \
+    --arch=${TARGET_ARCH} \
+    --target-os="linux" \
+    --enable-cross-compile \
+    --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+    --extra-ldflags="${TARGET_LDFLAGS}" \
+    --sysroot="${STAGING_DIR_TARGET}" \
+    --enable-hardcoded-tables \
+    ${EXTRA_FFCONF} \
 "
 
 #| yasm not found, use --disable-yasm for a crippled build
@@ -58,16 +58,16 @@ EXTRA_OECONF_append_x86-64 = " --disable-yasm"
 EXTRA_OECONF_append_x86 = " --disable-yasm"
 
 do_configure() {
-	# We don't have TARGET_PREFIX-pkgconfig
-	sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure
-	mkdir -p ${B}
-	cd ${B}
-	${S}/configure ${EXTRA_OECONF}
-	sed -i -e s:Os:O4:g ${B}/config.h
+    # We don't have TARGET_PREFIX-pkgconfig
+    sed -i '/pkg_config_default="${cross_prefix}${pkg_config_default}"/d' ${S}/configure
+    mkdir -p ${B}
+    cd ${B}
+    ${S}/configure ${EXTRA_OECONF}
+    sed -i -e s:Os:O4:g ${B}/config.h
 }
 
 do_install_append() {
-	install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
+    install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
 }
 
 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 ebab2c10f2..b48ae96add 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 @@
 require libav.inc
 
 EXTRA_OECONF += " \
-        --enable-postproc \
+    --enable-postproc \
 "
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/libav-0.8.4:"
 
 SRC_URI_append = " \
-          file://0001-configure-enable-pic-for-AArch64.patch \
+    file://0001-configure-enable-pic-for-AArch64.patch \
 "
 LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     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 f65270dcff..30289856ea 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"
 
 # NOTE: autotools_stage_all does nothing here, we need to do it manually
 do_install_append() {
-	install -d ${D}${includedir}/libmodplug
-	install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug
-	install -m 0644 ${S}/src/modplug.h ${D}${includedir}/
+    install -d ${D}${includedir}/libmodplug
+    install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug
+    install -m 0644 ${S}/src/modplug.h ${D}${includedir}/
 }
 
diff --git a/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb b/meta-oe/recipes-multimedia/libpostproc/libpostproc_git.bb
index 1520628495..b39f20815d 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"
 EXTRA_FFCONF ?= ""
 
 EXTRA_OECONF = " \
-        --enable-shared \
-        --enable-pthreads \
-        --enable-gpl \
-        --enable-postproc \
-        \
-        --cross-prefix=${TARGET_PREFIX} \
-        --prefix=${prefix} \
-        \
-        --arch=${TARGET_ARCH} \
-        --target-os="linux" \
-        --enable-cross-compile \
-        --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
-        --extra-ldflags="${TARGET_LDFLAGS}" \
-        --sysroot="${STAGING_DIR_TARGET}" \
-        ${EXTRA_FFCONF} \
+    --enable-shared \
+    --enable-pthreads \
+    --enable-gpl \
+    --enable-postproc \
+    \
+    --cross-prefix=${TARGET_PREFIX} \
+    --prefix=${prefix} \
+    \
+    --arch=${TARGET_ARCH} \
+    --target-os="linux" \
+    --enable-cross-compile \
+    --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
+    --extra-ldflags="${TARGET_LDFLAGS}" \
+    --sysroot="${STAGING_DIR_TARGET}" \
+    ${EXTRA_FFCONF} \
 "
 
 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 ccc3d40030..4317d9369d 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"
 EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
 
 do_configure_prepend() {
-	# Removing this file fixes a libtool version mismatch.
-	rm -f acinclude/libtool.m4
-	rm -f acinclude/sdl.m4
-	rm -f acinclude/pkg.m4
-	rm -f acinclude/lt~obsolete.m4
-	rm -f acinclude/ltoptions.m4
-	rm -f acinclude/ltsugar.m4
-	rm -f acinclude/ltversion.m4
+    # Removing this file fixes a libtool version mismatch.
+    rm -f acinclude/libtool.m4
+    rm -f acinclude/sdl.m4
+    rm -f acinclude/pkg.m4
+    rm -f acinclude/lt~obsolete.m4
+    rm -f acinclude/ltoptions.m4
+    rm -f acinclude/ltsugar.m4
+    rm -f acinclude/ltversion.m4
 }
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 c8fa6ca468..00c7ec8c06 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"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
            file://configure.patch \
-          "
+"
 
 SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
 SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
@@ -19,20 +19,20 @@ EXTRA_AUTORECONF += "--include=acinclude"
 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}"
 
 do_configure () {
-	# Remove old libtool macros.
-	MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-	for i in ${MACROS}; do
-		rm -f acinclude/$i
-	done
-	cp build-scripts/* . || true
-	rm -rf build-scripts/
-	export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
-
-	autotools_do_configure
-
-	rm config.log
-	for i in $(find -name "Makefile") ; do
-		sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
-	done
+    # Remove old libtool macros.
+    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+    for i in ${MACROS}; do
+        rm -f acinclude/$i
+    done
+    cp build-scripts/* . || true
+    rm -rf build-scripts/
+    export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
+
+    autotools_do_configure
+
+    rm config.log
+    for i in $(find -name "Makefile") ; do
+        sed -i -e 's:-L/usr/lib:-L${STAGING_LIBDIR}:g' $i
+    done
 }
 
diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc
index 443f818182..966224d7f5 100644
--- a/meta-oe/recipes-multimedia/live555/live555.inc
+++ b/meta-oe/recipes-multimedia/live555/live555.inc
@@ -19,36 +19,36 @@ S = "${WORKDIR}/live"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_configure() {
-	cp ${WORKDIR}/config.linux-cross .
-	echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross
-	./genMakefiles linux-cross
+    cp ${WORKDIR}/config.linux-cross .
+    echo "COMPILE_OPTS+=" -fPIC "" >> config.linux-cross
+    ./genMakefiles linux-cross
 }
 
 do_compile() {
-	make
+    make
 }
 
 do_install() {
-	install -d ${D}${includedir}/BasicUsageEnvironment
-	install -d ${D}${includedir}/groupsock
-	install -d ${D}${includedir}/liveMedia
-	install -d ${D}${includedir}/UsageEnvironment
-	install -d ${D}${libdir}
-	cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
-	cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
-	cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
-	cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
-	cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
-	# Find all the headers
-	for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
-		install ${i} ${D}${includedir}
-	done
-	cp ${S}/*/*.a ${D}${libdir}
-	install -d ${D}${bindir}
-	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
-		install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
-	done
-	install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
+    install -d ${D}${includedir}/BasicUsageEnvironment
+    install -d ${D}${includedir}/groupsock
+    install -d ${D}${includedir}/liveMedia
+    install -d ${D}${includedir}/UsageEnvironment
+    install -d ${D}${libdir}
+    cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/
+    cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/
+    cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/
+    cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/
+    cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/
+    # Find all the headers
+    for i in $(find . -name "*.hh") $(find . -name "*.h") ; do
+        install ${i} ${D}${includedir}
+    done
+    cp ${S}/*/*.a ${D}${libdir}
+    install -d ${D}${bindir}
+    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
+        install -m 0755 ${S}/testProgs/${i} ${D}${bindir}/
+    done
+    install -m 0755 ${S}/mediaServer/live555MediaServer ${D}${bindir}/
 }
 
 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 af5b5ffe09..efef5d2257 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"
 DEPENDS = "alsa-lib"
 
 SRC_URI = "\
-  ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
-  file://m4.patch \
-  file://autofoo.patch \
-  file://ldflags.patch \
-  file://CVE-2010-2971.patch \
-  file://obsolete_automake_macros.patch \
+    ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
+    file://m4.patch \
+    file://autofoo.patch \
+    file://ldflags.patch \
+    file://CVE-2010-2971.patch \
+    file://obsolete_automake_macros.patch \
 "
 
 SRC_URI[md5sum] = "9f3c740298260d5f88981fc0d51f6f16"
@@ -20,13 +20,13 @@ SRC_URI[sha256sum] = "891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01
 inherit autotools binconfig lib_package
 
 EXTRA_OECONF = "\
-  --disable-af \
-  --enable-alsa \
-  --disable-esd \
-  --enable-oss \
-  --disable-sam9407 \
-  --disable-ultra \
-  --disable-esdtest \
-  --enable-threads \
+    --disable-af \
+    --enable-alsa \
+    --disable-esd \
+    --enable-oss \
+    --disable-sam9407 \
+    --disable-ultra \
+    --disable-esdtest \
+    --enable-threads \
 "
 
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
index 889bb95227..9a42b82d62 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"
 
 # Yes, really /usr/etc!!!
 do_install() {
-	install -d "${D}/usr${sysconfdir}/mplayer"
+    install -d "${D}/usr${sysconfdir}/mplayer"
 
-	install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer"
+    install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr${sysconfdir}/mplayer"
 }
 
 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 0dfc1ed99b..2e04d3c73a 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/"
 DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
            libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
            libxv virtual/libx11 libass speex faad2 \
-	   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
+       ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 
 RDEPENDS_${PN} = "mplayer-common"
 PROVIDES = "mplayer"
@@ -33,100 +33,100 @@ FILES_${PN} = "${bindir}/mplayer ${libdir} /usr/etc/mplayer/"
 CONFFILES_${PN} += "/usr/etc/mplayer/input.conf \
                     /usr/etc/mplayer/example.conf \
                     /usr/etc/mplayer/codecs.conf \
-                   "
+"
 
 inherit autotools pkgconfig
 
 EXTRA_OECONF = " \
-	--prefix=/usr \
-	--mandir=${mandir} \
-	--target=${SIMPLE_TARGET_SYS} \
-	\
-	--disable-lirc \
-	--disable-lircc \
-	--disable-joystick \
-	--disable-vm \
-	--disable-xf86keysym \
-	--enable-tv \
-	--disable-tv-v4l1 \	 
-	--enable-tv-v4l2 \
-	--disable-tv-bsdbt848 \
-	--enable-rtc \
-	--enable-networking \
-	--disable-smb \
-	--enable-live \
-	--disable-dvdnav \
-	--enable-dvdread \
-	--disable-dvdread-internal \
-	--disable-libdvdcss-internal \
-	--disable-cdparanoia \
-	--enable-freetype \
-	--enable-sortsub \
-	--disable-fribidi \
-	--disable-enca \
-	--disable-ftp \
-	--disable-vstream \
-	\
-	--disable-gif \
-	--enable-png \
-	--enable-jpeg \
-	--disable-libcdio \
-	--disable-qtx \
-	--disable-xanim \
-	--disable-real \
-	--disable-xvid \
-	\
-	--enable-speex \
-	--enable-theora \
-	--disable-ladspa \
-	--disable-libdv \
-	--enable-mad \
-	--disable-xmms \
-	--disable-musepack \
-	\
-	--disable-gl \
-	--disable-vesa \
-	--disable-svga \
-	--enable-sdl \
-	--disable-aa \
-	--disable-caca \
-	--disable-ggi \
-	--disable-ggiwmh \
-	--disable-directx \
-	--disable-dxr3 \
-	--disable-dvb \
-	--disable-mga \
-	--disable-xmga \
-	--enable-xv \
-	--disable-vm \
-	--disable-xinerama \
-	--enable-x11 \
-	--enable-fbdev \
-	--disable-3dfx \
-	--disable-tdfxfb \
-	--disable-s3fb \
-	--disable-directfb \
-	--disable-bl \
-	--disable-tdfxvid \
-	--disable-tga \
-	--disable-pnm \
-	--disable-md5sum \
-	\
-	--enable-alsa \
-	--enable-ossaudio \
-	--disable-arts \
-	--disable-esd \
-	--disable-pulse \
-	--disable-jack \
-	--disable-openal \
-	--disable-nas \
-	--disable-sgiaudio \
-	--disable-sunaudio \
-	--disable-win32waveout \
-	--enable-select \
-	--enable-libass \
-	\
-	--extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \
+    --prefix=/usr \
+    --mandir=${mandir} \
+    --target=${SIMPLE_TARGET_SYS} \
+    \
+    --disable-lirc \
+    --disable-lircc \
+    --disable-joystick \
+    --disable-vm \
+    --disable-xf86keysym \
+    --enable-tv \
+    --disable-tv-v4l1 \     
+    --enable-tv-v4l2 \
+    --disable-tv-bsdbt848 \
+    --enable-rtc \
+    --enable-networking \
+    --disable-smb \
+    --enable-live \
+    --disable-dvdnav \
+    --enable-dvdread \
+    --disable-dvdread-internal \
+    --disable-libdvdcss-internal \
+    --disable-cdparanoia \
+    --enable-freetype \
+    --enable-sortsub \
+    --disable-fribidi \
+    --disable-enca \
+    --disable-ftp \
+    --disable-vstream \
+    \
+    --disable-gif \
+    --enable-png \
+    --enable-jpeg \
+    --disable-libcdio \
+    --disable-qtx \
+    --disable-xanim \
+    --disable-real \
+    --disable-xvid \
+    \
+    --enable-speex \
+    --enable-theora \
+    --disable-ladspa \
+    --disable-libdv \
+    --enable-mad \
+    --disable-xmms \
+    --disable-musepack \
+    \
+    --disable-gl \
+    --disable-vesa \
+    --disable-svga \
+    --enable-sdl \
+    --disable-aa \
+    --disable-caca \
+    --disable-ggi \
+    --disable-ggiwmh \
+    --disable-directx \
+    --disable-dxr3 \
+    --disable-dvb \
+    --disable-mga \
+    --disable-xmga \
+    --enable-xv \
+    --disable-vm \
+    --disable-xinerama \
+    --enable-x11 \
+    --enable-fbdev \
+    --disable-3dfx \
+    --disable-tdfxfb \
+    --disable-s3fb \
+    --disable-directfb \
+    --disable-bl \
+    --disable-tdfxvid \
+    --disable-tga \
+    --disable-pnm \
+    --disable-md5sum \
+    \
+    --enable-alsa \
+    --enable-ossaudio \
+    --disable-arts \
+    --disable-esd \
+    --disable-pulse \
+    --disable-jack \
+    --disable-openal \
+    --disable-nas \
+    --disable-sgiaudio \
+    --disable-sunaudio \
+    --disable-win32waveout \
+    --enable-select \
+    --enable-libass \
+    \
+    --extra-libs=' -lXext -lX11 -lBasicUsageEnvironment -lUsageEnvironment -lgroupsock -lliveMedia -lstdc++ -lvorbis ' \
 "
 
 EXTRA_OECONF_append_armv6 = " --enable-armv6"
@@ -138,25 +138,25 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
 CFLAGS_append = " -I${S}/libdvdread4 "
 
 do_configure() {
-	sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
-	sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
-	sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
-	sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
-	sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
-	sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
-
-	export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
-	./configure ${EXTRA_OECONF}
-	
+    sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
+    sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
+    sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
+    sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
+    sed -i 's|_install_strip="-s"|_install_strip=""|g' ${S}/configure
+    sed -i 's|HOST_CC|BUILD_CC|' ${S}/Makefile
+
+    export SIMPLE_TARGET_SYS="$(echo ${TARGET_SYS} | sed s:${TARGET_VENDOR}::g)"
+    ./configure ${EXTRA_OECONF}
+    
 }
 
 do_compile () {
-	oe_runmake
+    oe_runmake
 }
 
 do_install_append() {
-        install -d ${D}/usr/etc/mplayer
-        install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
-        install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
-        install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
+    install -d ${D}/usr/etc/mplayer
+    install ${S}/etc/input.conf ${D}/usr/etc/mplayer/
+    install ${S}/etc/example.conf ${D}/usr/etc/mplayer/
+    install ${S}/etc/codecs.conf ${D}/usr/etc/mplayer/
 }
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 4c17737423..7ceab7b5b8 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"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}_${PV}_src.tar.gz \
     file://search-for-headers-in-staging-dir.patch \
     file://fix-makefile.patch \
-    "
+"
 
 SRC_URI[md5sum] = "d966256baf2f9b068b9de871ab5dade5"
 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 ce5c5e1fcb..91a4ab8cd3 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
 PROVIDES = "libv4l"
 
 SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \
-          "
+"
 # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag
 SRCREV = "0298efdcd1153b8f719b9164548a3f0546f0cb7c"
 
@@ -22,10 +22,10 @@ S = "${WORKDIR}/git"
 EXTRA_OECONF = "--disable-qv4l2 --enable-shared" 
 
 do_configure() {
-	# autotools_do_configure fails with:
-	# | configure.ac:139: error: required file 'build-aux/config.rpath' not found
-	autoreconf -vfi 
-	oe_runconf
+    # autotools_do_configure fails with:
+    # | configure.ac:139: error: required file 'build-aux/config.rpath' not found
+    autoreconf -vfi 
+    oe_runconf
 }
 
 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 d007bcb609..98b5e0efbd 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"
 S = "${WORKDIR}/git"
 
 do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 yavta ${D}${bindir}
+    install -d ${D}${bindir}
+    install -m 0755 yavta ${D}${bindir}
 }
 
 
diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index 00d8663cd4..1fe2d04f21 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"
 FILES_libvlc-dev = "${libdir}/lib*.so"
 
 FILES_libvlc-dbg = "\
-	${libdir}/.debug \
-	${libdir}/vlc/meta_engine/.debug \
-	${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
-	${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
-	${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
-	${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
-	${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
-	${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
-	${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
-	${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \
-	${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
-	${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
-	"
+    ${libdir}/.debug \
+    ${libdir}/vlc/meta_engine/.debug \
+    ${libdir}/vlc/audio_filter/.debug ${libdir}/vlc/audio_output/.debug \
+    ${libdir}/vlc/demux/.debug ${libdir}/vlc/control/.debug \
+    ${libdir}/vlc/gui/.debug ${libdir}/vlc/packetizer/.debug \
+    ${libdir}/vlc/audio_mixer/.debug ${libdir}/vlc/stream_out/.debug \
+    ${libdir}/vlc/mux/.debug ${libdir}/vlc/access/.debug \
+    ${libdir}/vlc/visualization/.debug ${libdir}/vlc/access_filter/.debug \
+    ${libdir}/vlc/access_output/.debug ${libdir}/vlc/video_output/.debug \
+    ${libdir}/vlc/services_discovery/.debug ${libdir}/vlc/video_chroma/.debug \
+    ${libdir}/vlc/video_codec/.debug ${libdir}/vlc/video_filter/.debug \
+    ${libdir}/vlc/misc/.debug ${libdir}/vlc/codec/.debug \
+"
 
 FILES_libvlc = "${libdir}/lib*.so.*"
 
 FILES_${PN} += "${bindir}/vlc \
-	${datadir}/applications \
-	${datadir}/vlc/ \
-	${datadir}/icons \
-	"
+    ${datadir}/applications \
+    ${datadir}/vlc/ \
+    ${datadir}/icons \
+"
 
-FILES_${PN}-dbg	+= "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug"
+FILES_${PN}-dbg    += "${libdir}/vlc/*/.debug ${libdir}/vlc/plugins/*/.debug"
 
 EXTRA_OECONF = "\
-	--enable-dvdread \
-	--enable-libtool \
-	--with-contrib \
-	--enable-run-as-root \
-	--disable-wxwidgets \
-	--enable-x11 --enable-xvideo \ 
-	--disable-screen --disable-caca \
-	--enable-httpd --enable-vlm \
-	--enable-freetype \
-	--enable-sdl \ 
-	--enable-png \
-	--enable-live555 --enable-tremor \
-	--enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \
-	--enable-dbus \
-	--disable-hal \	
-	--without-contrib \
-	--without-kde-solid \
-	--disable-opengl --disable-glx \
-	--enable-realrtsp \
-	ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
-	ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
-	ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
+    --enable-dvdread \
+    --enable-libtool \
+    --with-contrib \
+    --enable-run-as-root \
+    --disable-wxwidgets \
+    --enable-x11 --enable-xvideo \ 
+    --disable-screen --disable-caca \
+    --enable-httpd --enable-vlm \
+    --enable-freetype \
+    --enable-sdl \ 
+    --enable-png \
+    --enable-live555 --enable-tremor \
+    --enable-v4l2 --enable-v4l --disable-aa --enable-wma --disable-faad \
+    --enable-dbus \
+    --disable-hal \    
+    --without-contrib \
+    --without-kde-solid \
+    --disable-opengl --disable-glx \
+    --enable-realrtsp \
+    ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
+    ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
+    ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
 "
 
 
 do_configure() {
-	cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
-	./bootstrap	
-	gnu-configize --force
-	libtoolize --force
-	#autoreconf --force -i
-	cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
-	oe_runconf
-	rm config.log
-	sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
-	sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
+    cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 
+    ./bootstrap    
+    gnu-configize --force
+    libtoolize --force
+    #autoreconf --force -i
+    cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
+    oe_runconf
+    rm config.log
+    sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}/:g vlc-config
+    sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${S}/include\ -DSYS_LINUX:g ${S}/modules/gui/qt4/Makefile
 }
diff --git a/meta-oe/recipes-multimedia/webm/libvpx.inc b/meta-oe/recipes-multimedia/webm/libvpx.inc
index 31dafb8c8c..4d8ba9d825 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"
 VPXTARGET ?= "generic-gnu"
 
 CONFIGUREOPTS = " \
-          --target=${VPXTARGET} \
-          --enable-vp8 \
-          --enable-libs \
-          --disable-install-docs \
+    --target=${VPXTARGET} \
+    --enable-vp8 \
+    --enable-libs \
+    --disable-install-docs \
 "
 do_configure() {
-	${S}/configure ${CONFIGUREOPTS}
+    ${S}/configure ${CONFIGUREOPTS}
 }
 do_compile() {
-	oe_runmake
+    oe_runmake
 }
 do_install() {
-	oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D}
 }
 
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 878d5e25e3..597d0e14ce 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"
 SRC_URI += "file://libvpx-configure-support-blank-prefix.patch \
             file://do-not-hardcode-softfp-float-api.patch \
             file://CVE-2010-4203.patch \
-            "
+"
 
 SRC_URI[md5sum] = "4bf2f2c76700202c1fe9201fcb0680e3"
 SRC_URI[sha256sum] = "2e93968afcded113a7e218de047feecf6659a089058803a9e40fb687de5f9bfa"
 
 CONFIGUREOPTS += " \
-        --prefix=${prefix} \
-        --libdir=${libdir} \
+    --prefix=${prefix} \
+    --libdir=${libdir} \
 "
 
diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb
index 056c25c41b..5222d1d4d6 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"
 
 SRC_URI = "git://git.videolan.org/x264.git \
     file://don-t-default-to-cortex-a9-with-neon.patch \
-    "
+"
 SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7"
 
 PV = "r2230+git"
@@ -34,7 +34,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
                '
 
 do_configure() {
-	./configure ${EXTRA_OECONF}
+    ./configure ${EXTRA_OECONF}
 }
 
 # Get rid of -e
@@ -42,5 +42,5 @@ EXTRA_OEMAKE = ""
 AS = "${TARGET_PREFIX}gcc"
 
 do_install() {
-	oe_runmake install DESTDIR=${D}
+    oe_runmake install DESTDIR=${D}
 }
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 cc66f2454a..7720799701 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"
 inherit autotools pkgconfig
 
 do_configure_prepend () {
-  cd ${S}
-  chmod +x ./autogen.sh
-  ./autogen.sh
+    cd ${S}
+    chmod +x ./autogen.sh
+    ./autogen.sh
 }
 
 SRC_URI[md5sum] = "1b0cb67b6f2bd7c4abef17648b062896"