From 1adbb73d0d45fb989332b561c4cd9d5b8169c7e3 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Wed, 17 Feb 2016 18:56:13 +0200 Subject: alsa-tools: 1.0.29 -> 1.1.0 Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 There are almost no changes in the new version: just one invalid macro was removed from the cspctl man page. Rebased patches "autotools.patch" and "makefile_no_gtk.patch". (From OE-Core rev: b072baa03ec7e41bc4f9a05702c1b65150ebff49) Signed-off-by: Tanu Kaskinen Signed-off-by: Richard Purdie --- .../alsa/alsa-tools/autotools.patch | 2 +- .../alsa/alsa-tools/makefile_no_gtk.patch | 2 +- meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 42 ---------------------- meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb | 42 ++++++++++++++++++++++ 4 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 59391d6908..319f25d27a 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -20,7 +20,7 @@ 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,8 +1,8 @@ - VERSION = 1.0.29 + VERSION = 1.1.0 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch index c957609611..9bd6848eda 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch @@ -14,7 +14,7 @@ index 2457a1c..72346d9 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ - VERSION = 1.0.29 + VERSION = 1.1.0 TOP = . -SUBDIRS = as10k1 envy24control \ - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb deleted file mode 100644 index fdf396e3f3..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ /dev/null @@ -1,42 +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 glib-2.0" - -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)} \ - file://gitcompile_hdajacksensetest \ - file://0001-as10k1-Make-output_tram_line-static-inline.patch \ - " - -SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" -SRC_URI[sha256sum] = "94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1" - -inherit autotools-brokensep pkgconfig - -CLEANBROKEN = "1" - -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}/" - - cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile -} - -FILES_${PN} += "${datadir}/ld10k1" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb new file mode 100644 index 0000000000..9e633f1f70 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.0.bb @@ -0,0 +1,42 @@ +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 glib-2.0" + +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)} \ + file://gitcompile_hdajacksensetest \ + file://0001-as10k1-Make-output_tram_line-static-inline.patch \ + " + +SRC_URI[md5sum] = "b476a5afaa3ea3230855553ad59d259d" +SRC_URI[sha256sum] = "7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51" + +inherit autotools-brokensep pkgconfig + +CLEANBROKEN = "1" + +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}/" + + cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile +} + +FILES_${PN} += "${datadir}/ld10k1" -- cgit 1.2.3-korg