Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at Wed Sep 2 00:11:48 CEST 2009. -------- --- alsa-tools/alsa-tools.changes 2009-06-08 11:53:14.000000000 +0200 +++ alsa-tools/alsa-tools.changes 2009-08-31 16:33:59.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 16:24:43 CEST 2009 - tiwai@suse.de + +- updated to version 1.0.21: + just a version bump including previous fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-tools-1.0.20.tar.bz2 alsa-tools-git-fixes.diff New: ---- alsa-tools-1.0.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.fcCetO/_old 2009-09-02 00:11:32.000000000 +0200 +++ /var/tmp/diff_new_pack.fcCetO/_new 2009-09-02 00:11:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package alsa-tools (Version 1.0.20) +# spec file for package alsa-tools (Version 1.0.21) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,11 +20,11 @@ Name: alsa-tools BuildRequires: alsa-devel fdupes fltk-devel gcc-c++ gtk2-devel update-desktop-files -%define package_version 1.0.20 +%define package_version 1.0.21 Url: http://www.alsa-project.org/ Summary: Various ALSA Tools -Version: 1.0.20 -Release: 3 +Version: 1.0.21 +Release: 1 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Utilities AutoReqProv: on @@ -37,7 +37,7 @@ Source7: rme.png Source8: envy24.png Patch: alsa-tools-desktop-fix.dif -Patch1: alsa-tools-git-fixes.diff +# Patch1: alsa-tools-git-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,7 +91,7 @@ %setup -q -a 2 -n %{name}-%{package_version} cp %{SOURCE1} . %patch -p1 -%patch1 -p1 +# %patch1 -p1 %build for d in envy24control rmedigicontrol echomixer; do ++++++ alsa-tools-1.0.20.tar.bz2 -> alsa-tools-1.0.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/Makefile new/alsa-tools-1.0.21/Makefile --- old/alsa-tools-1.0.20/Makefile 2009-05-06 09:19:06.000000000 +0200 +++ new/alsa-tools-1.0.21/Makefile 2009-08-31 15:18:57.000000000 +0200 @@ -1,4 +1,4 @@ -VERSION = 1.0.20 +VERSION = 1.0.21 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/ac3dec/ac3dec.c new/alsa-tools-1.0.21/ac3dec/ac3dec.c --- old/alsa-tools-1.0.20/ac3dec/ac3dec.c 2009-05-06 09:07:25.000000000 +0200 +++ new/alsa-tools-1.0.21/ac3dec/ac3dec.c 2009-08-31 15:09:39.000000000 +0200 @@ -58,7 +58,7 @@ printf(" -R,--iec958r raw IEC958 (S/PDIF) PCM\n"); printf(" -H,--hdmi output to HDMI device\n"); printf(" -Z,--zero=# add # zero-AC3-frames before stream\n"); - printf(" -q,--quit quit mode\n"); + printf(" -q,--quiet quiet mode\n"); } #define CHUNK_SIZE 2047 @@ -109,7 +109,7 @@ {"iec958r", 0, NULL, 'R'}, {"hdmi", 0, NULL, 'H'}, {"zero", 1, NULL, 'Z'}, - {"quit", 0, NULL, 'q'}, + {"quiet", 0, NULL, 'q'}, {NULL, 0, NULL, 0}, }; ac3_config_t ac3_config; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/envy24control/strstr_icase_blank.c new/alsa-tools-1.0.21/envy24control/strstr_icase_blank.c --- old/alsa-tools-1.0.20/envy24control/strstr_icase_blank.c 2009-05-06 09:07:25.000000000 +0200 +++ new/alsa-tools-1.0.21/envy24control/strstr_icase_blank.c 2009-08-31 15:09:39.000000000 +0200 @@ -48,7 +48,6 @@ char search_string[MAX_SEARCH_FIELD_LENGTH]; char *pstr; int pos_first_non_blank; - int isblank(int c); strncpy(search_string, string2, MAX_SEARCH_FIELD_LENGTH); search_string[MAX_SEARCH_FIELD_LENGTH - 1] = '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/hdspconf/configure new/alsa-tools-1.0.21/hdspconf/configure --- old/alsa-tools-1.0.20/hdspconf/configure 2009-05-06 09:17:49.000000000 +0200 +++ new/alsa-tools-1.0.21/hdspconf/configure 2009-08-31 15:17:42.000000000 +0200 @@ -5144,7 +5144,7 @@ FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags` CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS" -LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS" +LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS" ac_config_files="$ac_config_files Makefile src/Makefile pixmaps/Makefile" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/hdspconf/configure.in new/alsa-tools-1.0.21/hdspconf/configure.in --- old/alsa-tools-1.0.20/hdspconf/configure.in 2009-05-06 09:07:25.000000000 +0200 +++ new/alsa-tools-1.0.21/hdspconf/configure.in 2009-08-31 15:09:39.000000000 +0200 @@ -36,6 +36,6 @@ FLTK_LIBS=`$FLTK_CONFIG $fltk_config_args --ldflags` CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS" -LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS" +LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS" AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/qlo10k1/acinclude.m4 new/alsa-tools-1.0.21/qlo10k1/acinclude.m4 --- old/alsa-tools-1.0.20/qlo10k1/acinclude.m4 2009-05-06 09:07:25.000000000 +0200 +++ new/alsa-tools-1.0.21/qlo10k1/acinclude.m4 2009-08-31 15:09:39.000000000 +0200 @@ -134,18 +134,23 @@ QT_GUILINK="" QASSISTANTCLIENT_LDADD="-lqassistantclient" +if test -z "$x_libraries"; then + X_PATH="" +else + X_PATH="-L$x_libraries" +fi case "${host}" in *irix*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE" fi ;; *linux*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" fi ;; @@ -154,14 +159,14 @@ # Digital Unix (aka DGUX aka Tru64) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE" fi ;; *solaris*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" fi ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/qlo10k1/configure new/alsa-tools-1.0.21/qlo10k1/configure --- old/alsa-tools-1.0.20/qlo10k1/configure 2009-05-06 09:18:57.000000000 +0200 +++ new/alsa-tools-1.0.21/qlo10k1/configure 2009-08-31 15:18:47.000000000 +0200 @@ -20604,18 +20604,23 @@ QT_GUILINK="" QASSISTANTCLIENT_LDADD="-lqassistantclient" +if test -z "$x_libraries"; then + X_PATH="" +else + X_PATH="-L$x_libraries" +fi case "${host}" in *irix*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE" fi ;; *linux*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" fi ;; @@ -20624,14 +20629,14 @@ # Digital Unix (aka DGUX aka Tru64) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE" fi ;; *solaris*) QT_LIBS="$QT_LIB" if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" + QT_LIBS="$QT_LIBS $X_PATH -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" fi ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-tools-1.0.20/us428control/Cus428State.cc new/alsa-tools-1.0.21/us428control/Cus428State.cc --- old/alsa-tools-1.0.20/us428control/Cus428State.cc 2009-05-06 09:07:25.000000000 +0200 +++ new/alsa-tools-1.0.21/us428control/Cus428State.cc 2009-08-31 15:09:39.000000000 +0200 @@ -253,7 +253,7 @@ LightSend(); if (StateInputMonitor()) { if (LightIs(eL_Solo)) { - for (int i = 0; i < 8; ++i) { + for (int i = 0; i < 5; ++i) { usX2Y_volume V = Volume[i]; if (!LightIs(eL_Mute0 + i) || (MuteInputMonitor & (1 << i))) V.LH = V.LL = V.RL = V.RH = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org