rpms/aumix/devel aumix.spec,1.5,1.6 curses-cleanup.patch,1.1,1.2

[Gabriel L. Somlo (somlo)]

Author: somlo

Update of /cvs/extras/rpms/aumix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18281

Modified Files:
	aumix.spec curses-cleanup.patch 
Log Message:
- curses-cleanup.patch now stripping aumix down to cmdline+curses+mixer code
- mousemask exception for /usr/bin/screen removed (gpm bug #233488 now fixed) 



Index: aumix.spec
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/aumix.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aumix.spec	21 Mar 2007 15:02:37 -0000	1.5
+++ aumix.spec	29 Mar 2007 01:49:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name: aumix
 Version: 2.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Audio mixer based on ncurses
 License: GPL
 Group: Applications/Multimedia
@@ -28,7 +28,7 @@
 %patch5 -p1
 
 %build
-%configure --without-gtk --without-gtk1
+%configure
 %{__make} %{?_smp_mflags}
 
 %install
@@ -50,6 +50,10 @@
 %{_datadir}/aumix
 
 %changelog
+* Wed Mar 21 2007 Gabriel L. Somlo <somlo at cmu.edu> 2.8-15
+- curses-cleanup.patch now stripping aumix down to cmdline+curses+mixer code
+- mousemask exception for /usr/bin/screen removed (gpm bug #233488 now fixed) 
+
 * Tue Mar 20 2007 Gabriel L. Somlo <somlo at cmu.edu> 2.8-14
 - curses-cleanup.patch removes "cruft" such as gtk and system/console mouse
 - more importantly, it fixes bugzilla ticket # 232828

curses-cleanup.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 curses-cleanup.patch
Index: curses-cleanup.patch
===================================================================
RCS file: /cvs/extras/rpms/aumix/devel/curses-cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curses-cleanup.patch	21 Mar 2007 15:02:37 -0000	1.1
+++ curses-cleanup.patch	29 Mar 2007 01:49:39 -0000	1.2
@@ -1,6 +1,10551 @@
+diff -NarU5 aumix-2.8.orig/config.h.in aumix-2.8/config.h.in
+--- aumix-2.8.orig/config.h.in	2002-11-24 20:35:41.000000000 -0500
++++ aumix-2.8/config.h.in	2007-03-21 14:34:23.000000000 -0400
+@@ -160,13 +160,10 @@
+ #undef HAVE_SYS_TIME_H
+ 
+ /* Define if you have the <unistd.h> header file.  */
+ #undef HAVE_UNISTD_H
+ 
+-/* Define if you have the gpm library (-lgpm).  */
+-#undef HAVE_LIBGPM
+-
+ /* Define if you have the ossaudio library (-lossaudio).  */
+ #undef HAVE_LIBOSSAUDIO
+ 
+ /* Name of package */
+ #undef PACKAGE
+@@ -192,24 +189,14 @@
+ 
+ /* Define this if your ncurses library has the member _use_keypad
+ 	in structure WINDOW. */
+ #undef HAVE_USEKEYPAD
+ 
+-/* Define this if you have sysmouse console mouse support and
+-	want to use it. */
+-#undef HAVE_SYSMOUSE
+-
+ /* Define this to use built-in label text. */
+ #undef USE_OWN_LABELS
+ 
+ /* ALSA-specific features are disabled for now. */
+ #undef HAVE_ALSA_DISABLED
+ 
+-/* Define this if you want to compile with support for GTK+ 2.0. */
+-#undef HAVE_GTK
+-
+-/* Define this if you want to compile with support for GTK+ 1.2. */
+-#undef HAVE_GTK1
+-
+ /* Define if you want built-in emulation of a sound driver, for debugging. */
+ #undef DUMMY_MIXER
+ 
+diff -NarU5 aumix-2.8.orig/configure aumix-2.8/configure
+--- aumix-2.8.orig/configure	2002-11-24 20:35:48.000000000 -0500
++++ aumix-2.8/configure	2007-03-21 14:39:52.000000000 -0400
+@@ -1,71 +1,344 @@
+ #! /bin/sh
+-
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.13 
+-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
++# Generated by GNU Autoconf 2.59.
+ #
++# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
[...10805 lines suppressed...]
- }
+-}
  
  void            RefreshAllSettings(void)
  {
  	int             dev;
-@@ -157,14 +135,12 @@
+ 	for (dev = 0; dev < SOUND_MIXER_NRDEVICES; dev++) {
+@@ -157,14 +114,12 @@
  			UnmuteOne(device);
  		}
  	}
@@ -1217,7 +11969,7 @@
  
  void            ToggleMuting(void)
  /* Switch between no muting and global muting; do nothing if soloing (MUTE_ONLY). */
-@@ -244,14 +220,12 @@
+@@ -244,14 +199,12 @@
  }
  
  void            DrawLevelBalMode(int dev, int mode)
@@ -1232,7 +11984,7 @@
  void            AdjustLevel(int dev, int incr, int setlevel)
  /*
   *  dev: device to adjust
-@@ -294,23 +268,19 @@
+@@ -294,23 +247,19 @@
  	DrawLevel(dev);
  }
  
@@ -1256,7 +12008,7 @@
  void            AdjustBalance(int dev, int incr, int setabs)
  /*
   *  dev: device to adjust
-@@ -350,14 +320,12 @@
+@@ -350,14 +299,12 @@
  }
  
  void            RedrawBalance(int dev)
@@ -1271,7 +12023,7 @@
  void            SwitchRecordPlay(int dev)
  {
  	/* Toggle record/play. */
-@@ -374,26 +342,18 @@
+@@ -374,26 +321,12 @@
  	}
  }
  
@@ -1281,13 +12033,13 @@
  	if (interactive == IN_CURSES)
  		DrawRecordPlayCurses(dev);
 -#endif				/* HAVE_CURSES */
- }
- 
- void            CloseScreen(void)
- {
+-}
+-
+-void            CloseScreen(void)
+-{
 -#ifdef HAVE_CURSES
- 	if (interactive == IN_CURSES)
- 		CloseScreenCurses();
+-	if (interactive == IN_CURSES)
+-		CloseScreenCurses();
 -#endif				/* HAVE_CURSES */
 -#if defined (HAVE_GTK) || defined (HAVE_GTK1)
 -	if (interactive == IN_GTK)
@@ -1298,7 +12050,7 @@
  void            ReadInteractiveKeys(void)
  {
  	chark = strdup(LOCAL_TEXT("k"));
-@@ -402,6 +362,6 @@
+@@ -402,6 +335,6 @@
  	charo = strdup(LOCAL_TEXT("o"));
  	charq = strdup(LOCAL_TEXT("q"));
  	chars = strdup(LOCAL_TEXT("s"));
@@ -1306,9 +12058,38 @@
  }
 -#endif				/* HAVE_CURSES || HAVE_GTK || HAVE_GTK1 */
 +#endif				/* HAVE_CURSES */
+diff -NarU5 aumix-2.8.orig/src/interactive.h aumix-2.8/src/interactive.h
+--- aumix-2.8.orig/src/interactive.h	2000-04-12 11:02:04.000000000 -0400
++++ aumix-2.8/src/interactive.h	2007-03-22 13:53:07.000000000 -0400
+@@ -2,16 +2,12 @@
+ #define INTERACTIVE_H
+ #define MUTE_NO_DEVICE -1
+ #define MUTE_OFF 0
+ #define MUTE_GLOBAL 1
+ #define MUTE_ONLY 2
+-#define        REFRESH_PERIOD 1	/* number of seconds between updates */
+ 
+ char           *chark, *charl, *charm, *charo, *charq, *chars, *charu;
+-void            AumixSignalHandler(int signal_number);
+-void            InitScreen(void);
+-void            KeysBox(void);
+ void            RefreshAllSettings(void);
+ void            RefreshNewSettings(void);
+ void            Muting(int device, int newstate);
+ void            ToggleMuting(void);
+ void            MuteAll(void);
+@@ -28,8 +24,7 @@
+ void            EraseLevel(int dev);
+ void            AdjustBalance(int dev, int incr, int setabs);
+ void            RedrawBalance(int dev);
+ void            SwitchRecordPlay(int dev);
+ void            DrawRecordPlay(int dev);
+-void            CloseScreen(void);
+ void            ReadInteractiveKeys(void);
+ #endif				/* INTERACTIVE_H */
 diff -NarU5 aumix-2.8.orig/src/Makefile.am aumix-2.8/src/Makefile.am
 --- aumix-2.8.orig/src/Makefile.am	2002-03-18 20:09:17.000000000 -0500
-+++ aumix-2.8/src/Makefile.am	2007-03-20 16:26:05.000000000 -0400
++++ aumix-2.8/src/Makefile.am	2007-03-21 14:42:44.000000000 -0400
 @@ -1,17 +1,17 @@
  # $Aumix: aumix/src/Makefile.am,v 1.2 2002/03/19 01:09:17 trevor Exp $
  bin_PROGRAMS	= aumix
@@ -1323,7 +12104,7 @@
  localedir	= $(datadir)/locale
  INCLUDES	= -I../intl -DLOCALEDIR=\"$(localedir)\" -I at includedir@
 -CFLAGS		= @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
-+CFLAGS		= @CFLAGS@ @GLIB_CFLAGS@
++CFLAGS		= @CFLAGS@
  LDADD		= -L at libdir@
 -LIBS		= @LIBS@ @GTK_LIBS@ @INTLLIBS@
 +LIBS		= @LIBS@ @INTLLIBS@
@@ -1333,11 +12114,15 @@
  	$(COMPILE) -DDATADIR=\"$(datadir)/aumix\" -c $<
 diff -NarU5 aumix-2.8.orig/src/Makefile.in aumix-2.8/src/Makefile.in
 --- aumix-2.8.orig/src/Makefile.in	2002-11-24 20:35:45.000000000 -0500
-+++ aumix-2.8/src/Makefile.in	2007-03-20 16:26:05.000000000 -0400
-@@ -66,13 +66,10 @@
++++ aumix-2.8/src/Makefile.in	2007-03-21 14:42:38.000000000 -0400
+@@ -62,17 +62,12 @@
+ AWK = @AWK@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
  CURSLIB = @CURSLIB@
- GLIB_CFLAGS = @GLIB_CFLAGS@
- GLIB_LIBS = @GLIB_LIBS@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
  GMOFILES = @GMOFILES@
  GMSGFMT = @GMSGFMT@
 -GTK_CFLAGS = @GTK_CFLAGS@
@@ -1348,7 +12133,7 @@
  HAVE_NLS = @HAVE_NLS@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
-@@ -86,26 +83,26 @@
+@@ -86,26 +81,26 @@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
  
@@ -1360,7 +12145,7 @@
  localedir = $(datadir)/locale
  INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I at includedir@
 -CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
-+CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
++CFLAGS = @CFLAGS@
  LDADD = -L at libdir@
 -LIBS = @LIBS@ @GTK_LIBS@ @INTLLIBS@
 +LIBS = @LIBS@ @INTLLIBS@
@@ -1381,8 +12166,8 @@
  SCRIPTS =  $(bin_SCRIPTS)
 diff -NarU5 aumix-2.8.orig/src/mouse.c aumix-2.8/src/mouse.c
 --- aumix-2.8.orig/src/mouse.c	2002-05-07 04:41:38.000000000 -0400
-+++ aumix-2.8/src/mouse.c	2007-03-20 17:37:30.000000000 -0400
-@@ -17,144 +17,21 @@
++++ aumix-2.8/src/mouse.c	2007-03-22 13:52:43.000000000 -0400
+@@ -17,155 +17,32 @@
   * Suite 330, Boston, MA 02111-1307, USA.
   */
  
@@ -1523,10 +12308,23 @@
  		case 2:	/* quit */
 -			Gpm_Close();
  			close(mixer_fd);
- 			CloseScreen();
+-			CloseScreen();
++			CloseScreenCurses();
  			exit(EXIT_SUCCESS);
  		case 3:	/* load */
  			LoadSettings();
+ 			return;
+ 		case 4:	/* save */
+ 			SaveSettings();
+ 			return;
+ 		case 5:	/* keys */
+-			KeysBox();
++			KeysBoxCurses();
+ 			return;
+ 		case 6:	/* mute */
+ 			Muting(MUTE_NO_DEVICE, MUTE_GLOBAL);
+ 			return;
+ 		case 7:	/* only */
 diff -NarU5 aumix-2.8.orig/src/mouse.h aumix-2.8/src/mouse.h
 --- aumix-2.8.orig/src/mouse.h	2002-03-28 04:37:27.000000000 -0500
 +++ aumix-2.8/src/mouse.h	2007-03-20 16:26:05.000000000 -0400