Update of /cvsroot/alsa/alsa-tools/hdspmixer
In directory sc8-pr-cvs1:/tmp/cvs-serv1453/hdspmixer
Modified Files:
Makefile.am NEWS configure.in
Added Files:
hdspmixer.desktop
Log Message:
- fixed H9632 problem.
- added desktop file and icon
new options --with-desktop-dir and --with-pixmap-dir.
- fixed CXXFLAGS for soundbase option.
- fixed compile warnings.
--- NEW FILE: hdspmixer.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=HDSPMixer
Comment=Hammerfall DSP matrix mixer control GUI
Exec=hdspmixer
FilePattern=hdspmixer
Icon=hdspmixer.png
Terminal=false
Type=Application
Categories=Application;AudioVideo;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 28 Jul 2003 11:32:32 -0000 1.1
+++ Makefile.am 24 Nov 2003 14:48:21 -0000 1.2
@@ -1,4 +1,8 @@
+EXTRA_DIST = hdspmixer.desktop
SUBDIRS = src pixmaps
+
+desktopdir = $(DESKTOP_DIR)
+desktop_DATA = hdspmixer.desktop
alsa-dist: distdir
@rm -rf ../distdir/hdspmixer
Index: NEWS
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NEWS 3 Nov 2003 19:10:38 -0000 1.2
+++ NEWS 24 Nov 2003 14:48:21 -0000 1.3
@@ -1,3 +1,8 @@
+Version 1.5 (21/11/2003):
+ * Added a .desktop file
+ * H9632 bug fixes (thanks to Pentti Ala-Vannesluoma)
+ * Fixes presets handling for H9632 cards
+
Version 1.4 (01/11/2003):
* Adds support for H9632 cards
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 3 Nov 2003 19:10:38 -0000 1.3
+++ configure.in 24 Nov 2003 14:48:21 -0000 1.4
@@ -1,12 +1,12 @@
AC_INIT(src/hdspmixer.cxx)
-AM_INIT_AUTOMAKE(hdspmixer, 1.4)
+AM_INIT_AUTOMAKE(hdspmixer, 1.5)
AC_PROG_CXX
AC_PROG_MAKE_SET
AC_STDC_HEADERS
AC_PATH_X
-AM_PATH_ALSA(0.9.0)
+AM_PATH_ALSA(1.0.0)
dnl kernel header files
AC_MSG_CHECKING(for kernel header files)
@@ -32,7 +32,7 @@
[soundbasedir="$withval"], [soundbasedir="$kerneldir"])
if test "$soundbasedir" != "" -a -r "$soundbasedir/sound" ; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$soundbasedir"
- CFLAGS="$CFLAGS -I$soundbasedir"
+ CXXFLAGS="$CXXFLAGS -I$soundbasedir"
AC_MSG_RESULT($ALSA_CFLAGS)
else
if test "x$prefix" != xNONE; then
@@ -42,13 +42,33 @@
fi
if test -z "$soundbasedir" -a -r "$aprefix/include/sound"; then
ALSA_CFLAGS="$ALSA_CFLAGS -I$aprefix/include"
- CFLAGS="$CFLAGS -I$aprefix/include"
+ CXXFLAGS="$CXXFLAGS -I$aprefix/include"
AC_MSG_RESULT($ALSA_CFLAGS)
else
AC_MSG_RESULT("not specified - using C compiler defaults")
fi
fi
+dnl desktop install
+AC_ARG_WITH(desktop-dir,
+ [ --with-desktop-dir specify the path to install desktop file],
+ [desktopdir="$withval"], [desktopdir=""])
+if test -z "$desktopdir"; then
+ desktopdir=$datadir/applications
+fi
+DESKTOP_DIR="$desktopdir"
+AC_SUBST(DESKTOP_DIR)
+
+AC_ARG_WITH(pixmap-dir,
+ [ --with-pixmap-dir specify the path to install desktop pixmap file],
+ [pixmapdir="$withval"], [pixmapdir=""])
+if test -z "$pixmapdir"; then
+ pixmapdir=$datadir/pixmaps
+fi
+PIXMAP_DIR="$pixmapdir"
+AC_SUBST(PIXMAP_DIR)
+
+dnl library check
AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
if test "$FLTK_CONFIG" = "no"; then
AC_MSG_ERROR(fltk-config is required)
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
