Compare commits
10 Commits
4e2df82b6d
...
2c752e76cb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c752e76cb | ||
|
|
7ab954c16b | ||
|
|
807b460e0e | ||
|
|
12292793c4 | ||
|
|
a6ba733d9d | ||
|
|
f6735ae55f | ||
|
|
f89c833683 | ||
|
|
88a047207c | ||
|
|
9b06829688 | ||
|
|
c392895e7b |
145
0001-echomixer-fix-clang-16-incompatible-function-pointer.patch
Normal file
145
0001-echomixer-fix-clang-16-incompatible-function-pointer.patch
Normal file
@ -0,0 +1,145 @@
|
|||||||
|
From b07f24ecebdd5bb6f58288560dd686e68b22e809 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mazunki Hoksaas <rolferen@gmail.com>
|
||||||
|
Date: Mon, 4 Sep 2023 14:50:02 +0200
|
||||||
|
Subject: [PATCH] echomixer: fix clang-16 incompatible-function-pointer
|
||||||
|
|
||||||
|
Closes: https://github.com/alsa-project/alsa-tools/pull/17
|
||||||
|
Signed-off-by: Mazunki Hoksaas <rolferen@gmail.com>
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
echomixer/echomixer.c | 28 ++++++++++++++--------------
|
||||||
|
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/echomixer/echomixer.c b/echomixer/echomixer.c
|
||||||
|
index 4946a5d..80124ba 100644
|
||||||
|
--- a/echomixer/echomixer.c
|
||||||
|
+++ b/echomixer/echomixer.c
|
||||||
|
@@ -2105,7 +2105,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
for (i=0; i<ndmodes; i++) {
|
||||||
|
menuitem=gtk_menu_item_new_with_label(dmodeName[i]);
|
||||||
|
gtk_widget_show(menuitem);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate", Digital_mode_activate, (gpointer)(long)i);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(Digital_mode_activate), (gpointer)(long)i);
|
||||||
|
gtk_menu_append(GTK_MENU(menu), menuitem);
|
||||||
|
}
|
||||||
|
gtk_option_menu_set_menu(GTK_OPTION_MENU(dmodeOpt), menu);
|
||||||
|
@@ -2131,7 +2131,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
clocksrc_menuitem[i]=gtk_menu_item_new_with_label(clocksrcName[i]);
|
||||||
|
gtk_widget_show(clocksrc_menuitem[i]);
|
||||||
|
gtk_widget_set_sensitive(clocksrc_menuitem[i], FALSE);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(clocksrc_menuitem[i]), "activate", Clock_source_activate, (gpointer)(long)i);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(clocksrc_menuitem[i]), "activate", G_CALLBACK(Clock_source_activate), (gpointer)(long)i);
|
||||||
|
gtk_menu_append(GTK_MENU(menu), clocksrc_menuitem[i]);
|
||||||
|
}
|
||||||
|
gtk_option_menu_set_menu(GTK_OPTION_MENU(clocksrcOpt), menu);
|
||||||
|
@@ -2157,7 +2157,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
for (i=0; i<nspdifmodes; i++) {
|
||||||
|
menuitem=gtk_menu_item_new_with_label(spdifmodeName[i]);
|
||||||
|
gtk_widget_show(menuitem);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate", SPDIF_mode_activate, (gpointer)(long)i);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(SPDIF_mode_activate), (gpointer)(long)i);
|
||||||
|
gtk_menu_append(GTK_MENU(menu), menuitem);
|
||||||
|
}
|
||||||
|
gtk_option_menu_set_menu(GTK_OPTION_MENU(spdifmodeOpt), menu);
|
||||||
|
@@ -2182,7 +2182,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
|
||||||
|
ReadControl(&i, 1, PhantomPower.id, SND_CTL_ELEM_IFACE_MIXER);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), i);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", Switch_toggled, (gpointer)&PhantomPower);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Switch_toggled), (gpointer)&PhantomPower);
|
||||||
|
PhantomPower.Button=button;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2193,7 +2193,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
|
||||||
|
ReadControl(&i, 1, Automute.id, SND_CTL_ELEM_IFACE_CARD);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), i);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", Switch_toggled, (gpointer)&Automute);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Switch_toggled), (gpointer)&Automute);
|
||||||
|
Automute.Button=button;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2202,7 +2202,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
autoclockChkbutton=gtk_check_button_new_with_label("Autoclock");
|
||||||
|
gtk_widget_show(autoclockChkbutton);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), autoclockChkbutton, TRUE, FALSE, 0);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(autoclockChkbutton), "toggled", AutoClock_toggled, NULL);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(autoclockChkbutton), "toggled", G_CALLBACK(AutoClock_toggled), NULL);
|
||||||
|
AutoClock=-1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2672,7 +2672,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), 1);
|
||||||
|
gtk_widget_show(button);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", Gang_button_toggled, 0);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(Gang_button_toggled), 0);
|
||||||
|
|
||||||
|
// Controls frame
|
||||||
|
frame=gtk_frame_new("Controls");
|
||||||
|
@@ -2687,7 +2687,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("VU");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", VUmeters_button_click, 0);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(VUmeters_button_click), 0);
|
||||||
|
VUw_geom.toggler=button;
|
||||||
|
if (VUw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2697,7 +2697,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("Line");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)LVwindow);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)LVwindow);
|
||||||
|
LVw_geom.toggler=button;
|
||||||
|
if (LVw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2707,7 +2707,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("Misc");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)Miscwindow);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)Miscwindow);
|
||||||
|
Miscw_geom.toggler=button;
|
||||||
|
if (Miscw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2718,7 +2718,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("GrMix");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", GMixer_button_click, 0);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(GMixer_button_click), 0);
|
||||||
|
GMw_geom.toggler=button;
|
||||||
|
if (GMw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2727,7 +2727,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("Mixer");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)mixerControl.window);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)mixerControl.window);
|
||||||
|
Mixerw_geom.toggler=button;
|
||||||
|
if (Mixerw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2738,7 +2738,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("Vmixer");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)vmixerControl.window);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)vmixerControl.window);
|
||||||
|
Vmixerw_geom.toggler=button;
|
||||||
|
if (Vmixerw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
@@ -2749,7 +2749,7 @@ printf("components = %s\n", snd_ctl_card_info_get_components(hw_info));*/
|
||||||
|
button=gtk_toggle_button_new_with_label("PCM");
|
||||||
|
gtk_widget_show(button);
|
||||||
|
gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 1);
|
||||||
|
- gtk_signal_connect(GTK_OBJECT(button), "toggled", ToggleWindow, (gpointer)pcmoutControl.window);
|
||||||
|
+ gtk_signal_connect(GTK_OBJECT(button), "toggled", G_CALLBACK(ToggleWindow), (gpointer)pcmoutControl.window);
|
||||||
|
PVw_geom.toggler=button;
|
||||||
|
if (PVw_geom.st==1)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
|
||||||
|
--
|
||||||
|
2.41.0.windows.1
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
BIN
alsa-tools-1.2.5.tar.bz2
Normal file
BIN
alsa-tools-1.2.5.tar.bz2
Normal file
Binary file not shown.
@ -9,8 +9,8 @@
|
|||||||
%global _helpUrl https://alsa.opensrc.org/Alsa-tools
|
%global _helpUrl https://alsa.opensrc.org/Alsa-tools
|
||||||
|
|
||||||
Name: alsa-tools
|
Name: alsa-tools
|
||||||
Version: 1.2.2
|
Version: 1.2.5
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Advanced tools for ALSA
|
Summary: Advanced tools for ALSA
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -18,9 +18,11 @@ URL: https://www.alsa-project.org/
|
|||||||
Source0: https://www.alsa-project.org/files/pub/tools/%{name}-%{version}.tar.bz2
|
Source0: https://www.alsa-project.org/files/pub/tools/%{name}-%{version}.tar.bz2
|
||||||
Source1: 90-alsa-tools-firmware.rules
|
Source1: 90-alsa-tools-firmware.rules
|
||||||
|
|
||||||
|
Patch1: 0001-echomixer-fix-clang-16-incompatible-function-pointer.patch
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel gcc gcc-c++ libtool findutils
|
BuildRequires: alsa-lib-devel gcc gcc-c++ libtool findutils
|
||||||
BuildRequires: fltk-devel gtk+-devel gtk2-devel gtk3-devel desktop-file-utils
|
BuildRequires: fltk-devel gtk+-devel gtk2-devel gtk3-devel desktop-file-utils
|
||||||
Requires: xorg-x11-fonts-misc python2-alsa
|
Requires: xorg-x11-fonts-misc python3-alsa
|
||||||
|
|
||||||
Provides: alsa-tools-libs = %{version}-%{release}
|
Provides: alsa-tools-libs = %{version}-%{release}
|
||||||
Obsoletes: alsa-tools-libs
|
Obsoletes: alsa-tools-libs
|
||||||
@ -209,6 +211,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 28 2024 yanying <201250106@smail.nju.edu.cn> - 1.2.5-2
|
||||||
|
- backport fix for clang build
|
||||||
|
|
||||||
|
* Mon Nov 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 1.2.5-1
|
||||||
|
- update to version 1.2.5
|
||||||
|
|
||||||
|
* Tue Feb 2 2021 xinghe <xinghe@huawei.com> - 1.2.2-3
|
||||||
|
- fix bad requires
|
||||||
|
|
||||||
|
* Fri Sep 25 2020 xinghe <xinghe@huawei.com> - 1.2.2-2
|
||||||
|
- remove old tar packages
|
||||||
|
|
||||||
* Mon Jun 24 2020 xinghe <xinghe@huawei.com> - 1.2.2-1
|
* Mon Jun 24 2020 xinghe <xinghe@huawei.com> - 1.2.2-1
|
||||||
- update to version 1.2.2
|
- update to version 1.2.2
|
||||||
|
|
||||||
|
|||||||
4
alsa-tools.yaml
Normal file
4
alsa-tools.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: github
|
||||||
|
src_repo: alsa-project/alsa-tools
|
||||||
|
tag_prefix: ^v
|
||||||
|
seperator: .
|
||||||
Loading…
x
Reference in New Issue
Block a user