rpms/aumix/devel aumix-2.8-bug-115869.patch, NONE, 1.1 aumix-2.8-include-signal_h.patch, NONE, 1.1 aumix-2.8-save_load.patch, NONE, 1.1 aumix-fix-crackrock.patch, NONE, 1.1 aumix-fix-cursor-color-on-exit.patch, NONE, 1.1 aumix.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Gabriel L. Somlo (somlo)
fedora-extras-commits at redhat.com
Mon Nov 13 14:47:03 UTC 2006
Author: somlo
Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512/devel
Modified Files:
.cvsignore sources
Added Files:
aumix-2.8-bug-115869.patch aumix-2.8-include-signal_h.patch
aumix-2.8-save_load.patch aumix-fix-crackrock.patch
aumix-fix-cursor-color-on-exit.patch aumix.spec
Log Message:
auto-import aumix-2.8-1 on branch devel from aumix-2.8-1.src.rpm
aumix-2.8-bug-115869.patch:
--- NEW FILE aumix-2.8-bug-115869.patch ---
Patch by mharris to fix bug:
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=115869
--- src/mute.bug-115869 Thu Dec 23 11:56:42 2004
+++ src/mute Thu Dec 23 11:56:55 2004
@@ -8,7 +8,8 @@
volumes=$(aumix -vq |tr -d ,)
if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \
$(echo $volumes | awk '{print $3}') -ne 0 ]; then
- aumix -S -v 0
+ aumix -S
+ aumix -v 0
else
aumix -L > /dev/null
fi
aumix-2.8-include-signal_h.patch:
--- NEW FILE aumix-2.8-include-signal_h.patch ---
--- src/common.h.include-signal_h Sun May 18 01:40:04 2003
+++ src/common.h Sun May 18 01:38:55 2003
@@ -37,6 +37,7 @@
#include <stdlib.h> /* getenv() */
#include <string.h>
#include <sys/types.h>
+#include <signal.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
aumix-2.8-save_load.patch:
--- NEW FILE aumix-2.8-save_load.patch ---
--- aumix-2.7/src/common.c.save_load Mon Jun 25 22:08:22 2001
+++ aumix-2.7/src/common.c Mon Jun 25 22:16:30 2001
@@ -114,6 +114,7 @@
int main(int argc, char *argv[])
{
int optn, ii;
+ int save = 0, load = 0;
#ifdef HAVE_CURSES
int setcolors = FALSE;
#endif /* HAVE_CURSES */
@@ -169,14 +170,10 @@
break;
#endif /* HAVE_CURSES */
case 'S': /* Save to file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(SaveSettings(), 'e');
+ save = 1;
break;
case 'L': /* Load from file. */
- if (mixer_fd == -1)
- ErrorExitWarn(InitializeMixer(device_filename), 'e');
- ErrorExitWarn(LoadSettings(), 'e');
+ load = 1;
break;
#if defined (HAVE_CURSES) || defined (HAVE_GTK)
case 'I': /* User asked for interactive mode. */
@@ -192,6 +189,17 @@
}
}
}
+ if (save | load) {
+ if (mixer_fd == -1)
+ ErrorExitWarn(InitializeMixer(device_filename), 'e');
+ if (save)
+ ErrorExitWarn(SaveSettings(), 'e');
+ else
+ ErrorExitWarn(LoadSettings(), 'e');
+ close(mixer_fd);
+ exit(EXIT_SUCCESS);
+ }
+
#if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1)
/* Be interactive if no options were given. */
if (!interactive && argc <= 1)
aumix-fix-crackrock.patch:
--- NEW FILE aumix-fix-crackrock.patch ---
--- src/common.c.fix-crackrock Thu Dec 23 12:48:25 2004
+++ src/common.c Thu Dec 23 12:51:59 2004
@@ -19,6 +19,7 @@
* Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <errno.h>
#include "common.h"
#ifdef HAVE_CURSES
#include "curses.h"
@@ -612,17 +612,16 @@
int SetShowNoninter(int dev)
{
/* Change or display settings from the command line. */
- char *devstr, dest;
+ char *devstr;
int change = 0, tmp, left, right;
/* Increase or decrease levels, optionally by a number. */
if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
right = tmp >> 8; /* I'll take the high byte, */
left = tmp & 0xFF; /* and you take the low byte. */
- strncpy(&dest, (optarg + 1), 3);
- change = 1; /* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
- if (atoi(&dest))
- change = atoi(&dest);
+ change = (int) strtol(optarg, NULL, 10);
+ if (errno)
+ change = 1; /* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
if (*optarg == '+') { /* increase */
right += change;
left += change;
aumix-fix-cursor-color-on-exit.patch:
--- NEW FILE aumix-fix-cursor-color-on-exit.patch ---
michael at yohe.net - this fixes the blue cursor that appears on some terminals
as - CloseScreen() resets the color to default, but nothing ever gets printed
so the cursor was never updated. Simply adding a carriage return does not
change the behavior, and will reset the cursor properly.
--- src/common.c 2002-11-25 10:07:08.000000000 -0600
+++ src/common.c 2002-11-25 10:06:50.000000000 -0600
@@ -251,6 +251,9 @@
close(mixer_fd);
#if HAVE_CURSES
CloseScreen();
+
+ /* simple carriage return to reset the cursor */
+ printf( "\n" );
}
#endif /* HAVE_CURSES */
exit(EXIT_SUCCESS);
--- NEW FILE aumix.spec ---
Name: aumix
Version: 2.8
Release: 1%{?dist}
Summary: Audio mixer based on ncurses
License: GPL
Group: Applications/Multimedia
URL: http://jpj.net/~trevor/aumix.html
Source0: http://www.jpj.net/~trevor/aumix/%{name}-%{version}.tar.bz2
Patch0: aumix-2.8-save_load.patch
Patch1: aumix-2.8-include-signal_h.patch
Patch2: aumix-fix-cursor-color-on-exit.patch
Patch3: aumix-fix-crackrock.patch
Patch4: aumix-2.8-bug-115869.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext ncurses-devel
%description
An audio mixer with a compact visual layout based on ncurses.
%prep
%setup -q
%patch0 -p1
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%build
%configure --without-gtk --without-gtk1
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -rf %{buildroot}/%{_bindir}/mute
%find_lang %{name}
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO
%{_bindir}/aumix
%{_bindir}/xaumix
%{_mandir}/man1/xaumix.*
%{_mandir}/man1/aumix.*
%{_datadir}/aumix
%changelog
* Wed Nov 08 2006 Gabriel L. Somlo <somlo at cmu.edu> 2.8-1
- initial Extras build based on latest Core CVS, including all their patches
- only building ncurses version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Nov 2006 14:45:53 -0000 1.1
+++ .cvsignore 13 Nov 2006 14:46:33 -0000 1.2
@@ -0,0 +1 @@
+aumix-2.8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Nov 2006 14:45:53 -0000 1.1
+++ sources 13 Nov 2006 14:46:33 -0000 1.2
@@ -0,0 +1 @@
+dc3fc7209752207c23e7c94ab886b340 aumix-2.8.tar.bz2
More information about the scm-commits
mailing list