From f28e6f4131e675a60795156012851b8367ac1b4d Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Fri, 29 Aug 2014 20:06:33 +0300 Subject: alsa-tools: upgrade to 1.0.28 mips_has_no_io_h.patch removed, no longer necessary. Changelog: http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28 Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- .../alsa/alsa-tools/mips_has_no_io_h.patch | 16 ---------- meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 36 ---------------------- meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb | 35 +++++++++++++++++++++ 3 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch b/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch deleted file mode 100644 index 09b10f17e6..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/mips_has_no_io_h.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Saul Wold - -Index: alsa-tools-1.0.26.1/hda-verb/hda-verb.c -=================================================================== ---- alsa-tools-1.0.26.1.orig/hda-verb/hda-verb.c -+++ alsa-tools-1.0.26.1/hda-verb/hda-verb.c -@@ -13,7 +13,7 @@ - #include - #include - #include --#ifndef __PPC__ -+#if !(__PPC__ || __mips__) - #include - #endif - #include diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb deleted file mode 100644 index bca7170a28..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Advanced tools for certain ALSA sound card drivers" -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" -SECTION = "console/utils" -LICENSE = "GPLv2 & LGPLv2+" -DEPENDS = "alsa-lib ncurses" - -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ - file://mips_has_no_io_h.patch \ - file://autotools.patch \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - 'file://makefile_no_gtk.patch', d)}" - -SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" -SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" - -inherit autotools-brokensep pkgconfig - -EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" -PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," - -# configure.ac/.in doesn't exist so force copy -AUTOTOOLS_COPYACLOCAL = "1" - -do_compile_prepend () { - #Automake dir is not correctly detected in cross compilation case - export AUTOMAKE_DIR="$(automake --print-libdir)" - export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" -} - -FILES_${PN} += "${datadir}/ld10k1" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb new file mode 100644 index 0000000000..4b9509e863 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.28.bb @@ -0,0 +1,35 @@ +SUMMARY = "Advanced tools for certain ALSA sound card drivers" +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" +SECTION = "console/utils" +LICENSE = "GPLv2 & LGPLv2+" +DEPENDS = "alsa-lib ncurses" + +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ + file://autotools.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ + 'file://makefile_no_gtk.patch', d)}" + +SRC_URI[md5sum] = "e6c929175d8ee729c06d49b51439bad6" +SRC_URI[sha256sum] = "76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761" + +inherit autotools-brokensep pkgconfig + +EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" +PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," + +# configure.ac/.in doesn't exist so force copy +AUTOTOOLS_COPYACLOCAL = "1" + +do_compile_prepend () { + #Automake dir is not correctly detected in cross compilation case + export AUTOMAKE_DIR="$(automake --print-libdir)" + export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/" +} + +FILES_${PN} += "${datadir}/ld10k1" -- cgit 1.2.3-korg