forked from pool/alsa-utils
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
748d58d80c
commit
49cdd6ea6a
@ -1,6 +1,22 @@
|
||||
diff -r 16f32be6b8b9 alsamixer/Makefile.am
|
||||
--- a/alsamixer/Makefile.am Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/alsamixer/Makefile.am Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -1,9 +1,10 @@ LDADD = $(CURSESLIB)
|
||||
-LDADD = $(CURSESLIB)
|
||||
+AM_CFLAGS = @CURSES_CFLAGS@ -DCURSESINC="@CURSESINC@"
|
||||
+LDADD = @CURSESLIB@
|
||||
|
||||
bin_PROGRAMS = alsamixer
|
||||
man_MANS = alsamixer.1
|
||||
EXTRA_DIST = alsamixer.1
|
||||
-alsamixer_INCLUDES = -I$(top_srcdir)/include -DCURSESINC="$(CURSESINC)"
|
||||
+alsamixer_INCLUDES = -I$(top_srcdir)/include
|
||||
|
||||
#LDFLAGS = -static
|
||||
#CFLAGS += -g -Wall
|
||||
diff -r 16f32be6b8b9 aplay/aplay.1
|
||||
--- a/aplay/aplay.1 Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/aplay/aplay.1 Fri Mar 14 14:13:38 2008 +0100
|
||||
+++ b/aplay/aplay.1 Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -114,6 +114,11 @@ This option is accumulative. The VU met
|
||||
This option is accumulative. The VU meter is displayed when this
|
||||
is given twice or three times.
|
||||
@ -15,7 +31,7 @@ diff -r 16f32be6b8b9 aplay/aplay.1
|
||||
|
||||
diff -r 16f32be6b8b9 aplay/aplay.c
|
||||
--- a/aplay/aplay.c Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/aplay/aplay.c Fri Mar 14 14:13:38 2008 +0100
|
||||
+++ b/aplay/aplay.c Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -71,6 +71,12 @@ static snd_pcm_sframes_t (*readn_func)(s
|
||||
static snd_pcm_sframes_t (*readn_func)(snd_pcm_t *handle, void **bufs, snd_pcm_uframes_t size);
|
||||
static snd_pcm_sframes_t (*writen_func)(snd_pcm_t *handle, void **bufs, snd_pcm_uframes_t size);
|
||||
@ -274,7 +290,7 @@ diff -r 16f32be6b8b9 aplay/aplay.c
|
||||
while (count-- > 0) {
|
||||
if (format_little_endian) {
|
||||
val = valp[0] | (valp[1]<<8) | (valp[2]<<16);
|
||||
@@ -1169,24 +1294,31 @@ static void compute_max_peak(u_char *dat
|
||||
@@ -1169,30 +1294,37 @@ static void compute_max_peak(u_char *dat
|
||||
val |= 0xff<<24; /* Negate upper bits too */
|
||||
}
|
||||
val = abs(val) ^ mask;
|
||||
@ -311,6 +327,13 @@ diff -r 16f32be6b8b9 aplay/aplay.c
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
if (run == 0) {
|
||||
- fprintf(stderr, _("Unsupported bit size %d.\n"), bits_per_sample);
|
||||
+ fprintf(stderr, _("Unsupported bit size %d.\n"), (int)bits_per_sample);
|
||||
run = 1;
|
||||
}
|
||||
return;
|
||||
@@ -1201,45 +1333,38 @@ static void compute_max_peak(u_char *dat
|
||||
if (max <= 0)
|
||||
max = 0x7fffffff;
|
||||
@ -434,7 +457,7 @@ diff -r 16f32be6b8b9 aplay/aplay.c
|
||||
tmp2 = (samplesize == 8) ? 1 : 2;
|
||||
diff -r 16f32be6b8b9 aplay/formats.h
|
||||
--- a/aplay/formats.h Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/aplay/formats.h Fri Mar 14 14:13:38 2008 +0100
|
||||
+++ b/aplay/formats.h Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -64,7 +64,15 @@ typedef struct voc_ext_block {
|
||||
#define WAV_WAVE COMPOSE_ID('W','A','V','E')
|
||||
#define WAV_FMT COMPOSE_ID('f','m','t',' ')
|
||||
@ -479,8 +502,8 @@ diff -r 16f32be6b8b9 aplay/formats.h
|
||||
u_int type; /* 'data' */
|
||||
diff -r 16f32be6b8b9 configure.in
|
||||
--- a/configure.in Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/configure.in Fri Mar 14 14:13:38 2008 +0100
|
||||
@@ -27,9 +27,7 @@ dnl AC_PROG_CXX
|
||||
+++ b/configure.in Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -27,10 +27,11 @@ dnl AC_PROG_CXX
|
||||
dnl AC_PROG_CXX
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
@ -489,11 +512,54 @@ diff -r 16f32be6b8b9 configure.in
|
||||
- AC_ERROR([No TLV support code in alsa-lib]))
|
||||
+AM_PATH_ALSA(1.0.16)
|
||||
|
||||
+CURSESINC=""
|
||||
+CURSESLIB=""
|
||||
+CURSES_CFLAGS=""
|
||||
AC_ARG_ENABLE(alsamixer,
|
||||
[ --disable-alsamixer Disable alsamixer compilation],
|
||||
[case "${enableval}" in
|
||||
@@ -48,12 +49,28 @@ if test x$alsamixer = xtrue; then
|
||||
curseslib="$withval",
|
||||
curseslib="auto")
|
||||
if test "$curseslib" = "ncursesw"; then
|
||||
- AC_CHECK_LIB(ncursesw, initscr,
|
||||
+ AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
|
||||
+ if test "$ncursesw5_config" = "yes"; then
|
||||
+ CURSESINC="<ncurses.h>"
|
||||
+ CURSESLIB=`ncursesw5-config --libs`
|
||||
+ CURSES_CFLAGS=`ncursesw5-config --cflags`
|
||||
+ curseslib="ncursesw"
|
||||
+ else
|
||||
+ AC_CHECK_LIB(ncursesw, initscr,
|
||||
[ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
|
||||
+ fi
|
||||
fi
|
||||
if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
|
||||
- AC_CHECK_LIB(ncurses, initscr,
|
||||
+ AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
|
||||
+ if test "$ncurses5_config" = "yes"; then
|
||||
+ CURSESINC="<ncurses.h>"
|
||||
+ CURSESLIB=`ncurses5-config --libs`
|
||||
+ CURSES_CFLAGS=`ncurses5-config --cflags`
|
||||
+ curseslib="ncurses"
|
||||
+ else
|
||||
+ AC_CHECK_LIB(ncurses, initscr,
|
||||
[ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
|
||||
+ fi
|
||||
fi
|
||||
if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
|
||||
AC_CHECK_LIB(curses, initscr,
|
||||
@@ -66,6 +83,7 @@ fi
|
||||
|
||||
AC_SUBST(CURSESINC)
|
||||
AC_SUBST(CURSESLIB)
|
||||
+AC_SUBST(CURSES_CFLAGS)
|
||||
|
||||
test "x$prefix" = xNONE && prefix=$ac_default_prefix
|
||||
|
||||
diff -r 16f32be6b8b9 seq/aplaymidi/arecordmidi.c
|
||||
--- a/seq/aplaymidi/arecordmidi.c Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/seq/aplaymidi/arecordmidi.c Fri Mar 14 14:13:38 2008 +0100
|
||||
+++ b/seq/aplaymidi/arecordmidi.c Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -857,7 +857,7 @@ int main(int argc, char *argv[])
|
||||
pfds = alloca(sizeof(*pfds) * npfds);
|
||||
for (;;) {
|
||||
@ -505,7 +571,7 @@ diff -r 16f32be6b8b9 seq/aplaymidi/arecordmidi.c
|
||||
snd_seq_event_t *event;
|
||||
diff -r 16f32be6b8b9 seq/aseqdump/aseqdump.c
|
||||
--- a/seq/aseqdump/aseqdump.c Tue Feb 05 10:08:11 2008 +0100
|
||||
+++ b/seq/aseqdump/aseqdump.c Fri Mar 14 14:13:38 2008 +0100
|
||||
+++ b/seq/aseqdump/aseqdump.c Wed Apr 16 14:44:27 2008 +0200
|
||||
@@ -133,71 +133,75 @@ static void dump_event(const snd_seq_eve
|
||||
printf("%3d:%-3d ", ev->source.client, ev->source.port);
|
||||
switch (ev->type) {
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 16 14:44:32 CEST 2008 - tiwai@suse.de
|
||||
|
||||
- HG snapshot 20080416:
|
||||
* fix a cast warning in aplay
|
||||
* use ncurses*-config in configure
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 14 14:13:53 CET 2008 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ Requires: dialog pciutils
|
||||
AutoReqProv: on
|
||||
Summary: Advanced Linux Sound Architecture Utilities
|
||||
Version: 1.0.16
|
||||
Release: 19
|
||||
Release: 26
|
||||
Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
|
||||
Patch: alsa-utils-hg-fixes.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
@ -69,6 +69,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%{_datadir}/alsa
|
||||
|
||||
%changelog
|
||||
* Wed Apr 16 2008 tiwai@suse.de
|
||||
- HG snapshot 20080416:
|
||||
* fix a cast warning in aplay
|
||||
* use ncurses*-config in configure
|
||||
* Fri Mar 14 2008 tiwai@suse.de
|
||||
- HG snapshot 20080314:
|
||||
* stereo VU-meter support in aplay
|
||||
|
||||
Loading…
Reference in New Issue
Block a user