liboss-commit — liboss CVS Commit List

[Liboss-commit] CVS: liboss/lib Makefile.am,1.15,1.16

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19371/lib

Modified Files:
	Makefile.am 
Log Message:
more cruft removal and cleanup


Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.am	22 Oct 2002 16:51:46 -0000	1.15
+++ Makefile.am	22 Oct 2002 19:46:14 -0000	1.16
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(ESD_INCS) $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL -Ddlsym=dlsym_prepend_underscore
+CFLAGS = @CFLAGS@ $(ESD_INCS) $(COREAUDIO_CFLAGS) $(DLSYM_UNDERSCORE) -DLIBOSS_INTERNAL
 
 lib_LTLIBRARIES = liboss.la
 

[Liboss-commit] CVS: liboss TODO,1.4,1.5 configure.in,1.21,1.22

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv19371

Modified Files:
	TODO configure.in 
Log Message:
more cruft removal and cleanup


Index: TODO
===================================================================
RCS file: /cvsroot/liboss/liboss/TODO,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TODO	9 May 2002 08:15:10 -0000	1.4
+++ TODO	22 Oct 2002 19:46:13 -0000	1.5
@@ -18,3 +18,6 @@
 
 - Add a oss_real_time(int delay_usec) function, since so many
   audio-related packages will need it.
+
+- Are there any flags and such that are needed for eventual support
+  of other platforms (pure darwin, darwin x86, etc.)?

Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- configure.in	22 Oct 2002 17:19:45 -0000	1.21
+++ configure.in	22 Oct 2002 19:46:14 -0000	1.22
@@ -70,24 +70,6 @@
 dnl
 AM_INIT_AUTOMAKE("liboss", $LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB$LIBOSS_PRE)
 
-dnl ====================================================================
-dnl Stolen from KDE's autoconfig
-dnl This macro takes three Arguments like this:
-dnl AC_FIND_FILE(qmovie.h, $qt_incdirs, qt_incdir)
-dnl the filename to look for, the list of paths to check and
-dnl the variable with the result.
-
-dnl
-dnl Made possible to build for another arch.
-dnl
-if test x$LIBOSS_BUILD != "x"; then
-  AC_MSG_RESULT([*** build forced to $LIBOSS_BUILD ***])
-  build=$LIBOSS_BUILD
-  host=$LIBOSS_BUILD
-else
-  check_athlon=yes
-fi
-
 dnl AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -117,11 +99,11 @@
 AC_SUBST(INCLUDES)
 
 dnl Common cflags for all platforms
-CFLAGS="$CFLAGS $nocpp $wall -I$prefix/include"
+CFLAGS="$CFLAGS $nocpp $wall -I${prefix}/include"
 NONPIC_CFLAGS="$CFLAGS $nopic"
 CPPFLAGS="$CPPFLAGS $CFLAGS"
 DEBUG_CFLAGS="$CFLAGS $DEBUG_CFLAGS"
-LDFLAGS="$LDFLAGS -L$prefix/lib"
+LDFLAGS="$LDFLAGS -L${prefix}/lib"
 AC_SUBST(NONPIC_CFLAGS)
 
 dnl
@@ -148,13 +130,6 @@
 AC_TYPE_SIZE_T
 AC_TYPE_MODE_T
 
-dnl
-dnl Using or not using -fPIC (override default behavior - system dependent)
-dnl
-AC_ARG_ENABLE(fpic,
-   [  --disable-fpic          disable -fPIC on shared libs (default on x86)],
-   no_fpic=yes, no_fpic=no)
-
 AC_CHECK_HEADERS(errno.h string.h stdlib.h\
                  sys/types.h sys/stat.h sys/param.h \
                  machine/endian.h fcntl.h \
@@ -183,6 +158,12 @@
 AC_CHECK_LIB(dl,dlsym,[LIBDL="-ldl"])
 AC_SUBST(LIBDL)
 
+dnl dlcompat has a function that's a drop-in replacement
+dnl for dlsym that will automatically prepend underscores on a failed lookup
+DLSYM_UNDERSCORE=
+AC_CHECK_LIB(dl,dlsym_prepend_underscore,[DLSYM_UNDERSCORE="-Ddlsym=dlsym_prepend_underscore"])
+AC_SUBST(DLSYM_UNDERSCORE)
+
 AC_ARG_WITH(esd,
     [  --with-esd=DIR         where the ESound root is (DIR/include DIR/lib) ],
        esd_prefix="$withval"
@@ -193,7 +174,7 @@
 [
   esd=false;
   AC_MSG_CHECKING([for esd.h in little nooks and crannies])
-  for esd_include_dir in ${esd_prefix}/include /usr/include /usr/local/include; do
+  for esd_include_dir in ${esd_prefix}/include ${prefix}/include /usr/include /usr/local/include; do
     if test -f "${esd_include_dir}/esd.h"; then
       esd=true
       ESD_INCS="-I${esd_include_dir}"

[Liboss-commit] CVS: liboss/src osscat.c,1.6,1.7

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv5992

Modified Files:
	osscat.c 
Log Message:
don't ask why I put ..

Index: osscat.c
===================================================================
RCS file: /cvsroot/liboss/liboss/src/osscat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- osscat.c	22 Oct 2002 19:27:22 -0000	1.6
+++ osscat.c	22 Oct 2002 19:28:01 -0000	1.7
@@ -1,4 +1,4 @@
-#include "../config.h"
+#include "config.h"
 
 #include "soundcard.h"
 #include <machine/endian.h>

[Liboss-commit] CVS: liboss/src osscat.c,1.5,1.6

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv5397/src

Modified Files:
	osscat.c 
Log Message:
There will never be any other soundcard.h

Index: osscat.c
===================================================================
RCS file: /cvsroot/liboss/liboss/src/osscat.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- osscat.c	19 Oct 2002 08:11:14 -0000	1.5
+++ osscat.c	22 Oct 2002 19:27:22 -0000	1.6
@@ -1,3 +1,5 @@
+#include "../config.h"
+
 #include "soundcard.h"
 #include <machine/endian.h>
 #include <machine/byte_order.h>

[Liboss-commit] CVS: liboss/lib esddsp.c,1.2,1.3

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv5397/lib

Modified Files:
	esddsp.c 
Log Message:
There will never be any other soundcard.h

Index: esddsp.c
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/esddsp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- esddsp.c	18 Oct 2002 22:46:49 -0000	1.2
+++ esddsp.c	22 Oct 2002 19:27:22 -0000	1.3
@@ -44,15 +44,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 
-#ifdef HAVE_MACHINE_SOUNDCARD_H
-#  include <machine/soundcard.h>
-#else
-#  ifdef HAVE_SOUNDCARD_H
-#    include <soundcard.h>
-#  else
-#    include <sys/soundcard.h>
-#  endif
-#endif
+#include "soundcard.h"
 
 #include <esd.h>
 

[Liboss-commit] CVS: liboss configure.in,1.20,1.21 acconfig.h,1.2,NONE

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv7663

Modified Files:
	configure.in 
Removed Files:
	acconfig.h 
Log Message:
if we use the 3-argument version of AC_DEFINE, we don't need acconfig.h
anymore, and autogen doesn't bitch  ;)


Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in	22 Oct 2002 16:51:45 -0000	1.20
+++ configure.in	22 Oct 2002 17:19:45 -0000	1.21
@@ -26,9 +26,9 @@
 AC_SUBST(LIBOSS_IFACE_AGE)
 AC_SUBST(LIBOSS_BIN_AGE)
 
-AC_DEFINE_UNQUOTED(LIBOSS_MAJOR, $LIBOSS_MAJOR)
-AC_DEFINE_UNQUOTED(LIBOSS_MINOR, $LIBOSS_MINOR)
-AC_DEFINE_UNQUOTED(LIBOSS_SUB, $LIBOSS_SUB)
+AC_DEFINE_UNQUOTED(LIBOSS_MAJOR, $LIBOSS_MAJOR, [major version number])
+AC_DEFINE_UNQUOTED(LIBOSS_MINOR, $LIBOSS_MINOR, [minor version number])
+AC_DEFINE_UNQUOTED(LIBOSS_SUB, $LIBOSS_SUB, [sub version number])
 
 AC_PREFIX_DEFAULT(/usr/local)
 if test "x$prefix" = "xNONE"; then
@@ -168,7 +168,8 @@
 [ have_coreaudio="yes"
   COREAUDIO_LDFLAGS="-framework CoreAudio"
   COREAUDIO_CFLAGS="-F/System/Library/Frameworks/Cocoa.framework"
-  AC_DEFINE(HAVE_COREAUDIO) ])
+  AC_DEFINE(HAVE_COREAUDIO,1,[Define if you have the CoreAudio framework])
+])
 AC_SUBST(COREAUDIO_LDFLAGS)
 AC_SUBST(COREAUDIO_CFLAGS)
 

--- acconfig.h DELETED ---

[Liboss-commit] CVS: liboss/lib Makefile.am,1.14,1.15

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20441/lib

Modified Files:
	Makefile.am 
Log Message:
LIBESD resembles LIBDL


Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile.am	22 Oct 2002 05:21:27 -0000	1.14
+++ Makefile.am	22 Oct 2002 16:51:46 -0000	1.15
@@ -2,13 +2,13 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL -Ddlsym=dlsym_prepend_underscore
+CFLAGS = @CFLAGS@ $(ESD_INCS) $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL -Ddlsym=dlsym_prepend_underscore
 
 lib_LTLIBRARIES = liboss.la
 
 liboss_la_SOURCES = esddsp.c
 liboss_la_DEPENDENCIES = 
-liboss_la_LIBADD = $(COREAUDIO_LDFLAGS) $(LIBDL)
+liboss_la_LIBADD = $(COREAUDIO_LDFLAGS) $(LIBDL) $(LIBESD)
 
 liboss_la_LDFLAGS = -no-undefined \
                     -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

[Liboss-commit] CVS: liboss configure.in,1.19,1.20

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv20441

Modified Files:
	configure.in 
Log Message:
LIBESD resembles LIBDL


Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in	22 Oct 2002 05:21:26 -0000	1.19
+++ configure.in	22 Oct 2002 16:51:45 -0000	1.20
@@ -187,8 +187,7 @@
        esd_prefix="$withval"
     )
 
-AC_SUBST(esd_prefix)
-
+ESD_INCS=
 AC_CHECK_HEADERS(esd.h,[esd=true],
 [
   esd=false;
@@ -196,7 +195,7 @@
   for esd_include_dir in ${esd_prefix}/include /usr/include /usr/local/include; do
     if test -f "${esd_include_dir}/esd.h"; then
       esd=true
-      INCLUDES="-I${esd_include_dir} $USER_INCLUDES $INCLUDES"
+      ESD_INCS="-I${esd_include_dir}"
       AC_MSG_RESULT(${esd_include_dir})
       break
     fi
@@ -205,16 +204,20 @@
     AC_MSG_RESULT(no)
   fi
 ])
+AC_SUBST(ESD_INCS)
 
+LIBESD=
 if test x$esd = xtrue; then
-  if test -n "${esd_prefix}"; then
-    LIBS="-L${esd_prefix}/lib $LIBS"
-  fi
   AC_CHECK_LIB(esd,esd_open_sound,[
     esd=true;
-    LIBS="$LIBS $USER_LIBS -lesd";
+    if test -n "${esd_prefix}"; then
+      LIBESD="-L${esd_prefix}/lib -lesd";
+    else
+      LIBESD="-lesd";
+    fi
   ])
 fi
+AC_SUBST(LIBESD)
 
 AM_CONDITIONAL(ESD, test "x$esd" = "xtrue" )
 

[Liboss-commit] CVS: liboss/include Makefile.am,1.2,1.3

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss/include
In directory usw-pr-cvs1:/tmp/cvs-serv26237

Modified Files:
	Makefile.am 
Log Message:
liboss/soundcard.h

Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/include/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	10 May 2002 15:25:12 -0000	1.2
+++ Makefile.am	22 Oct 2002 05:24:02 -0000	1.3
@@ -7,15 +7,15 @@
 noinst_HEADERS = 
 
 ###
-# Install header files (default=$includedir/sys)
+# Install header files (default=$includedir/liboss)
 #
 install-includeHEADERS: 
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)/sys
+	$(mkinstalldirs) $(DESTDIR)$(includedir)/liboss
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/sys/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/sys/$$p; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/liboss/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/liboss/$$p; \
 	done
 
 ###
@@ -24,7 +24,7 @@
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
 	list='$(include_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(includedir)/sys/$$p; \
+	  rm -f $(DESTDIR)$(includedir)/liboss/$$p; \
 	done
 
 

[Liboss-commit] CVS: liboss/lib .cvsignore,1.2,1.3 Makefile.am,1.13,1.14

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv24927/lib

Modified Files:
	.cvsignore Makefile.am 
Log Message:
more build tweaks


Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
+++ .cvsignore	22 Oct 2002 05:21:27 -0000	1.3
@@ -1,3 +1,6 @@
 .deps
+.libs
 Makefile
 Makefile.in
+*.lo
+*.la

Index: Makefile.am
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am	18 Oct 2002 22:11:41 -0000	1.13
+++ Makefile.am	22 Oct 2002 05:21:27 -0000	1.14
@@ -8,7 +8,7 @@
 
 liboss_la_SOURCES = esddsp.c
 liboss_la_DEPENDENCIES = 
-liboss_la_LIBADD = $(COREAUDIO_LDFLAGS)
+liboss_la_LIBADD = $(COREAUDIO_LDFLAGS) $(LIBDL)
 
 liboss_la_LDFLAGS = -no-undefined \
                     -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

[Liboss-commit] CVS: liboss/src .cvsignore,1.2,1.3

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv24927/src

Modified Files:
	.cvsignore 
Log Message:
more build tweaks


Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/src/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
+++ .cvsignore	22 Oct 2002 05:21:27 -0000	1.3
@@ -1,3 +1,5 @@
 .deps
+.libs
 Makefile
 Makefile.in
+osscat

[Liboss-commit] CVS: liboss configure.in,1.18,1.19

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv24927

Modified Files:
	configure.in 
Log Message:
more build tweaks


Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in	22 Oct 2002 04:48:08 -0000	1.18
+++ configure.in	22 Oct 2002 05:21:26 -0000	1.19
@@ -3,7 +3,7 @@
 dnl
 AC_INIT([LibOSS],[0.1],[lib...@li...],[liboss])
 AC_CONFIG_SRCDIR([src/osscat.c])
-AC_CONFIG_HEADER([config.h])
+AM_CONFIG_HEADER([config.h])
 
 dnl Making releases:
 dnl   LIBOSS_SUB += 1;
@@ -30,6 +30,14 @@
 AC_DEFINE_UNQUOTED(LIBOSS_MINOR, $LIBOSS_MINOR)
 AC_DEFINE_UNQUOTED(LIBOSS_SUB, $LIBOSS_SUB)
 
+AC_PREFIX_DEFAULT(/usr/local)
+if test "x$prefix" = "xNONE"; then
+  prefix="$ac_default_prefix"
+  ac_configure_args="$ac_configure_args --prefix=$prefix"
+fi
+# And delete superflous '/' to make compares easier
+prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
+
 LT_RELEASE=$LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB
 LT_REVISION=$LIBOSS_SUB
 LT_CURRENT=`expr $LIBOSS_MAJOR + $LIBOSS_MINOR`
@@ -170,7 +178,9 @@
 dnl Required libraries
 dnl
 
-AC_CHECK_LIB(dl,dlsym)
+LIBDL=
+AC_CHECK_LIB(dl,dlsym,[LIBDL="-ldl"])
+AC_SUBST(LIBDL)
 
 AC_ARG_WITH(esd,
     [  --with-esd=DIR         where the ESound root is (DIR/include DIR/lib) ],

[Liboss-commit] CVS: liboss configure.in,1.17,1.18

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv3823

Modified Files:
	configure.in 
Log Message:
rearranged the macros so that it will detect esd even if it's not in -I and -L


Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in	21 Oct 2002 23:18:32 -0000	1.17
+++ configure.in	22 Oct 2002 04:48:08 -0000	1.18
@@ -62,6 +62,13 @@
 dnl
 AM_INIT_AUTOMAKE("liboss", $LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB$LIBOSS_PRE)
 
+dnl ====================================================================
+dnl Stolen from KDE's autoconfig
+dnl This macro takes three Arguments like this:
+dnl AC_FIND_FILE(qmovie.h, $qt_incdirs, qt_incdir)
+dnl the filename to look for, the list of paths to check and
+dnl the variable with the result.
+
 dnl
 dnl Made possible to build for another arch.
 dnl
@@ -164,9 +171,8 @@
 dnl
 
 AC_CHECK_LIB(dl,dlsym)
-AC_CHECK_LIB(esd,esd_open_sound)
 
-AC_ARG_WITH(esd-prefix,
+AC_ARG_WITH(esd,
     [  --with-esd=DIR         where the ESound root is (DIR/include DIR/lib) ],
        esd_prefix="$withval"
     )
@@ -175,16 +181,30 @@
 
 AC_CHECK_HEADERS(esd.h,[esd=true],
 [
-   esd=false;
-   for ac_dir in $esd_prefix/include /usr/include /usr/local/include;
-   do
-    AC_CHECK_HEADERS( $ac_dir/esd.h,
-    [
-        esd=true;
-        INCLUDES="$INCLUDES $USER_INCLUDES -I$ac_dir";
-    ])
-   done
+  esd=false;
+  AC_MSG_CHECKING([for esd.h in little nooks and crannies])
+  for esd_include_dir in ${esd_prefix}/include /usr/include /usr/local/include; do
+    if test -f "${esd_include_dir}/esd.h"; then
+      esd=true
+      INCLUDES="-I${esd_include_dir} $USER_INCLUDES $INCLUDES"
+      AC_MSG_RESULT(${esd_include_dir})
+      break
+    fi
+  done
+  if test x$esd != xtrue; then
+    AC_MSG_RESULT(no)
+  fi
 ])
+
+if test x$esd = xtrue; then
+  if test -n "${esd_prefix}"; then
+    LIBS="-L${esd_prefix}/lib $LIBS"
+  fi
+  AC_CHECK_LIB(esd,esd_open_sound,[
+    esd=true;
+    LIBS="$LIBS $USER_LIBS -lesd";
+  ])
+fi
 
 AM_CONDITIONAL(ESD, test "x$esd" = "xtrue" )
 

[Liboss-commit] CVS: liboss autogen.sh,1.2,1.3

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv3545

Modified Files:
	autogen.sh 
Log Message:
--prefix=`pwd`??  why???


Index: autogen.sh
===================================================================
RCS file: /cvsroot/liboss/liboss/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- autogen.sh	10 May 2002 15:43:21 -0000	1.2
+++ autogen.sh	22 Oct 2002 04:47:43 -0000	1.3
@@ -71,15 +71,12 @@
 rm -f config.cache
 
 if [ x"$NO_CONFIGURE" = "x" ]; then
-    echo " + Running 'configure --prefix=`pwd` $@':"
+    echo " + Running 'configure $@':"
     if [ -z "$*" ]; then
 	echo "   ** If you wish to pass arguments to ./configure, please"
         echo "   ** specify them on the command line."
-        echo "   **"
-        echo "   ** For now --prefix is being set to pwd".
-        echo "   **"
         echo ""
     fi
-    ./configure --prefix=`pwd` "$@" && \
+    ./configure "$@" && \
     echo "Now type 'make' to compile $PKG_NAME" || exit 1
 fi

[Liboss-commit] CVS: liboss .cvsignore,1.4,1.5

[Benjamin R. <ran...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv3221

Modified Files:
	.cvsignore 
Log Message:
more things to ignore


Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Oct 2002 12:41:47 -0000	1.4
+++ .cvsignore	22 Oct 2002 04:47:24 -0000	1.5
@@ -2,12 +2,18 @@
 Makefile.in
 aclocal.m4
 autom4te.cache
+config.guess
 config.h
 config.h.in
 config.log
 config.status
+config.sub
 configure
 depcomp
+install-sh
 libtool
+ltmain.sh
+missing
+mkinstalldirs
 stamp-h1
 stamp.h.in

[Liboss-commit] CVS: liboss configure.in,1.16,1.17

[Justin <th...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv6771

Modified Files:
	configure.in 
Log Message:
added a test for esd.h

Index: configure.in
===================================================================
RCS file: /cvsroot/liboss/liboss/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in	18 Oct 2002 22:00:23 -0000	1.16
+++ configure.in	21 Oct 2002 23:18:32 -0000	1.17
@@ -166,6 +166,28 @@
 AC_CHECK_LIB(dl,dlsym)
 AC_CHECK_LIB(esd,esd_open_sound)
 
+AC_ARG_WITH(esd-prefix,
+    [  --with-esd=DIR         where the ESound root is (DIR/include DIR/lib) ],
+       esd_prefix="$withval"
+    )
+
+AC_SUBST(esd_prefix)
+
+AC_CHECK_HEADERS(esd.h,[esd=true],
+[
+   esd=false;
+   for ac_dir in $esd_prefix/include /usr/include /usr/local/include;
+   do
+    AC_CHECK_HEADERS( $ac_dir/esd.h,
+    [
+        esd=true;
+        INCLUDES="$INCLUDES $USER_INCLUDES -I$ac_dir";
+    ])
+   done
+])
+
+AM_CONDITIONAL(ESD, test "x$esd" = "xtrue" )
+
 AC_CONFIG_FILES([
 Makefile
 lib/Makefile

[Liboss-commit] CVS: liboss config.guess,1.1.1.1,NONE config.sub,1.1.1.1,NONE depcomp,1.3,NONE install-sh,1.1.1.1,NONE ltmain.sh,1.1.1.1,NONE missing,1.1.1.1,NONE mkinstalldirs,1.1.1.1,NONE

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv31234

Removed Files:
	config.guess config.sub depcomp install-sh ltmain.sh missing 
	mkinstalldirs 
Log Message:
removed some files which are generated by autotools

--- config.guess DELETED ---

--- config.sub DELETED ---

--- depcomp DELETED ---

--- install-sh DELETED ---

--- ltmain.sh DELETED ---

--- missing DELETED ---

--- mkinstalldirs DELETED ---

Re: [Liboss-commit] CVS: liboss/src osscat.c,1.4,1.5

[Max H. <ma...@qu...>]

May I strongly suggest that auto tool generated files are *not* kept 
in CVS? This is a very bad practice to do. If you don't believe me 
that, I'll be happy to elaborate, working on over a dozen cross 
platform projects that use autotools + CVS gave me enough experiences 
with that regard (although yeah there are a few excpetions to this 
rule, like SDL).


Cheers,

Max
-- 
-----------------------------------------------
Max Horn
Software Developer

email: <mailto:ma...@qu...>
phone: (+49) 6151-494890

[Liboss-commit] CVS: liboss/src .cvsignore,1.1,1.2

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv25175/src

Modified Files:
	.cvsignore 
Log Message:
updated .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/src/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 May 2002 15:48:12 -0000	1.1
+++ .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
@@ -1 +1,3 @@
+.deps
+Makefile
 Makefile.in

[Liboss-commit] CVS: liboss/include .cvsignore,1.1,1.2

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss/include
In directory usw-pr-cvs1:/tmp/cvs-serv25175/include

Modified Files:
	.cvsignore 
Log Message:
updated .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/include/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 May 2002 15:48:12 -0000	1.1
+++ .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
@@ -1 +1,2 @@
+Makefile
 Makefile.in

[Liboss-commit] CVS: liboss/doc .cvsignore,1.1,1.2

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss/doc
In directory usw-pr-cvs1:/tmp/cvs-serv25175/doc

Modified Files:
	.cvsignore 
Log Message:
updated .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/doc/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 May 2002 17:51:27 -0000	1.1
+++ .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
@@ -1 +1,2 @@
+Makefile
 Makefile.in

[Liboss-commit] CVS: liboss/lib .cvsignore,1.1,1.2

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25175/lib

Modified Files:
	.cvsignore 
Log Message:
updated .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/lib/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 May 2002 17:51:27 -0000	1.1
+++ .cvsignore	19 Oct 2002 12:41:48 -0000	1.2
@@ -1 +1,3 @@
+.deps
+Makefile
 Makefile.in

[Liboss-commit] CVS: liboss .cvsignore,1.3,1.4

[Max H. <fin...@us...>]

Update of /cvsroot/liboss/liboss
In directory usw-pr-cvs1:/tmp/cvs-serv25175

Modified Files:
	.cvsignore 
Log Message:
updated .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/liboss/liboss/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 May 2002 15:57:38 -0000	1.3
+++ .cvsignore	19 Oct 2002 12:41:47 -0000	1.4
@@ -1,9 +1,13 @@
+Makefile
+Makefile.in
 aclocal.m4
 autom4te.cache
+config.h
 config.h.in
 config.log
+config.status
 configure
 depcomp
 libtool
-Makefile.in
+stamp-h1
 stamp.h.in

[Liboss-commit] CVS: liboss/src osscat.c,1.4,1.5

[Dave V. <va...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv1268/src

Modified Files:
	osscat.c 
Log Message:
Woohoo, it WORKS!!! Just 'osscat somewavfile.wav' should play a nice 
sound, assuming the wav file was made with right params. Most of the ones 
in /sw/share/sounds should work fine.


Index: osscat.c
===================================================================
RCS file: /cvsroot/liboss/liboss/src/osscat.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- osscat.c	19 Oct 2002 07:02:01 -0000	1.4
+++ osscat.c	19 Oct 2002 08:11:14 -0000	1.5
@@ -1,16 +1,28 @@
 #include "soundcard.h"
+#include <machine/endian.h>
+#include <machine/byte_order.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 /* FIXME: Add capability for recording with 'libosscat /dev/audio > somefile' */
 
+
+/* How to play the sound */
 #define BUF_SIZE	1024
 #define DEVICE		"/dev/dsp"
 
+/* What kind of sound is this, anyway? */
+/* NB: .wav is usually {1, 16, 20500, 0} */
+#define STEREO		1
+#define BITS		16
+#define RATE		20500
+#define ENDIAN		LITTLE_ENDIAN
+
+
 int main(int argc, char **argv)
 {
-	int fd, play, format, channels, speed;
+	int fd, play, format, stereo, speed, sz;
 	char buf[BUF_SIZE];
 	
 	if (argc != 2) {
@@ -28,15 +40,22 @@
 		exit(1);
 	}
 	
-	format = AFMT_S16_LE;
+	format = (BITS == 16) ? AFMT_S16_NE : AFMT_S8;
 	ioctl(play, SNDCTL_DSP_SETFMT, &format);
-	channels = 2;
-	ioctl(play, SNDCTL_DSP_CHANNELS, &channels);
-	speed = 41100;
+	stereo = STEREO;
+	ioctl(play, SNDCTL_DSP_STEREO, &stereo);
+	speed = RATE;
 	ioctl(play, SNDCTL_DSP_SPEED, &speed);
 
-	while (read(fd, buf, BUF_SIZE) > 0) {
-		write(play, buf, BUF_SIZE); /* if it errors, keep going */
+	while ( (sz = read(fd, buf, BUF_SIZE)) > 0 ) {
+
+#if BYTE_ORDER != ENDIAN
+		short* i;
+		for (i = (short*)buf; i < (short*)(buf + sz); ++i)
+			*i = NXSwapShort(*i);
+#endif
+
+		write(play, buf, sz); /* if it errors, keep going */
 	}
 	
 	return 0;

[Liboss-commit] CVS: liboss/src osscat.c,1.3,1.4

[Dave V. <va...@us...>]

Update of /cvsroot/liboss/liboss/src
In directory usw-pr-cvs1:/tmp/cvs-serv22435/src

Modified Files:
	osscat.c 
Log Message:
We have sound! Too bad it's meaningless static so far...time to look up 
exactly what a .WAV is...


Index: osscat.c
===================================================================
RCS file: /cvsroot/liboss/liboss/src/osscat.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- osscat.c	18 Oct 2002 22:46:49 -0000	1.3
+++ osscat.c	19 Oct 2002 07:02:01 -0000	1.4
@@ -10,7 +10,7 @@
 
 int main(int argc, char **argv)
 {
-	int fd, play;
+	int fd, play, format, channels, speed;
 	char buf[BUF_SIZE];
 	
 	if (argc != 2) {
@@ -28,6 +28,13 @@
 		exit(1);
 	}
 	
+	format = AFMT_S16_LE;
+	ioctl(play, SNDCTL_DSP_SETFMT, &format);
+	channels = 2;
+	ioctl(play, SNDCTL_DSP_CHANNELS, &channels);
+	speed = 41100;
+	ioctl(play, SNDCTL_DSP_SPEED, &speed);
+
 	while (read(fd, buf, BUF_SIZE) > 0) {
 		write(play, buf, BUF_SIZE); /* if it errors, keep going */
 	}