diff options
Diffstat (limited to 'meta-multimedia')
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 f793236494..b63f2232dd 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" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" gupnp_sysroot_preprocess () { - install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } diff --git a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc index a4f3fb6792..5a45cd1250 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc @@ -1,5 +1,5 @@ do_configure_prepend () { - # Vala needs gobject-introspection so won't work. Instead of depending - # on vala-native just to run configure, comment out the Vala macro. - sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac + # Vala needs gobject-introspection so won't work. Instead of depending + # on vala-native just to run configure, comment out the Vala macro. + sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac } 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 c39acacb66..e259db678c 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" S = "${WORKDIR}/${BPN}" do_configure() { - sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh + sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh } do_install() { - make DESTDIR=${D} install - install -d ${D}/${bindir} - install -d ${D}/${docdir}/dvb-apps - install -d ${D}/${docdir}/dvb-apps/scan - install -d ${D}/${docdir}/dvb-apps/szap - chmod a+rx ${D}/${libdir}/*.so* - - # Install tests - install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage - install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k - install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst - install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc - install -m 0755 ${S}/test/test_sections ${D}${bindir}/ - install -m 0755 ${S}/test/test_av_play ${D}${bindir}/ - install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/ - install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/ - install -m 0755 ${S}/test/test_tt ${D}${bindir}/ - install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/ - install -m 0755 ${S}/test/test_stc ${D}${bindir}/ - install -m 0755 ${S}/test/test_av ${D}${bindir}/ - install -m 0755 ${S}/test/test_vevent ${D}${bindir}/ - install -m 0755 ${S}/test/test_pes ${D}${bindir}/ - install -m 0755 ${S}/test/test_dvr ${D}${bindir}/ - - cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ - cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ + make DESTDIR=${D} install + install -d ${D}/${bindir} + install -d ${D}/${docdir}/dvb-apps + install -d ${D}/${docdir}/dvb-apps/scan + install -d ${D}/${docdir}/dvb-apps/szap + chmod a+rx ${D}/${libdir}/*.so* + + # Install tests + install -m 0755 ${S}/test/setvoltage ${D}${bindir}/test_setvoltage + install -m 0755 ${S}/test/set22k ${D}${bindir}/test_set22k + install -m 0755 ${S}/test/sendburst ${D}${bindir}/test_sendburst + install -m 0755 ${S}/test/diseqc ${D}${bindir}/test_diseqc + install -m 0755 ${S}/test/test_sections ${D}${bindir}/ + install -m 0755 ${S}/test/test_av_play ${D}${bindir}/ + install -m 0755 ${S}/test/test_stillimage ${D}${bindir}/ + install -m 0755 ${S}/test/test_dvr_play ${D}${bindir}/ + install -m 0755 ${S}/test/test_tt ${D}${bindir}/ + install -m 0755 ${S}/test/test_sec_ne ${D}${bindir}/ + install -m 0755 ${S}/test/test_stc ${D}${bindir}/ + install -m 0755 ${S}/test/test_av ${D}${bindir}/ + install -m 0755 ${S}/test/test_vevent ${D}${bindir}/ + install -m 0755 ${S}/test/test_pes ${D}${bindir}/ + install -m 0755 ${S}/test/test_dvr ${D}${bindir}/ + + cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ + cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ } python populate_packages_prepend () { diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index 212bca16e3..7c8b959352 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" SRC_URI = "git://github.com/tvheadend/tvheadend.git \ file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \ - " +" SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe" PV = "3.3" S = "${WORKDIR}/git" do_configure() { - ./configure --prefix=${prefix} \ - --libdir=${libdir} \ - --bindir=${bindir} \ - --datadir=${datadir} \ - --arch=${TARGET_ARCH} \ - --disable-bundle + ./configure --prefix=${prefix} \ + --libdir=${libdir} \ + --bindir=${bindir} \ + --datadir=${datadir} \ + --arch=${TARGET_ARCH} \ + --disable-bundle } do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} } FILES_${PN} += "${datadir}/${BPN}" diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb index 74bf710667..6053489597 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 \ file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \ file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \ file://configure.in-Avoid-running-code.patch \ - " +" inherit autotools gettext python-dir S = "${WORKDIR}/git" CACHED_CONFIGUREVARS += " \ - ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ + ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \ " EXTRA_OECONF = " \ - --disable-rpath \ - --enable-gles \ - --enable-libusb \ - --enable-airplay \ - --disable-optical-drive \ - --enable-external-libraries \ + --disable-rpath \ + --enable-gles \ + --enable-libusb \ + --enable-airplay \ + --disable-optical-drive \ + --enable-external-libraries \ " FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" @@ -48,27 +48,27 @@ export STAGING_INCDIR export PYTHON_DIR do_configure() { - sh bootstrap - oe_runconf + sh bootstrap + oe_runconf } PARALLEL_MAKE = "" do_compile_prepend() { - for i in $(find . -name "Makefile") ; do - sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i - done + for i in $(find . -name "Makefile") ; do + sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i + done - for i in $(find . -name "*.mak*" -o -name "Makefile") ; do - sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i - done + for i in $(find . -name "*.mak*" -o -name "Makefile") ; do + sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i + done } INSANE_SKIP_${PN} = "rpaths" # on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly do_install_append_arm() { - sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop + sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop } FILES_${PN} += "${datadir}/xsessions ${datadir}/icons" @@ -81,5 +81,5 @@ RRECOMMENDS_${PN}_append = " libcec \ python-re \ python-netclient \ libcurl \ - " +" RRECOMMENDS_${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 210a409953..b66160d593 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" SRC_URI[sha256sum] = "476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5" do_compile() { - cd ${S}/make/linux - oe_runmake CROSS="${TARGET_PREFIX}" + cd ${S}/make/linux + oe_runmake CROSS="${TARGET_PREFIX}" } do_install() { - cd ${S}/make/linux + cd ${S}/make/linux - install -d ${D}${libdir} - install -m 0644 libebml.a ${D}${libdir} - install -m 0755 libebml.so.* ${D}${libdir} - cp -a libebml.so ${D}${libdir} + install -d ${D}${libdir} + install -m 0644 libebml.a ${D}${libdir} + install -m 0755 libebml.so.* ${D}${libdir} + cp -a libebml.so ${D}${libdir} - install -d ${D}${includedir}/ebml - for i in ../../ebml/*.h; do - install -m 0644 $i ${D}${includedir}/ebml - done + install -d ${D}${includedir}/ebml + for i in ../../ebml/*.h; do + install -m 0644 $i ${D}${includedir}/ebml + done - install -d ${D}${includedir}/ebml/c - for i in ../../ebml/c/*.h; do - install -m 0644 $i ${D}${includedir}/ebml/c - done + install -d ${D}${includedir}/ebml/c + for i in ../../ebml/c/*.h; do + install -m 0644 $i ${D}${includedir}/ebml/c + done } 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 3a3dd0e957..cedd283b13 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" SRC_URI[sha256sum] = "5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69" do_compile() { - cd ${S}/make/linux - oe_runmake CROSS="${TARGET_PREFIX}" + cd ${S}/make/linux + oe_runmake CROSS="${TARGET_PREFIX}" } do_install() { - cd ${S}/make/linux + cd ${S}/make/linux - install -d ${D}${libdir} - install -m 0644 libmatroska.a ${D}${libdir} - install -m 0755 libmatroska.so.* ${D}${libdir} - cp -a libmatroska.so ${D}${libdir} + install -d ${D}${libdir} + install -m 0644 libmatroska.a ${D}${libdir} + install -m 0755 libmatroska.so.* ${D}${libdir} + cp -a libmatroska.so ${D}${libdir} - install -d ${D}${includedir}/matroska - for i in ../../matroska/*.h; do - install -m 0644 $i ${D}${includedir}/matroska - done + install -d ${D}${includedir}/matroska + for i in ../../matroska/*.h; do + install -m 0644 $i ${D}${includedir}/matroska + done - install -d ${D}${includedir}/matroska/c - for i in ../../matroska/c/*.h; do - install -m 0644 $i ${D}${includedir}/matroska/c - done + install -d ${D}${includedir}/matroska/c + for i in ../../matroska/c/*.h; do + install -m 0644 $i ${D}${includedir}/matroska/c + done } 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 e7f93d2c28..13edaa95f7 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 inherit autotools EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \ - " +" # remove some hardcoded searchpaths do_configure_prepend() { - sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4 + sed -i -e s:/usr/local/lib:${STAGING_LIBDIR}:g -e s:/usr/local/include:${STAGING_INCDIR}:g ac/ebml.m4 } # Yeah, no makefile do_compile() { - ./drake + ./drake } do_install() { - ./drake install DESTDIR=${D} + ./drake install DESTDIR=${D} } 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 a76409a8a1..6d81ed2736 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 inherit autotools do_install_append() { - install -d ${D}${bindir} - install -m 0755 dms-info ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 dms-info ${D}${bindir} } PACKAGES =+ "${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 cdce8d5275..d23babe595 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 inherit autotools do_install_append() { - install -d ${D}${bindir} - install -m 0755 test/rendererconsole.py ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 test/rendererconsole.py ${D}${bindir} } PACKAGES =+ "${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 e2e41ea412..595235cd2f 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}" inherit autotools pkgconfig EXTRA_OECONF = " \ - --enable-shared \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \ - " + --enable-shared \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '--with-default-audio=alsa', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '--with-default-audio=pulse', '', d)} \ +" 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 81de6e761e..086339d7b5 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 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa-lib', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - " +" SRC_URI = "http://kcat.strangesoft.net/openal-releases/${PN}-${PV}.tar.bz2" SRC_URI[md5sum] = "ea83dec3b9655a27d28e7bc7cae9cd71" @@ -15,6 +15,6 @@ SRC_URI[sha256sum] = "0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de523 EXTRA_OECMAKE = "-DALSA=${@base_contains('DISTRO_FEATURES', 'alsa', 'TRUE', 'FALSE', d)} \ -DPULSEAUDIO=${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'TRUE', 'FALSE', d)} \ - " +" FILES_${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 200a3d823b..715860b4a4 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" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ - " +" PACKAGECONFIG[pulseaudio] = "--with-pulseaudio=dyn,--with-pulseaudio=no,pulseaudio," PACKAGECONFIG[alsa] = "--with-alsa=dyn,--with-alsa=no,alsa-lib," |