diff options
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb index 4f64a387ec..dfa9b97017 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1 | |||
11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ |
12 | file://mips_has_no_io_h.patch \ | 12 | file://mips_has_no_io_h.patch \ |
13 | file://autotools.patch \ | 13 | file://autotools.patch \ |
14 | ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" | 14 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" |
15 | 15 | ||
16 | SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" | 16 | SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" |
17 | SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" | 17 | SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" |
@@ -20,7 +20,7 @@ inherit autotools-brokensep | |||
20 | 20 | ||
21 | EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" | 21 | EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" |
22 | 22 | ||
23 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" | 23 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" |
24 | PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," | 24 | PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," |
25 | 25 | ||
26 | # configure.ac/.in doesn't exist so force copy | 26 | # configure.ac/.in doesn't exist so force copy |
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb index 056fca2dac..2edacc1b1b 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb | |||
@@ -86,7 +86,7 @@ do_install() { | |||
86 | # See alsa-utils-alsaconf_${PV}.bb | 86 | # See alsa-utils-alsaconf_${PV}.bb |
87 | rm ${D}${sbindir}/alsaconf | 87 | rm ${D}${sbindir}/alsaconf |
88 | 88 | ||
89 | if ${@base_contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then | 89 | if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then |
90 | # This is where alsa-utils will install its rules if we don't tell it anything else. | 90 | # This is where alsa-utils will install its rules if we don't tell it anything else. |
91 | rm -rf ${D}/lib/udev | 91 | rm -rf ${D}/lib/udev |
92 | rmdir --ignore-fail-on-non-empty ${D}/lib | 92 | rmdir --ignore-fail-on-non-empty ${D}/lib |