liboss-commit Mailing List for Apple OS X libOSS (Page 6)
Brought to you by:
thesin
You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(55) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(57) |
Nov
(52) |
Dec
(2) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(16) |
Feb
(9) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Alexander S. <mrv...@us...> - 2002-10-18 22:46:52
|
Update of /cvsroot/liboss/liboss/src In directory usw-pr-cvs1:/tmp/cvs-serv18094/src Modified Files: osscat.c Log Message: osscat almost works now. It calls write(), and esddsp doesn't override write(). We may need to implement this Index: osscat.c =================================================================== RCS file: /cvsroot/liboss/liboss/src/osscat.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- osscat.c 18 Oct 2002 22:00:27 -0000 1.2 +++ osscat.c 18 Oct 2002 22:46:49 -0000 1.3 @@ -6,7 +6,7 @@ /* FIXME: Add capability for recording with 'libosscat /dev/audio > somefile' */ #define BUF_SIZE 1024 -#define DEVICE "/dev/dspW" +#define DEVICE "/dev/dsp" int main(int argc, char **argv) { @@ -14,7 +14,7 @@ char buf[BUF_SIZE]; if (argc != 2) { - fprintf(stderr, "Usage: libosscat file\n"); + fprintf(stderr, "Usage: osscat file\n"); exit(1); } |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:46:52
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv18094/lib Modified Files: esddsp.c Log Message: osscat almost works now. It calls write(), and esddsp doesn't override write(). We may need to implement this Index: esddsp.c =================================================================== RCS file: /cvsroot/liboss/liboss/lib/esddsp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- esddsp.c 18 Oct 2002 22:11:41 -0000 1.1 +++ esddsp.c 18 Oct 2002 22:46:49 -0000 1.2 @@ -57,11 +57,7 @@ #include <esd.h> /* BSDI has this functionality, but not define :() */ -#if defined(RTLD_NEXT) -#define REAL_LIBC RTLD_NEXT -#else -#define REAL_LIBC ((void *) -1L) -#endif +#define REAL_LIBC libSystem_handle #if defined(__FreeBSD__) || defined(__bsdi__) typedef unsigned long request_t; @@ -75,6 +71,9 @@ static char *ident = NULL, *mixer = NULL; static int use_mixer = 0; +static void *libSystem_handle = NULL; +static int acquired_handle = 0; + #define OSS_VOLUME_BASE 50 #define ESD_VOL_TO_OSS(left, right) (short int) \ @@ -166,6 +165,14 @@ } } +static void liboss_init(void) +{ + if (!acquired_handle) + { + libSystem_handle = dlopen("/usr/lib/libSystem.dylib",RTLD_LAZY); + acquired_handle = 1; + } +} int oss_open (const char *pathname, int flags, ...) @@ -174,6 +181,8 @@ va_list args; mode_t mode; + liboss_init (); + if (!func) func = (int (*) (const char *, int, mode_t)) dlsym (REAL_LIBC, "open"); @@ -383,6 +392,8 @@ va_list args; void *argp; + liboss_init (); + if (!func) func = (int (*) (int, request_t, void *)) dlsym (REAL_LIBC, "ioctl"); va_start (args, request); |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:46:52
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv18094 Modified Files: AUTHORS Log Message: osscat almost works now. It calls write(), and esddsp doesn't override write(). We may need to implement this Index: AUTHORS =================================================================== RCS file: /cvsroot/liboss/liboss/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AUTHORS 7 May 2002 21:26:04 -0000 1.4 +++ AUTHORS 18 Oct 2002 22:46:48 -0000 1.5 @@ -1,6 +1,7 @@ -libOSS is derived from the NetBSD 1.5 libOSS (author unknown). +libOSS is derived from the ESounD 0.2.28 esddsp emulator. In the future, direct support for CoreAudio will be added for OS X. Current authors include: Justin F. Hallett (TheSin) David Vasilevsky (Vasi) Benjamin Reed (RangerRick) + Alexander Strange (Feanor) |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:11:46
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv7103/lib Modified Files: Makefile.am Added Files: esddsp.c Log Message: Oops, this is kinda needed --- NEW FILE: esddsp.c --- /* Evil evil evil hack to get OSS apps to cooperate with esd * Copyright (C) 1998, 1999 Manish Singh <yo...@gi...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #define DSP_DEBUG /* This lets you run multiple instances of x11amp by setting the X11AMPNUM environment variable. Only works on glibc2. */ /* #define MULTIPLE_X11AMP */ #if defined(__GNUC__) && !defined(__STRICT_ANSI__) #ifdef DSP_DEBUG #define DPRINTF(format, args...) printf(format, ## args) #else #define DPRINTF(format, args...) #endif #include "config.h" #include <dlfcn.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <fcntl.h> #include <sys/types.h> #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 <esd.h> /* BSDI has this functionality, but not define :() */ #if defined(RTLD_NEXT) #define REAL_LIBC RTLD_NEXT #else #define REAL_LIBC ((void *) -1L) #endif #if defined(__FreeBSD__) || defined(__bsdi__) typedef unsigned long request_t; #else typedef int request_t; #endif static int sndfd = -1, mixfd = -1; static int settings = 0, done = 0; static char *ident = NULL, *mixer = NULL; static int use_mixer = 0; #define OSS_VOLUME_BASE 50 #define ESD_VOL_TO_OSS(left, right) (short int) \ (((OSS_VOLUME_BASE * (right) / ESD_VOLUME_BASE) << 8) | \ (OSS_VOLUME_BASE * (left) / ESD_VOLUME_BASE)) #define OSS_VOL_TO_ESD_LEFT(vol) \ (ESD_VOLUME_BASE * (vol & 0xff) / OSS_VOLUME_BASE) #define OSS_VOL_TO_ESD_RIGHT(vol) \ (ESD_VOLUME_BASE * ((vol >> 8) & 0xff) / OSS_VOLUME_BASE) static void get_volume (int *left, int *right) { int vol; if (read (mixfd, &vol, sizeof (vol)) != sizeof (vol)) *left = *right = ESD_VOLUME_BASE; else { *left = OSS_VOL_TO_ESD_LEFT (vol); *right = OSS_VOL_TO_ESD_RIGHT (vol); } } static void set_volume (int left, int right) { int vol = ESD_VOL_TO_OSS (left, right); write (mixfd, &vol, sizeof (vol)); } static void dsp_init (void) { if (!ident) { char *str = getenv ("ESDDSP_NAME"); ident = malloc (ESD_NAME_MAX); strncpy (ident, (str ? str : "esddsp"), ESD_NAME_MAX); if (getenv ("ESDDSP_MIXER")) { use_mixer = 1; str = getenv ("HOME"); if (str) { mixer = malloc (strlen (str) + strlen (ident) + 10); sprintf (mixer, "%s/.esddsp_%s", str, ident); } else { fprintf (stderr, "esddsp: can't get home directory\n"); exit (1); } DPRINTF ("mixer settings file: %s\n", mixer); } } } static void mix_init (int *esd, int *player) { esd_info_t *all_info; esd_player_info_t *player_info; if (*esd < 0 && (*esd = esd_open_sound (NULL)) < 0) return; if (*player < 0) { all_info = esd_get_all_info (*esd); if (all_info) { for (player_info = all_info->player_list; player_info; player_info = player_info->next) if (!strcmp(player_info->name, ident)) { *player = player_info->source_id; break; } esd_free_all_info (all_info); } } } int oss_open (const char *pathname, int flags, ...) { static int (*func) (const char *, int, mode_t) = NULL; va_list args; mode_t mode; if (!func) func = (int (*) (const char *, int, mode_t)) dlsym (REAL_LIBC, "open"); dsp_init (); va_start (args, flags); mode = va_arg (args, int); va_end (args); if (!strcmp (pathname, "/dev/dsp")) { if (!getenv ("ESPEAKER")) { int ret; flags |= O_NONBLOCK; if ((ret = (*func) (pathname, flags, mode)) >= 0) return ret; } DPRINTF ("hijacking /dev/dsp open, and taking it to esd...\n"); settings = done = 0; return (sndfd = esd_open_sound (NULL)); } else if (use_mixer && !strcmp (pathname, "/dev/mixer")) { DPRINTF ("hijacking /dev/mixer open, and taking it to esd...\n"); return (mixfd = (*func) (mixer, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)); } else return (*func) (pathname, flags, mode); } static int dspctl (int fd, request_t request, void *argp) { static esd_format_t fmt = ESD_STREAM | ESD_PLAY | ESD_MONO; static int speed; int *arg = (int *) argp; DPRINTF ("hijacking /dev/dsp ioctl, and sending it to esd " "(%d : %x - %p)\n", fd, request, argp); switch (request) { case SNDCTL_DSP_RESET: case SNDCTL_DSP_POST: break; case SNDCTL_DSP_SETFMT: fmt |= (*arg & 0x30) ? ESD_BITS16 : ESD_BITS8; settings |= 1; break; case SNDCTL_DSP_SPEED: speed = *arg; settings |= 2; break; case SNDCTL_DSP_STEREO: fmt &= ~ESD_MONO; fmt |= (*arg) ? ESD_STEREO : ESD_MONO; break; case SNDCTL_DSP_GETBLKSIZE: *arg = ESD_BUF_SIZE; break; case SNDCTL_DSP_GETFMTS: *arg = 0x38; break; #ifdef SNDCTL_DSP_GETCAPS case SNDCTL_DSP_GETCAPS: *arg = 0; break; #endif case SNDCTL_DSP_GETOSPACE: { audio_buf_info *bufinfo = (audio_buf_info *) argp; bufinfo->bytes = ESD_BUF_SIZE; } break; default: DPRINTF ("unhandled /dev/dsp ioctl (%x - %p)\n", request, argp); break; } if (settings == 3 && !done) { int proto = ESD_PROTO_STREAM_PLAY; done = 1; if (write (sndfd, &proto, sizeof (proto)) != sizeof (proto)) return -1; if (write (sndfd, &fmt, sizeof (fmt)) != sizeof (fmt)) return -1; if (write (sndfd, &speed, sizeof (speed)) != sizeof (speed)) return -1; if (write (sndfd, ident, ESD_NAME_MAX) != ESD_NAME_MAX) return -1; fmt = ESD_STREAM | ESD_PLAY | ESD_MONO; speed = 0; if (use_mixer) { int esd = -1, player = -1; int left, right; while (player < 0) mix_init (&esd, &player); get_volume (&left, &right); DPRINTF ("panning %d - %d %d\n", player, left, right); esd_set_stream_pan (esd, player, left, right); } } return 0; } int mixctl (int fd, request_t request, void *argp) { static int esd = -1, player = -1; static int left, right; int *arg = (int *) argp; DPRINTF ("hijacking /dev/mixer ioctl, and sending it to esd " "(%d : %x - %p)\n", fd, request, argp); switch (request) { case SOUND_MIXER_READ_DEVMASK: *arg = 5113; break; case SOUND_MIXER_READ_PCM: mix_init (&esd, &player); if (player > 0) { esd_info_t *all_info; all_info = esd_get_all_info (esd); if (all_info) { esd_player_info_t *player_info; for (player_info = all_info->player_list; player_info; player_info = player_info->next) if (player_info->source_id == player) { *arg = ESD_VOL_TO_OSS (player_info->left_vol_scale, player_info->right_vol_scale); } esd_free_all_info (all_info); } else return -1; } else { get_volume (&left, &right); *arg = ESD_VOL_TO_OSS (left, right); } break; case SOUND_MIXER_WRITE_PCM: mix_init (&esd, &player); left = OSS_VOL_TO_ESD_LEFT (*arg); right = OSS_VOL_TO_ESD_RIGHT (*arg); set_volume (left, right); if (player > 0) { DPRINTF ("panning %d - %d %d\n", player, left, right); esd_set_stream_pan (esd, player, left, right); } break; default: DPRINTF ("unhandled /dev/mixer ioctl (%x - %p)\n", request, argp); break; } return 0; } int oss_ioctl (int fd, request_t request, ...) { static int (*func) (int, request_t, void *) = NULL; va_list args; void *argp; if (!func) func = (int (*) (int, request_t, void *)) dlsym (REAL_LIBC, "ioctl"); va_start (args, request); argp = va_arg (args, void *); va_end (args); if (fd == sndfd) return dspctl (fd, request, argp); else if (fd == mixfd) { if(use_mixer) return mixctl (fd, request, argp); } else { /* (fd != sndfd && fd != mixfd) */ return (*func) (fd, request, argp); } return 0; } int oss_close (int fd) { static int (*func) (int) = NULL; if (!func) func = (int (*) (int)) dlsym (REAL_LIBC, "close"); if (fd == sndfd) sndfd = -1; else if (fd == mixfd) mixfd = -1; return (*func) (fd); } #ifdef MULTIPLE_X11AMP #include <socketbits.h> #include <sys/param.h> #include <sys/un.h> #define ENVSET "X11AMPNUM" int unlink (const char *filename) { static int (*func) (const char *) = NULL; char *num; if (!func) func = (int (*) (const char *)) dlsym (REAL_LIBC, "unlink"); if (!strcmp (filename, "/tmp/X11Amp_CTRL") && (num = getenv (ENVSET))) { char buf[PATH_MAX] = "/tmp/X11Amp_CTRL"; strcat (buf, num); return (*func) (buf); } else return (*func) (filename); } typedef int (*sa_func_t) (int, struct sockaddr *, int); static int sockaddr_mangle (sa_func_t func, int fd, struct sockaddr *addr, int len) { char *num; if (!strcmp (((struct sockaddr_un *) addr)->sun_path, "/tmp/X11Amp_CTRL") && (num = getenv(ENVSET))) { int ret; char buf[PATH_MAX] = "/tmp/X11Amp_CTRL"; struct sockaddr_un *new_addr = malloc (len); strcat (buf, num); memcpy (new_addr, addr, len); strcpy (new_addr->sun_path, buf); ret = (*func) (fd, (struct sockaddr *) new_addr, len); free (new_addr); return ret; } else return (*func) (fd, addr, len); } int bind (int fd, struct sockaddr *addr, int len) { static sa_func_t func = NULL; if (!func) func = (sa_func_t) dlsym (REAL_LIBC, "bind"); return sockaddr_mangle (func, fd, addr, len); } int connect (int fd, struct sockaddr *addr, int len) { static sa_func_t func = NULL; if (!func) func = (sa_func_t) dlsym (REAL_LIBC, "connect"); return sockaddr_mangle (func, fd, addr, len); } #endif /* MULTIPLE_X11AMP */ #else /* __GNUC__ */ void nogcc (void) { ident = NULL; } #endif /* __GNUC__ */ Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Makefile.am 18 Oct 2002 22:00:25 -0000 1.12 +++ Makefile.am 18 Oct 2002 22:11:41 -0000 1.13 @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL +CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL -Ddlsym=dlsym_prepend_underscore lib_LTLIBRARIES = liboss.la |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:00:59
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv3128/lib Modified Files: Makefile.am Log Message: More changes. It now compiles. osscat crashes trying to call a symbol acquired from dlsym (open), but i don't think it's dlcompat's fault Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.am 18 Oct 2002 02:50:51 -0000 1.11 +++ Makefile.am 18 Oct 2002 22:00:25 -0000 1.12 @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H +CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H -DLIBOSS_INTERNAL lib_LTLIBRARIES = liboss.la |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:00:58
|
Update of /cvsroot/liboss/liboss/include In directory usw-pr-cvs1:/tmp/cvs-serv3128/include Modified Files: soundcard.h Log Message: More changes. It now compiles. osscat crashes trying to call a symbol acquired from dlsym (open), but i don't think it's dlcompat's fault Index: soundcard.h =================================================================== RCS file: /cvsroot/liboss/liboss/include/soundcard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- soundcard.h 18 Oct 2002 02:50:51 -0000 1.3 +++ soundcard.h 18 Oct 2002 22:00:24 -0000 1.4 @@ -286,19 +286,22 @@ #include <fcntl.h> #include <sys/ioctl.h> +#ifndef LIBOSS_INTERNAL #if 0 /* This is what we'd like to have, but it causes prototype conflicts. */ #define ioctl _oss_ioctl #else #define ioctl(x,y,z...) oss_ioctl(x,y,z) #define open(x,y,z...) oss_open(x,y,z) +#define close(x) oss_close(x) #endif #include <sys/cdefs.h> __BEGIN_DECLS -int oss_ioctl __P((int fd, request_t request, ...)); -int oss_open __P((const char *pathname, int flags, ...)); +//int oss_ioctl __P((int fd, request_t request, ...)); +//int oss_open __P((const char *pathname, int flags, ...)); __END_DECLS +#endif #endif /* !_SOUNDCARD_H_ */ |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:00:56
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv3128 Modified Files: configure.in Log Message: More changes. It now compiles. osscat crashes trying to call a symbol acquired from dlsym (open), but i don't think it's dlcompat's fault Index: configure.in =================================================================== RCS file: /cvsroot/liboss/liboss/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure.in 18 Oct 2002 02:50:50 -0000 1.15 +++ configure.in 18 Oct 2002 22:00:23 -0000 1.16 @@ -86,12 +86,14 @@ dnl Flags not supported by all *cc* variants AC_TRY_CFLAGS("-Wall", wall="-Wall", wall="") AC_TRY_CFLAGS("-no-cpp-precomp", nocpp="-no-cpp-precomp", nocpp="") +AC_TRY_CFLAGS("-mdynamic-no-pic", nopic="-mdynamic-no-pic", nopic="") dnl dnl debug cflags dnl AC_SUBST(DEBUG_CFLAGS) -DEBUG_CFLAGS="-g -DDEBUG" +dnl DEBUG_CFLAGS="-g -DDEBUG" +DEBUG_CFLAGS="" dnl dnl Some include paths ( !!! DO NOT REMOVE !!! ) @@ -101,9 +103,11 @@ dnl Common cflags for all platforms CFLAGS="$CFLAGS $nocpp $wall -I$prefix/include" +NONPIC_CFLAGS="$CFLAGS $nopic" CPPFLAGS="$CPPFLAGS $CFLAGS" DEBUG_CFLAGS="$CFLAGS $DEBUG_CFLAGS" LDFLAGS="$LDFLAGS -L$prefix/lib" +AC_SUBST(NONPIC_CFLAGS) dnl dnl Libtool @@ -154,6 +158,13 @@ AC_SUBST(COREAUDIO_CFLAGS) AC_SYS_LONG_FILE_NAMES + +dnl +dnl Required libraries +dnl + +AC_CHECK_LIB(dl,dlsym) +AC_CHECK_LIB(esd,esd_open_sound) AC_CONFIG_FILES([ Makefile |
From: Alexander S. <mrv...@us...> - 2002-10-18 22:00:31
|
Update of /cvsroot/liboss/liboss/src In directory usw-pr-cvs1:/tmp/cvs-serv3128/src Modified Files: Makefile.am osscat.c Log Message: More changes. It now compiles. osscat crashes trying to call a symbol acquired from dlsym (open), but i don't think it's dlcompat's fault Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 10 May 2002 15:05:42 -0000 1.1 +++ Makefile.am 18 Oct 2002 22:00:26 -0000 1.2 @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) +CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) @NONPIC_CFLAGS@ bin_PROGRAMS = osscat Index: osscat.c =================================================================== RCS file: /cvsroot/liboss/liboss/src/osscat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- osscat.c 10 May 2002 15:05:42 -0000 1.1 +++ osscat.c 18 Oct 2002 22:00:27 -0000 1.2 @@ -1,5 +1,7 @@ #include "soundcard.h" #include <stdio.h> +#include <unistd.h> +#include <stdlib.h> /* FIXME: Add capability for recording with 'libosscat /dev/audio > somefile' */ |
From: Alexander S. <mrv...@us...> - 2002-10-18 02:50:54
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv17856/lib Modified Files: Makefile.am Log Message: Attempting an implementation using esddsp. Does not work. Does not even compile. I can't figure out what the error means, though. Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.am 10 May 2002 15:20:05 -0000 1.10 +++ Makefile.am 18 Oct 2002 02:50:51 -0000 1.11 @@ -2,11 +2,11 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) +CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) -DHAVE_SOUNDCARD_H lib_LTLIBRARIES = liboss.la -liboss_la_SOURCES = liboss.c +liboss_la_SOURCES = esddsp.c liboss_la_DEPENDENCIES = liboss_la_LIBADD = $(COREAUDIO_LDFLAGS) |
From: Alexander S. <mrv...@us...> - 2002-10-18 02:50:53
|
Update of /cvsroot/liboss/liboss/include In directory usw-pr-cvs1:/tmp/cvs-serv17856/include Modified Files: soundcard.h Log Message: Attempting an implementation using esddsp. Does not work. Does not even compile. I can't figure out what the error means, though. Index: soundcard.h =================================================================== RCS file: /cvsroot/liboss/liboss/include/soundcard.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- soundcard.h 9 May 2002 07:48:32 -0000 1.2 +++ soundcard.h 18 Oct 2002 02:50:51 -0000 1.3 @@ -290,15 +290,15 @@ /* This is what we'd like to have, but it causes prototype conflicts. */ #define ioctl _oss_ioctl #else -#define ioctl(x,y,z) oss_ioctl(x,y,z) -#define open(x,y,z) oss_open(x,y,z) +#define ioctl(x,y,z...) oss_ioctl(x,y,z) +#define open(x,y,z...) oss_open(x,y,z) #endif #include <sys/cdefs.h> __BEGIN_DECLS -int oss_ioctl __P((int fd, unsigned long com, void *argp)); -int oss_open __P((const char *path, int flags, mode_t mode)); +int oss_ioctl __P((int fd, request_t request, ...)); +int oss_open __P((const char *pathname, int flags, ...)); __END_DECLS #endif /* !_SOUNDCARD_H_ */ |
From: Alexander S. <mrv...@us...> - 2002-10-18 02:50:53
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv17856 Modified Files: configure.in Log Message: Attempting an implementation using esddsp. Does not work. Does not even compile. I can't figure out what the error means, though. Index: configure.in =================================================================== RCS file: /cvsroot/liboss/liboss/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- configure.in 22 Jun 2002 18:20:33 -0000 1.14 +++ configure.in 18 Oct 2002 02:50:50 -0000 1.15 @@ -2,7 +2,7 @@ dnl configure.in for liboss dnl AC_INIT([LibOSS],[0.1],[lib...@li...],[liboss]) -AC_CONFIG_SRCDIR([acconfig.h]) +AC_CONFIG_SRCDIR([src/osscat.c]) AC_CONFIG_HEADER([config.h]) dnl Making releases: @@ -73,7 +73,7 @@ check_athlon=yes fi -AM_CONFIG_HEADER(config.h) +dnl AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_CXX |
From: Alexander S. <mrv...@us...> - 2002-06-22 18:20:36
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv3229 Modified Files: configure.in Added Files: depcomp Log Message: Reworked some of the build system (yay for autoupdate/autoscan) Index: configure.in =================================================================== RCS file: /cvsroot/liboss/liboss/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- configure.in 10 May 2002 15:20:04 -0000 1.13 +++ configure.in 22 Jun 2002 18:20:33 -0000 1.14 @@ -1,7 +1,9 @@ dnl dnl configure.in for liboss dnl -AC_INIT(lib/liboss.c) +AC_INIT([LibOSS],[0.1],[lib...@li...],[liboss]) +AC_CONFIG_SRCDIR([acconfig.h]) +AC_CONFIG_HEADER([config.h]) dnl Making releases: dnl LIBOSS_SUB += 1; @@ -55,7 +57,7 @@ AC_SUBST(TAR_NAME) dnl -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET([]) dnl AM_INIT_AUTOMAKE("liboss", $LIBOSS_MAJOR.$LIBOSS_MINOR.$LIBOSS_SUB$LIBOSS_PRE) @@ -74,6 +76,8 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC +AC_PROG_CXX +AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_RANLIB @@ -123,6 +127,7 @@ AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T +AC_TYPE_MODE_T dnl dnl Using or not using -fPIC (override default behavior - system dependent) @@ -133,7 +138,9 @@ AC_CHECK_HEADERS(errno.h string.h stdlib.h\ sys/types.h sys/stat.h sys/param.h \ - machine/endian.h) + machine/endian.h fcntl.h \ + sys/ioctl.h sys/socket.h) +AC_CHECK_FUNCS([realpath]) dnl dnl CoreAudio @@ -148,9 +155,10 @@ AC_SYS_LONG_FILE_NAMES -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile lib/Makefile src/Makefile include/Makefile doc/Makefile]) +AC_OUTPUT |
From: Alexander S. <mrv...@us...> - 2002-05-10 20:48:11
|
Update of /cvsroot/liboss/web In directory usw-pr-cvs1:/tmp/cvs-serv14703 Modified Files: index.html Log Message: Ran through tidy Index: index.html =================================================================== RCS file: /cvsroot/liboss/web/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html 10 May 2002 17:40:34 -0000 1.1 +++ index.html 10 May 2002 20:48:08 -0000 1.2 @@ -1 +1,226 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; Charset=iso-8859-1"> <TITLE> liboss - Bringing OSS compatibility to Mac OS X </TITLE> </HEAD> <BODY BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#0000EE" TEXT="#000000"> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD WIDTH="15%" VALIGN="bottom" ALIGN="left"> <A href="http://sourceforge.net/projects/liboss">Project Page</A> </TD> <TD WIDTH="70%" ALIGN="center"> <FONT SIZE="+4"> <STRONG> liboss </STRONG> </FONT> </TD> <TD WIDTH="15%" VALIGN="middle" ALIGN="right"> <A HREF="http://sourceforge.net"><IMG SRC="http://sourceforge.net/sflogo.php?group_id=52744" WIDTH="75%" BORDER="0"></A> </TD> </TR> </TABLE> <HR> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#GGGGFF"> <TD> <STRONG> Mac OS X liboss </STRONG> </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <BR> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> liboss is a sound API to provide OSS support in Apple OS X. This will provide an audio API bridge between the linux OSS API and the Apple OS X CoreAudio API. Enabling easier ports to OS X of software that requires OSS Support.<BR> <BR> You can also have a look at other similar projects: <UL> <LI> <A HREF="http://www.opensound.com/">OSS</A> : The original OSS kernel module </LI> <LI> <A HREF="http://www.portaudio.com/">PortAudio</A> : Audio emulation software </LI> <LI> <A HREF="http://wuarchive.wustl.edu/systems/unix/NetBSD/NetBSD-current/src/lib/libossaudio/">NetBSD</A> : NetBSD CVS archive (idea came from here) </LI> </UL> <BR> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Project Team </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> Alexander Strange (Feanor)<BR> Benjamin Reed (RangerRick)<BR> David Vasilevsky (vasi)<BR> Justin F. Hallett (TheSin)<BR> Max Horn (Fingolfin)<BR> Peter O'Gorman (pogma)<BR> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Current release </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> None (stable)<BR> <A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/">CVS</A> (unstable)<BR> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Changelog </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> <A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/ChangeLog">liboss ChangeLog</A> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Downloads </TD> </TR> <TR bgcolor="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> <A HREF="https://sourceforge.net/project/showfiles.php?group_id=52744&release_id=55570">liboss Download Page</A> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Requirements </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> Mac OS X - 10.1+<BR> Mac OS X - Dec 2001 Developer Tools </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Help </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> irc.openprojects.net #liboss </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD ALIGN="right"> <FONT SIZE="-1"> <I> Updated: May 10th, 2002 </I> </FONT> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </BODY> </HTML> \ No newline at end of file +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta name="generator" content="HTML Tidy, see www.w3.org" /> + <meta http-equiv="Content-Type" + content="text/html; Charset=iso-8859-1" /> + + <title>liboss - Bringing OSS compatibility to Mac OS X</title> +<style type="text/css"> + body { + background-color: #FFFFFF; + color: #000000; + } + :link { color: #0000EE } + :visited { color: #0000EE } + span.c2 {font-size: 80%} + span.c1 {font-size: 207%} +</style> + </head> + + <body> + <table width="100%" border="0"> + <tr> + <td width="15%" valign="bottom" align="left"><a + href="http://sourceforge.net/projects/liboss">Project + Page</a> </td> + + <td width="70%" align="center"><span + class="c1"><strong>liboss</strong></span> </td> + + <td width="15%" valign="middle" align="right"><a + href="http://sourceforge.net"><img + src="http://sourceforge.net/sflogo.php?group_id=52744" + width="75%" border="0" /></a> </td> + </tr> + </table> + <hr /> + + <table width="100%" border="1"> + <tr bgcolor="#GGGGFF"> + <td><strong>Mac OS X liboss</strong> </td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <br /> + + + <table width="100%" border="0"> + <tr> + <td> + liboss is a sound API to provide OSS support in + Apple OS X. This will provide an audio API bridge + between the linux OSS API and the Apple OS X + CoreAudio API. Enabling easier ports to OS X of + software that requires OSS Support.<br /> + <br /> + You can also have a look at other similar + projects: + + <ul> + <li><a href="http://www.opensound.com/">OSS</a> : + The original OSS kernel module</li> + + <li><a + href="http://www.portaudio.com/">PortAudio</a> : + Audio emulation software</li> + + <li><a + href="http://wuarchive.wustl.edu/systems/unix/NetBSD/NetBSD-current/src/lib/libossaudio/"> + NetBSD</a> : NetBSD CVS archive (idea came from + here)</li> + </ul> + <br /> + + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Project Team</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td>Alexander Strange (Feanor)<br /> + Benjamin Reed (RangerRick)<br /> + David Vasilevsky (vasi)<br /> + Justin F. Hallett (TheSin)<br /> + Max Horn (Fingolfin)<br /> + Peter O'Gorman (pogma)<br /> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Current release</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td>None (stable)<br /> + <a + href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/"> + CVS</a> (unstable)<br /> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Changelog</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td><a + href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/ChangeLog"> + liboss ChangeLog</a> </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Downloads</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td><a + href="https://sourceforge.net/project/showfiles.php?group_id=52744&release_id=55570"> + liboss Download Page</a> </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Requirements</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td>Mac OS X - 10.1+<br /> + Mac OS X - Dec 2001 Developer Tools</td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td> + <table width="100%" border="1"> + <tr bgcolor="#9999FF"> + <td>Help</td> + </tr> + + <tr bgcolor="#CCCCCC"> + <td> + <table width="100%" border="0"> + <tr> + <td>irc.openprojects.net #liboss</td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + + <tr> + <td align="right"><span class="c2"><i>Updated: May + 10th, 2002</i></span> </td> + </tr> + </table> + </td> + </tr> + </table> + </body> +</html> + |
From: Justin <th...@us...> - 2002-05-10 17:40:39
|
Update of /cvsroot/liboss/web In directory usw-pr-cvs1:/tmp/cvs-serv22537 Added Files: index.html Log Message: First poor attempt at a web site --- NEW FILE: index.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> <META http-equiv="Content-Type" content="text/html; Charset=iso-8859-1"> <TITLE> liboss - Bringing OSS compatibility to Mac OS X </TITLE> </HEAD> <BODY BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#0000EE" TEXT="#000000"> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD WIDTH="15%" VALIGN="bottom" ALIGN="left"> <A href="http://sourceforge.net/projects/liboss">Project Page</A> </TD> <TD WIDTH="70%" ALIGN="center"> <FONT SIZE="+4"> <STRONG> liboss </STRONG> </FONT> </TD> <TD WIDTH="15%" VALIGN="middle" ALIGN="right"> <A HREF="http://sourceforge.net"><IMG SRC="http://sourceforge.net/sflogo.php?group_id=52744" WIDTH="75%" BORDER="0"></A> </TD> </TR> </TABLE> <HR> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#GGGGFF"> <TD> <STRONG> Mac OS X liboss </STRONG> </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <BR> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> liboss is a sound API to provide OSS support in Apple OS X. This will provide an audio API bridge between the linux OSS API and the Apple OS X CoreAudio API. Enabling easier ports to OS X of software that requires OSS Support.<BR> <BR> You can also have a look at other similar projects: <UL> <LI> <A HREF="http://www.opensound.com/">OSS</A> : The original OSS kernel module </LI> <LI> <A HREF="http://www.portaudio.com/">PortAudio</A> : Audio emulation software </LI> <LI> <A HREF="http://wuarchive.wustl.edu/systems/unix/NetBSD/NetBSD-current/src/lib/libossaudio/">NetBSD</A> : NetBSD CVS archive (idea came from here) </LI> </UL> <BR> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Project Team </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> Alexander Strange (Feanor)<BR> Benjamin Reed (RangerRick)<BR> David Vasilevsky (vasi)<BR> Justin F. Hallett (TheSin)<BR> Max Horn (Fingolfin)<BR> Peter O'Gorman (pogma)<BR> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Current release </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> None (stable)<BR> <A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/">CVS</A> (unstable)<BR> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Changelog </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> <A HREF="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/liboss/liboss/ChangeLog">liboss ChangeLog</A> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Downloads </TD> </TR> <TR bgcolor="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> <A HREF="https://sourceforge.net/project/showfiles.php?group_id=52744&release_id=55570">liboss Download Page</A> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Requirements </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> Mac OS X - 10.1+<BR> Mac OS X - Dec 2001 Developer Tools </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD> <TABLE WIDTH="100%" BORDER="1"> <TR BGCOLOR="#9999FF"> <TD> Help </TD> </TR> <TR BGCOLOR="#CCCCCC"> <TD> <TABLE WIDTH="100%" BORDER="0"> <TR> <TD> irc.openprojects.net #liboss </TD> </TR> </TABLE> </TD> </TR> </TABLE> </TD> </TR> <TR> <TD ALIGN="right"> <FONT SIZE="-1"> <I> Updated: May 10th, 2002 </I> </FONT> </TD> </TR> </TABLE> </TD> </TR> </TABLE> </BODY> </HTML> |
From: Max H. <fin...@us...> - 2002-05-10 15:57:41
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv20526 Modified Files: .cvsignore Log Message: updated .cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/liboss/liboss/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 May 2002 18:07:50 -0000 1.2 +++ .cvsignore 10 May 2002 15:57:38 -0000 1.3 @@ -1,7 +1,9 @@ aclocal.m4 autom4te.cache config.h.in +config.log configure depcomp +libtool Makefile.in stamp.h.in |
From: Justin <th...@us...> - 2002-05-10 15:48:15
|
Update of /cvsroot/liboss/liboss/include In directory usw-pr-cvs1:/tmp/cvs-serv17274/include Added Files: .cvsignore Log Message: cvs sanity addition --- NEW FILE: .cvsignore --- Makefile.in |
From: Justin <th...@us...> - 2002-05-10 15:48:15
|
Update of /cvsroot/liboss/liboss/src In directory usw-pr-cvs1:/tmp/cvs-serv17274/src Added Files: .cvsignore Log Message: cvs sanity addition --- NEW FILE: .cvsignore --- Makefile.in |
From: Justin <th...@us...> - 2002-05-10 15:43:24
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv15301 Modified Files: autogen.sh Log Message: Changed autogen.sh to autorun configure using pwd ass the prefix for vasi, to stop this a variable called NO_CONFIGURE must not be equal to null Index: autogen.sh =================================================================== RCS file: /cvsroot/liboss/liboss/autogen.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- autogen.sh 3 May 2002 16:19:56 -0000 1.1.1.1 +++ autogen.sh 10 May 2002 15:43:21 -0000 1.2 @@ -70,12 +70,16 @@ rm -f config.cache -#if [ x"$NO_CONFIGURE" = "x" ]; then -# echo " + Running 'configure $@':" -# if [ -z "$*" ]; then -# echo " ** If you wish to pass arguments to ./configure, please" -# echo " ** specify them on the command line." -# fi -# ./configure "$@" && \ -# echo "Now type 'make' to compile $PKG_NAME" || exit 1 -#fi +if [ x"$NO_CONFIGURE" = "x" ]; then + echo " + Running 'configure --prefix=`pwd` $@':" + 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` "$@" && \ + echo "Now type 'make' to compile $PKG_NAME" || exit 1 +fi |
From: Justin <th...@us...> - 2002-05-10 15:25:15
|
Update of /cvsroot/liboss/liboss/include In directory usw-pr-cvs1:/tmp/cvs-serv8964 Modified Files: Makefile.am Log Message: Oops Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/include/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 10 May 2002 15:20:05 -0000 1.1 +++ Makefile.am 10 May 2002 15:25:12 -0000 1.2 @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -include_HEADERS = $(top_srcdir)/include/soundcard.h +include_HEADERS = soundcard.h noinst_HEADERS = |
From: Justin <th...@us...> - 2002-05-10 15:20:38
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv7603 Modified Files: Makefile.am Log Message: Almost forgot this one Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 10 May 2002 14:38:54 -0000 1.2 +++ Makefile.am 10 May 2002 15:20:36 -0000 1.3 @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -SUBDIRS = lib src +SUBDIRS = include lib src EXTRA_DIST = |
From: Justin <th...@us...> - 2002-05-10 15:20:08
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv7367/lib Modified Files: Makefile.am Log Message: Fix for install phase Index: Makefile.am =================================================================== RCS file: /cvsroot/liboss/liboss/lib/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile.am 9 May 2002 23:02:29 -0000 1.9 +++ Makefile.am 10 May 2002 15:20:05 -0000 1.10 @@ -13,7 +13,7 @@ liboss_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -include_HEADERS = $(top_srcdir)/include/soundcard.h +include_HEADERS = noinst_HEADERS = @@ -22,29 +22,6 @@ install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -### -# Install header files (default=$includedir/sys) -# -install-includeHEADERS: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/sys - @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; \ - done - - -### -# Remove them -# -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/sys/$$p; \ - done - mostlyclean-generic: -rm -f *~ \#* .*~ .\#* |
From: Justin <th...@us...> - 2002-05-10 15:20:08
|
Update of /cvsroot/liboss/liboss/include In directory usw-pr-cvs1:/tmp/cvs-serv7367/include Added Files: Makefile.am Log Message: Fix for install phase --- NEW FILE: Makefile.am --- ## ## Process this file with automake to produce Makefile.in ## include_HEADERS = $(top_srcdir)/include/soundcard.h noinst_HEADERS = ### # Install header files (default=$includedir/sys) # install-includeHEADERS: @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(includedir)/sys @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; \ done ### # Remove them # uninstall-includeHEADERS: @$(NORMAL_UNINSTALL) list='$(include_HEADERS)'; for p in $$list; do \ rm -f $(DESTDIR)$(includedir)/sys/$$p; \ done mostlyclean-generic: -rm -f *~ \#* .*~ .\#* maintainer-clean-generic: -@echo "This command is intended for maintainers to use;" -@echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in |
From: Justin <th...@us...> - 2002-05-10 15:20:07
|
Update of /cvsroot/liboss/liboss In directory usw-pr-cvs1:/tmp/cvs-serv7367 Modified Files: configure.in Log Message: Fix for install phase Index: configure.in =================================================================== RCS file: /cvsroot/liboss/liboss/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.in 10 May 2002 15:05:41 -0000 1.12 +++ configure.in 10 May 2002 15:20:04 -0000 1.13 @@ -152,4 +152,5 @@ Makefile lib/Makefile src/Makefile +include/Makefile doc/Makefile]) |
From: Justin <th...@us...> - 2002-05-10 15:05:45
|
Update of /cvsroot/liboss/liboss/src In directory usw-pr-cvs1:/tmp/cvs-serv1820/src Added Files: Makefile.am osscat.c Log Message: Add a src dir and change bin program name to osscat, and now compiles and installs --- NEW FILE: Makefile.am --- ## ## Process this file with automake to produce Makefile.in ## CFLAGS = @CFLAGS@ $(COREAUDIO_CFLAGS) bin_PROGRAMS = osscat osscat_SOURCES = osscat.c osscat_DEPENDENCIES = $(top_srcdir)/lib/liboss.la osscat_LDADD = $(top_srcdir)/lib/liboss.la \ $(COREAUDIO_LDFLAGS) debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am mostlyclean-generic: -rm -f *~ \#* .*~ .\#* maintainer-clean-generic: -@echo "This command is intended for maintainers to use;" -@echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in --- NEW FILE: osscat.c --- #include "soundcard.h" #include <stdio.h> /* FIXME: Add capability for recording with 'libosscat /dev/audio > somefile' */ #define BUF_SIZE 1024 #define DEVICE "/dev/dspW" int main(int argc, char **argv) { int fd, play; char buf[BUF_SIZE]; if (argc != 2) { fprintf(stderr, "Usage: libosscat file\n"); exit(1); } if ((fd = open(argv[1], O_RDONLY, 0)) < 0) { fprintf(stderr, "File %s could not be opened.\n", argv[1]); exit(1); } if ((play = open(DEVICE, O_WRONLY, 0)) < 0) { fprintf(stderr, "%s could not be opened.\n", DEVICE); exit(1); } while (read(fd, buf, BUF_SIZE) > 0) { write(play, buf, BUF_SIZE); /* if it errors, keep going */ } return 0; } |
From: Justin <th...@us...> - 2002-05-10 15:05:44
|
Update of /cvsroot/liboss/liboss/lib In directory usw-pr-cvs1:/tmp/cvs-serv1820/lib Removed Files: libosscat.c Log Message: Add a src dir and change bin program name to osscat, and now compiles and installs --- libosscat.c DELETED --- |