[packages/aumix-gtk] Rel 3
arekm
arekm at pld-linux.org
Sun May 17 00:59:40 CEST 2026
commit b1be458af019b53e4dc4826e1b309e34e89e5522
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun May 17 00:48:05 2026 +0200
Rel 3
aumix-fno-common.patch | 85 ++++++++++++++++++++++++++++++++++++++++
aumix-gtk-widget-destroy.patch | 88 ++++++++++++++++++++++++++++++++++++++++++
aumix-gtk.spec | 10 +++--
3 files changed, 179 insertions(+), 4 deletions(-)
---
diff --git a/aumix-gtk.spec b/aumix-gtk.spec
index 78fa887..608bdaa 100644
--- a/aumix-gtk.spec
+++ b/aumix-gtk.spec
@@ -11,15 +11,16 @@ Summary(ru.UTF-8): Аудио микшер на базе библиотеки cu
Summary(uk.UTF-8): Аудіо мікшер, базований на біблиотеці curses і GTK+
Name: aumix-gtk
Version: 2.9.1
-Release: 2
+Release: 3
License: GPL v2+
Group: Applications/Sound
Source0: http://www.jpj.net/~trevor/aumix/releases/aumix-%{version}.tar.bz2
# Source0-md5: 34f28ae1c94fc5298e8bb2688c4b3a20
Source3: %{name}.desktop
Source4: aumix.png
-Patch0: aumix-home_etc.patch
Patch1: aumix-xaumix.patch
+Patch2: aumix-fno-common.patch
+Patch3: aumix-gtk-widget-destroy.patch
URL: http://www.jpj.net/~trevor/aumix.html
BuildRequires: autoconf
BuildRequires: automake
@@ -73,12 +74,13 @@ jak poziom sygnału wyjściowego.
%prep
%setup -q -n aumix-%{version}
-%patch -P0 -p1
%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
%build
%{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
diff --git a/aumix-fno-common.patch b/aumix-fno-common.patch
new file mode 100644
index 0000000..2c2ac73
--- /dev/null
+++ b/aumix-fno-common.patch
@@ -0,0 +1,85 @@
+--- a/src/common.c
++++ b/src/common.c
+@@ -36,6 +36,8 @@ char *save_filename = NULL; /*
+ char *device_filename = "/dev/mixer"; /* name of mixer device file */
+ unsigned short setfile_opened = FALSE, setfile_write_perm = FALSE, setfile_read_perm = FALSE;
+ int current_dev = 0, mixer_fd = -1, mutelevel[SOUND_MIXER_NRDEVICES], devmask = 0, recmask = 0, recsrc = 0, stereodevs = 0, mutestate = 0, interactive = FALSE;
++int ourlevel[SOUND_MIXER_NRDEVICES];
++int our_recplay[SOUND_MIXER_NRDEVICES];
+ #ifdef USE_OWN_LABELS
+ /* This is to ease translation--don't use if this copy of aumix is very old.
+ * These labels correspond to the soundcard.h from Linux 2.3.12 or FreeBSD
+--- a/src/common.h
++++ b/src/common.h
+@@ -129,8 +129,8 @@ extern int ReadLevel(int device, in
+ extern int ReadRecSrc(void);
+ extern int WriteRecSrc(void);
+ int ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp);
+-int ourlevel[SOUND_MIXER_NRDEVICES];
+-int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */
++extern int ourlevel[SOUND_MIXER_NRDEVICES];
++extern int our_recplay[SOUND_MIXER_NRDEVICES]; /* Store record/play settings for updates. */
+ int LoadSettings(void);
+ int SaveSettings(void);
+ int dummy_ioctl(int fd, unsigned long req, int *arg);
+--- a/src/curses.c
++++ b/src/curses.c
+@@ -27,7 +27,8 @@
+ #include "mouse.h"
+
+ unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang;
+-int current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
++int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
++int (*Wgetch)(WINDOW *win);
+ int in_keysbox = FALSE;
+ static int cursor_x, cursor_y; /* keep track of cursor position */
+
+--- a/src/curses.h
++++ b/src/curses.h
+@@ -88,8 +88,8 @@ static int LABELSIZES[] = {
+ };
+ #define ARROW_WIDTH 1 /* width of selection arrow */
+ #define R_P_WIDTH 1 /* width of record/play indicator */
+-int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
+-int (*Wgetch) (WINDOW * win);
++extern int level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
++extern int (*Wgetch) (WINDOW * win);
+ #define Getch() (*Wgetch)(stdscr)
+ void WakeUpCurses(void);
+ void InitScreenCurses(void);
+--- a/src/interactive.h
++++ b/src/interactive.h
+@@ -7,7 +7,7 @@
+ #define MUTE_ONLY 2
+ #define REFRESH_PERIOD 1 /* number of seconds between updates */
+
+-unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
++extern unsigned char *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
+ void AumixSignalHandler(int signal_number);
+ void InitScreen(void);
+ void KeysBox(void);
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -39,6 +39,13 @@ static int xpos, ypos, buttons;
+ static int cwidth = 8, cheight = 16;
+ #endif /* HAVE_SYSMOUSE */
+
++/* Gpm_Wgetch() has an old-style no-arg declaration in gpm.h but Wgetch needs
++ * int (*)(WINDOW *). Provide a typed wrapper so assignment is well-formed. */
++static int gpm_wgetch_wrapper(WINDOW *win)
++{
++ return Gpm_Wgetch();
++}
++
+ void StartMouse(void)
+ {
+ Gpm_Connect conn;
+@@ -77,7 +84,7 @@ void StartMouse(void)
+ /* don't check for < 0, gpm-xterm returns -2 */
+ if (Gpm_Open(&conn, 0) != -1) {
+ gpm_handler = MouseHandler;
+- Wgetch = Gpm_Wgetch;
++ Wgetch = gpm_wgetch_wrapper;
+ } else
+ Wgetch = wgetch;
+ #if HAVE_GETMOUSE
diff --git a/aumix-gtk-widget-destroy.patch b/aumix-gtk-widget-destroy.patch
new file mode 100644
index 0000000..7c4b113
--- /dev/null
+++ b/aumix-gtk-widget-destroy.patch
@@ -0,0 +1,88 @@
+--- a/src/gtk.c
++++ b/src/gtk.c
+@@ -45,6 +45,24 @@
+ #include "interactive.h"
+ #include <signal.h> /* SIGALRM */
+
++GdkBitmap *rmask;
++GdkBitmap *pmask;
++GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
++GdkPixmap *record_pixmap;
++GdkPixmap *play_pixmap;
++GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
++GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
++GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
++GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
++GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++GtkWidget *levels[SOUND_MIXER_NRDEVICES];
++GtkWidget *maintable;
++gint balcallback[SOUND_MIXER_NRDEVICES];
++gint lvlcallback[SOUND_MIXER_NRDEVICES];
++gint rpcallback[SOUND_MIXER_NRDEVICES];
++gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++
+ void SaveSettingsGTK(void)
+ {
+ (void) SaveSettings();
+@@ -444,7 +462,7 @@
+ /* Get the selected filename and copy it into the global save_filename. */
+ {
+ save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
+- gtk_widget_destroy(fs);
++ gtk_widget_destroy(GTK_WIDGET(fs));
+ ErrorExitWarn(LoadSettings(), 'w');
+ }
+
+@@ -452,7 +470,7 @@
+ /* Get the selected filename and copy it into the global save_filename. */
+ {
+ save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
+- gtk_widget_destroy(fs);
++ gtk_widget_destroy(GTK_WIDGET(fs));
+ ErrorExitWarn(SaveSettings(), 'e');
+ }
+
+--- a/src/gtk.h
++++ b/src/gtk.h
+@@ -7,23 +7,23 @@
+ #include <sys/mman.h>
+ #include <gtk/gtk.h>
+
+-GdkBitmap *rmask;
+-GdkBitmap *pmask;
+-GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
+-GdkPixmap *record_pixmap;
+-GdkPixmap *play_pixmap;
+-GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
+-GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
+-GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
+-GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
+-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
+-GtkWidget *levels[SOUND_MIXER_NRDEVICES];
+-GtkWidget *maintable;
+-gint balcallback[SOUND_MIXER_NRDEVICES];
+-gint lvlcallback[SOUND_MIXER_NRDEVICES];
+-gint rpcallback[SOUND_MIXER_NRDEVICES];
+-gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
+-GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
++extern GdkBitmap *rmask;
++extern GdkBitmap *pmask;
++extern GtkWidget *pixmapwid[SOUND_MIXER_NRDEVICES];
++extern GdkPixmap *record_pixmap;
++extern GdkPixmap *play_pixmap;
++extern GtkAdjustment *adjustment[SOUND_MIXER_NRDEVICES];
++extern GtkAdjustment *balance[SOUND_MIXER_NRDEVICES];
++extern GtkWidget *baltracks[SOUND_MIXER_NRDEVICES];
++extern GtkWidget *channellabel[SOUND_MIXER_NRDEVICES];
++extern GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
++extern GtkWidget *levels[SOUND_MIXER_NRDEVICES];
++extern GtkWidget *maintable;
++extern gint balcallback[SOUND_MIXER_NRDEVICES];
++extern gint lvlcallback[SOUND_MIXER_NRDEVICES];
++extern gint rpcallback[SOUND_MIXER_NRDEVICES];
++extern gboolean menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
++extern GtkWidget *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
+ void WakeUpGTK(void);
+ void HideShowBalancesGTK(void);
+ void HideShowNumbersGTK(void);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/aumix-gtk.git/commitdiff/20b869c86bad7502cf9339f18a2d4b4931897d9b
More information about the pld-cvs-commit
mailing list