From 9a148e6b100fe8bc3e162d79630552df5eb78fc0 Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Tue, 29 Jan 2013 12:15:07 +0200 Subject: alsa-tools: upgrade to 1.0.26.1 Removed the following tools: - all related to hdsp (required gtk+ and fltk-config) - ld10k1, qlo10k1 (required QT) - hdajackretask Fixed the automake issue for cross-compilation Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold --- .../alsa/alsa-tools-1.0.25/autotools.patch | 34 --------------------- .../alsa/alsa-tools/autotools.patch | 35 ++++++++++++++++++++++ meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb | 25 ---------------- .../recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 28 +++++++++++++++++ 4 files changed, 63 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/autotools.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch deleted file mode 100644 index c7bc2d6bd0..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools-1.0.25/autotools.patch +++ /dev/null @@ -1,34 +0,0 @@ -Add parameters to autoreconf to support cross compile. -Remove some sub-components which needs further recipe support. - -Signed-off-by: Dongxiao Xu - -Upstream-Status: Inappropriate [configuration] - -diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile ---- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 -+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 -@@ -1,6 +1,6 @@ - #!/bin/bash - --autoreconf -fi || exit 1 -+autoreconf $ACLOCAL_FLAGS -fi || exit 1 - export CFLAGS='-O2 -Wall -pipe -g' - echo "CFLAGS=$CFLAGS" - echo "./configure $@" -diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile ---- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 -+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 -@@ -1,9 +1,8 @@ - VERSION = 1.0.24.1 - TOP = . --SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ -- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ -- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ -- hwmixvolume -+SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \ -+ seq sscape_ctl us428control usx2yloader vxloader ld10k1 \ -+ hwmixvolume - - all: - @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch new file mode 100644 index 0000000000..294e970cd1 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -0,0 +1,35 @@ +Add parameters to autoreconf to support cross compile. +Remove some sub-components which needs further recipe support. + +Signed-off-by: Dongxiao Xu + +Upstream-Status: Inappropriate [configuration] + +diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile +--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 ++++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 +@@ -1,6 +1,6 @@ + #!/bin/bash + +-autoreconf -fi || exit 1 ++autoreconf $ACLOCAL_FLAGS -fi || exit 1 + export CFLAGS='-O2 -Wall -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $@" +diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile +--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 ++++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 +@@ -1,9 +1,9 @@ + VERSION = 1.0.26.1 + TOP = . +-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ +- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ +- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ +- hwmixvolume hdajackretask hda-verb ++SUBDIRS = ac3dec as10k1 envy24control \ ++ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ ++ us428control usx2yloader vxloader echomixer \ ++ hwmixvolume hda-verb + + all: + @for i in $(SUBDIRS); do \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb deleted file mode 100644 index 7d96b853b9..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.25.bb +++ /dev/null @@ -1,25 +0,0 @@ -BROKEN = "1" - -DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards." -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" - -PR = "r0" - -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://autotools.patch" - -SRC_URI[md5sum] = "57bfec98a814d12e0f7ab379aaeccd87" -SRC_URI[sha256sum] = "a974d0f3e837796f67d04df88c783aebcf4ac3c5f9ac31e2b65c10e8cb4b1dca" - -inherit autotools - -EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'" - -FILES_${PN} += "${datadir}/ld10k1" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb new file mode 100644 index 0000000000..0fe4bee4eb --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Alsa Tools package contains advanced tools for certain sound cards." +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" + +PR = "r0" + +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://autotools.patch" + +SRC_URI[md5sum] = "805526ea5d6c40e1f2c94cee86141230" +SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e733841" + +inherit autotools + +EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'" + +do_compile_prepend () { + #Automake dir is not correctly detected in cross compilation case + export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake) +} + +FILES_${PN} += "${datadir}/ld10k1" -- cgit v1.2.3