diff --git a/0001-hdajackretask-Fix-build-with-gcc7.patch b/0001-hdajackretask-Fix-build-with-gcc7.patch deleted file mode 100644 index aadbd73..0000000 --- a/0001-hdajackretask-Fix-build-with-gcc7.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 54b5913cd53f361ee84cb5f7412f7801e5d7b1c9 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Fri, 2 Feb 2024 17:19:47 +0100 -Subject: [PATCH] hdajackretask: Fix build with gcc7 - -The old compiler doesn't allow a variable declaration inside switch -block. - -Fixes: d349d20c127b ("hdajackretask: add support for pipewire stop/start") -Signed-off-by: Takashi Iwai ---- - hdajackretask/apply-changes.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/hdajackretask/apply-changes.c b/hdajackretask/apply-changes.c -index 0d558f76f106..381ccf2516d0 100644 ---- a/hdajackretask/apply-changes.c -+++ b/hdajackretask/apply-changes.c -@@ -213,9 +213,11 @@ cleanup: - static gboolean restore_soundserver(struct soundserver* state, GError** err) - { - gboolean ok = FALSE; -+ gchar* clientconf; -+ - switch (state->type) { - case PULSEAUDIO: -- gchar* clientconf = get_pulseaudio_client_conf(); -+ clientconf = get_pulseaudio_client_conf(); - if (state->was_killed && g_unlink(clientconf) != 0) { - g_set_error(err, quark(), 0, "%s", g_strerror(errno)); - g_free(clientconf); --- -2.35.3 - diff --git a/alsa-tools-1.2.11.tar.bz2 b/alsa-tools-1.2.11.tar.bz2 deleted file mode 100644 index 568733f..0000000 --- a/alsa-tools-1.2.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0915c9634a502fd3655ca9c574d259bc9e79983d91d45aeacff6f3c00f8ae3e9 -size 1882262 diff --git a/alsa-tools-1.2.11.tar.bz2.sig b/alsa-tools-1.2.11.tar.bz2.sig deleted file mode 100644 index 99a36f5..0000000 --- a/alsa-tools-1.2.11.tar.bz2.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmW30X8ACgkQg4BZbabl -nJGR8Q/+MA1dcxFtEOanspcBqTTDzWz5UzVgAwS+nZF/dw1qNRsSzMWJU6kU53SD -22m3wH/CQPwnOGqZgdY9Qi6sp9i68vHN8coVPCLyzTP1hD0qO5VekpbkiASYxy0V -57ck8aTnP6ffTJ0XlmUmNUdyPfBpWjvPAQINl9xVVMZaaF1BdgY8eyesbQikjIZO -RFUuqFUkhlJIvgM/jYefKRhHK2v6pEfVk7beR3q8EMM9x6yQdCk+tVAxamPuwdbW -yXkekPjzjFal3h4JAnVksar2q9cAHHF10msbTgdZdzTww+SZc4xdxPntGaZRFlaf -U8yRAi8DAhjcziMr7+VZY/kA0Gm04ap9HpTvVfW5s7lI95BvcAn9AwBqcXUFeiHz -gr9oHBB+6GA4DgGLeF3lcVjbfMwjz4oicn7vAvLiYl9denqbc0TJ6ls6PoBe0Ye/ -FLUZFDPzUL/N3dKNQooS36H4TsWiPmr16tEirKJZQKz9/faT9PEHgZt11a4RzY7G -bY2Ww4JRhlqmjhW5cnNBMGUAXYCaq8zLQKu7x7zRD65/rBLyPFGLA42FLwi7Yeww -Jh2MLadIrKP88rYxNzYf5shUA1XXACBp8gnZXprd/SfB+sTBK3iHug2Har9Zvy05 -4uIxb3PcDqwXinKd2ATw/lwVScUP+XdiNqM/x1/SapduWIiaS+o= -=zR9G ------END PGP SIGNATURE----- diff --git a/alsa-tools-1.2.15.tar.bz2 b/alsa-tools-1.2.15.tar.bz2 new file mode 100644 index 0000000..0aae02f --- /dev/null +++ b/alsa-tools-1.2.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:800498d35233672ef67f4bf74cc6e1d37e1fe70c0540e2d2e062f2319e7b5df7 +size 1962701 diff --git a/alsa-tools-1.2.15.tar.bz2.sig b/alsa-tools-1.2.15.tar.bz2.sig new file mode 100644 index 0000000..53f80b8 --- /dev/null +++ b/alsa-tools-1.2.15.tar.bz2.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE8E31BzesGohMSz1xg4BZbablnJEFAmk17QIACgkQg4BZbabl +nJF5uw//X4P+5jer5l9pYPmE7JCxsdUlfU/7F09CSiVfZ9S40JSVqD4AaJa5FWk1 +kKZwcVGpcuFbu5+IK0qk9nN05rpgxUj4h/1ddAMYl3KblZnSpmMydGOHf6eQSM8S +utACl3Cye909wCM0RUTxaKENopcsYyhQ79GKFe1MD1wkyxZS6NpBdCgfpbuwdwxo +DwEN+vDelSeW2MZchcHaeH6cEmIDqnQHBVgFvUzNZW4qqFpAdvwzDmdC0aUTwkwQ +oa+9SIwcCnBlkcZSw5ohYdL3XHu7AoYegjI0i/jCX9dDnLirP+4I4KmPqfDkvbYA +ziYeUd6eiiXswTBwQIbUfHeRO/kG47y/3if7woM5JqYOvMRZtYMhAgSkFWndJ2x5 +pDybTQLxPjaB97Pz01zdwMm9/6GXoXKf8CU9L/QfL73wHK7XbPSi++yUkRLMrld9 +0c2gsmW0LCXIzm91x32WNzcPQyoS+UFNHMzoh17CM0wHSV24SzI4m71feaC0HcHa +Fgo94cGdwKEf9qsIBoC2AG63dBfbPqvviU9/P0sPXdnehr2XlrWY6kQYwhYt0ym9 +NhRlsKtP2SXuOXGqOKbQSmuJYYwSGxtC5mfXSbHT4s5sFEpWsdSweHmlAr8rExNO +UQDP9en7ZJjZ/nStc9LDvSG4Riw8Ig0IZoZCZ08r7h57zC+VP0A= +=36Vo +-----END PGP SIGNATURE----- diff --git a/alsa-tools.changes b/alsa-tools.changes index 019b1d4..c9d9065 100644 --- a/alsa-tools.changes +++ b/alsa-tools.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Mon Dec 8 14:47:13 UTC 2025 - Takashi Iwai + +- Update to alsa-tools 1.2.15: + * envy24control: port to GTK 4 + * hdspmixer: fix null pointer dereference + * Update hdajackretask.desktop +- Build with gtk4 +- Drop obsoleted suse_update_desktop_file macro usages + +------------------------------------------------------------------- +Tue Apr 15 09:02:12 UTC 2025 - Takashi Iwai + +- Update to alsa-tools 1.2.14: + * envy24control: port to GTK 3 + * hdspmixer: correct string delimiter in labels_aio_ss_input + * Fix various gcc warnings +- Drop obsoleted patch: + 0001-hdajackretask-Fix-build-with-gcc7.patch +- Clean up spec file, build with gtk3 unconditionally + ------------------------------------------------------------------- Tue Feb 20 10:58:16 UTC 2024 - Dominique Leuenberger diff --git a/alsa-tools.spec b/alsa-tools.spec index 879ba99..ec36e32 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -1,7 +1,7 @@ # # spec file for package alsa-tools # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,8 @@ %define build_hwdep_loader 0 -%if 0%{?suse_version} > 1140 -%define have_gtk3 1 -%else -%define have_gtk3 0 -%endif Name: alsa-tools -Version: 1.2.11 +Version: 1.2.15 Release: 0 Summary: Various ALSA Tools License: GPL-2.0-or-later @@ -37,7 +32,6 @@ Source4: sbipatches.tar.bz2 Source5: rmedigicontrol.desktop Source7: rmedigicontrol.png # upstream fixes -Patch1: 0001-hdajackretask-Fix-build-with-gcc7.patch # build fixes Patch101: alsa-tools-no_m4_dir.dif BuildRequires: alsa-devel @@ -45,11 +39,9 @@ BuildRequires: fltk-devel BuildRequires: gcc-c++ BuildRequires: gobject-introspection BuildRequires: gtk2-devel -BuildRequires: libtool -BuildRequires: update-desktop-files -%if %{have_gtk3} BuildRequires: gtk3-devel -%endif +BuildRequires: gtk4-devel +BuildRequires: libtool %description This is a meta package for collection of sub-packages. @@ -299,7 +291,6 @@ Hammerfall DSP soundcard series. %prep %setup -q -a 4 -%patch -P 1 -p1 cp %{SOURCE3} . %patch -P 101 -p1 @@ -315,11 +306,7 @@ ALL_PACKS="$ALL_PACKS pcxhrloader mixartloader vxloader" %endif ALL_PACKS="$ALL_PACKS envy24control rmedigicontrol echomixer" - -%if %{have_gtk3} ALL_PACKS="$ALL_PACKS hdajackretask hdajacksensetest" -%endif - ALL_PACKS="$ALL_PACKS hdspconf hdspmixer" echo "$ALL_PACKS" > .allpacks @@ -344,14 +331,11 @@ done find %{buildroot} -type f -name "*.la" -delete -print # remove obsolete hotplug files rm -rf %{buildroot}%{_sysconfdir}/hotplug -# install desktop files -%suse_update_desktop_file envy24control AudioVideo Mixer GTK -%suse_update_desktop_file -i rmedigicontrol AudioVideo Mixer GTK -%suse_update_desktop_file hdspconf AudioVideo Utility -%suse_update_desktop_file hdspmixer AudioVideo Mixer -%suse_update_desktop_file hdajackretask AudioVideo Utility -%suse_update_desktop_file hwmixvolume AudioVideo Mixer -%suse_update_desktop_file echomixer AudioVideo Mixer +# extra desktop files +mkdir -p %{buildroot}%{_datadir}/applications +install -c -m 0644 %{SOURCE5} %{buildroot}%{_datadir}/applications/ +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -c -m 0644 %{SOURCE7} %{buildroot}%{_datadir}/pixmaps/ # opl3 sounds mkdir -p %{buildroot}%{_datadir}/sounds/opl3 install -c -m 0644 *.o3 *.sb %{buildroot}%{_datadir}/sounds/opl3 @@ -524,7 +508,6 @@ exit 0 %doc echomixer/COPYING %doc echomixer/README -%if %{have_gtk3} %files -n hdajackretask %{_bindir}/hdajackretask %{_datadir}/applications/hdajackretask.desktop @@ -534,7 +517,6 @@ exit 0 %files -n hdajacksensetest %{_bindir}/hdajacksensetest -%endif %files -n hdspconf %{_bindir}/hdspconf