From 7acf576b04413c40bdcd6caaf4c759ed98d60be6 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Fri, 25 Apr 2025 06:23:13 +0000 Subject: alsa-tools: upgrade 1.2.11 -> 1.2.14 Remove 1 patch now included upstream. Changelog: https://www.alsa-project.org/wiki/Changes_v1.2.13_v1.2.14 (From OE-Core rev: 3a394ca7172e80b07f76fb93882d3597d7108219) Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie --- ...retask-fix-reset_changes_boot-declaration.patch | 26 ------- meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb | 90 ---------------------- meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb | 89 +++++++++++++++++++++ 3 files changed, 89 insertions(+), 116 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch delete mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb create mode 100644 meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch b/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch deleted file mode 100644 index 0892957507..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools/0001-hdajackretask-fix-reset_changes_boot-declaration.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2b666ccbd616e0e0215241cb69b65d69d5146c8c Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 27 Jan 2025 11:02:21 +0100 -Subject: [PATCH] hdajackretask: fix reset_changes_boot() declaration - -Upstream-Status: Backport [https://github.com/alsa-project/alsa-tools/commit/5eaadd15bda4cf0424ee2470a6d304a0c2ce10cb] - -Signed-off-by: Jaroslav Kysela -Signed-off-by: Khem Raj ---- - hdajackretask/apply-changes.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hdajackretask/apply-changes.h b/hdajackretask/apply-changes.h -index e08d66d..e431a0d 100644 ---- a/hdajackretask/apply-changes.h -+++ b/hdajackretask/apply-changes.h -@@ -9,7 +9,7 @@ gboolean apply_changes_reconfig(pin_configs_t* pins, int entries, int card, int - - gboolean apply_changes_boot(pin_configs_t* pins, int entries, int card, int device, - const char* model, const char* hints, GError** err); --gboolean reset_changes_boot(); -+gboolean reset_changes_boot(GError ** err); - - #endif - diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb deleted file mode 100644 index 0b884e2075..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.2.11.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Advanced tools for certain ALSA sound card drivers" -DESCRIPTION = "Package containing a number of tools ranging from envy24control \ -which provides complete control over all devices with an envy24 chip, to \ -firmware loaders for pcmcia, USB and the hdsp devices." -HOMEPAGE = "http://www.alsa-project.org" -BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" -SECTION = "console/utils" -LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" -DEPENDS = "alsa-lib" - -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ - " - -SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2 \ - file://0001-hdajackretask-fix-reset_changes_boot-declaration.patch" - -SRC_URI[sha256sum] = "0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9" - -inherit autotools-brokensep pkgconfig -# brokensep as as10k1 (and probably more) fail out of tree -CLEANBROKEN = "1" - -# Here we use PACKAGECONFIG options to pick which directories we configure/build. -# Remember on upgrades to check that no new tools have been added. -PACKAGECONFIG ??= "as10k1 hdajacksensetest hda-verb hdsploader ld10k1 mixartloader pcxhrloader \ - sb16_csp seq--sbiload sscape_ctl us428control usx2yloader vxloader \ - ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'hdajackretask', '', d)} \ - " - -PACKAGECONFIG[as10k1] = "" -PACKAGECONFIG[echomixer] = ",,gtk+" -PACKAGECONFIG[envy24control] = ",,gtk+" -PACKAGECONFIG[hda-verb] = "" -PACKAGECONFIG[hdajackretask] = ",,gtk+3" -PACKAGECONFIG[hdajacksensetest] = ",,glib-2.0" -PACKAGECONFIG[hdspconf] = ",,fltk" -PACKAGECONFIG[hdsploader] = "" -PACKAGECONFIG[hdspmixer] = ",,fltk" -PACKAGECONFIG[ld10k1] = "" -PACKAGECONFIG[mixartloader] = "" -PACKAGECONFIG[pcxhrloader] = "" -PACKAGECONFIG[qlo10k1] = ",,qt-x11-free" -PACKAGECONFIG[rmedigicontrol] = ",,gtk+" -PACKAGECONFIG[sb16_csp] = "" -PACKAGECONFIG[seq--sbiload] = "" -PACKAGECONFIG[sscape_ctl] = "" -PACKAGECONFIG[us428control] = "" -PACKAGECONFIG[usx2yloader] = "" -PACKAGECONFIG[vxloader] = "" - -# At the time of writing pyalsa is not packaged for OE, so this is not expected -# to work. -PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygobject pyalsa" - -python do_configure() { - for subdir in d.getVar("PACKAGECONFIG").split(): - subdir = subdir.replace("--", "/") - bb.note("Configuring %s" % subdir) - dd = d.createCopy() - dd.setVar("S", os.path.join(d.getVar("S"), subdir)) - bb.build.exec_func("autotools_do_configure", dd) -} - -python do_compile() { - for subdir in d.getVar("PACKAGECONFIG").split(): - subdir = subdir.replace("--", "/") - bb.note("Compiling %s" % subdir) - dd = d.createCopy() - dd.setVar("S", os.path.join(d.getVar("S"), subdir)) - bb.build.exec_func("autotools_do_compile", dd) -} - -python do_install() { - d.delVarFlag("autotools_do_install", "cleandirs") - for subdir in d.getVar("PACKAGECONFIG").split(): - subdir = subdir.replace("--", "/") - bb.note("Installing %s" % subdir) - dd = d.createCopy() - dd.setVar("S", os.path.join(d.getVar("S"), subdir)) - bb.build.exec_func("autotools_do_install", dd) - - # Just remove bash-needing init script that isn't installed as an init script - try: - os.remove(oe.path.join(d.getVar("D"), d.getVar("sbindir"), "ld10k1d")) - except: - pass -} - -FILES:${PN} += "${datadir}" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb new file mode 100644 index 0000000000..751d9e8a76 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.2.14.bb @@ -0,0 +1,89 @@ +SUMMARY = "Advanced tools for certain ALSA sound card drivers" +DESCRIPTION = "Package containing a number of tools ranging from envy24control \ +which provides complete control over all devices with an envy24 chip, to \ +firmware loaders for pcmcia, USB and the hdsp devices." +HOMEPAGE = "http://www.alsa-project.org" +BUGTRACKER = "http://alsa-project.org/main/index.php/Bug_Tracking" +SECTION = "console/utils" +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" +DEPENDS = "alsa-lib" + +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ + " + +SRC_URI = "https://www.alsa-project.org/files/pub/tools/${BP}.tar.bz2" + +SRC_URI[sha256sum] = "faef6fdd39ec79c9a5473dc63aa1b6331bf7664a9d452a0a8198cec7016cbc6f" + +inherit autotools-brokensep pkgconfig +# brokensep as as10k1 (and probably more) fail out of tree +CLEANBROKEN = "1" + +# Here we use PACKAGECONFIG options to pick which directories we configure/build. +# Remember on upgrades to check that no new tools have been added. +PACKAGECONFIG ??= "as10k1 hdajacksensetest hda-verb hdsploader ld10k1 mixartloader pcxhrloader \ + sb16_csp seq--sbiload sscape_ctl us428control usx2yloader vxloader \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'hdajackretask', '', d)} \ + " + +PACKAGECONFIG[as10k1] = "" +PACKAGECONFIG[echomixer] = ",,gtk+" +PACKAGECONFIG[envy24control] = ",,gtk+" +PACKAGECONFIG[hda-verb] = "" +PACKAGECONFIG[hdajackretask] = ",,gtk+3" +PACKAGECONFIG[hdajacksensetest] = ",,glib-2.0" +PACKAGECONFIG[hdspconf] = ",,fltk" +PACKAGECONFIG[hdsploader] = "" +PACKAGECONFIG[hdspmixer] = ",,fltk" +PACKAGECONFIG[ld10k1] = "" +PACKAGECONFIG[mixartloader] = "" +PACKAGECONFIG[pcxhrloader] = "" +PACKAGECONFIG[qlo10k1] = ",,qt-x11-free" +PACKAGECONFIG[rmedigicontrol] = ",,gtk+" +PACKAGECONFIG[sb16_csp] = "" +PACKAGECONFIG[seq--sbiload] = "" +PACKAGECONFIG[sscape_ctl] = "" +PACKAGECONFIG[us428control] = "" +PACKAGECONFIG[usx2yloader] = "" +PACKAGECONFIG[vxloader] = "" + +# At the time of writing pyalsa is not packaged for OE, so this is not expected +# to work. +PACKAGECONFIG[hwmixvolume] = ",,,python-core python-pygobject pyalsa" + +python do_configure() { + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Configuring %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_configure", dd) +} + +python do_compile() { + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Compiling %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_compile", dd) +} + +python do_install() { + d.delVarFlag("autotools_do_install", "cleandirs") + for subdir in d.getVar("PACKAGECONFIG").split(): + subdir = subdir.replace("--", "/") + bb.note("Installing %s" % subdir) + dd = d.createCopy() + dd.setVar("S", os.path.join(d.getVar("S"), subdir)) + bb.build.exec_func("autotools_do_install", dd) + + # Just remove bash-needing init script that isn't installed as an init script + try: + os.remove(oe.path.join(d.getVar("D"), d.getVar("sbindir"), "ld10k1d")) + except: + pass +} + +FILES:${PN} += "${datadir}" -- cgit v1.2.3-54-g00ecf