From b5b0f479beb70d7a697ef3382db2e69e4593c4b2 Mon Sep 17 00:00:00 2001 From: hannes Date: Sun, 10 Oct 2004 11:39:34 +0000 Subject: [PATCH] hannes: updated: esound 0.2.35 remove old disabled patches [2004092903245813016] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4494 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/rene/esound/devfs.patch.disabled | 361 ------------------ .../esound-alsa-pcm-newapi.patch.disabled | 43 --- package/rene/esound/esound.desc | 4 +- 3 files changed, 2 insertions(+), 406 deletions(-) delete mode 100644 package/rene/esound/devfs.patch.disabled delete mode 100644 package/rene/esound/esound-alsa-pcm-newapi.patch.disabled diff --git a/package/rene/esound/devfs.patch.disabled b/package/rene/esound/devfs.patch.disabled deleted file mode 100644 index 1ce68e692..000000000 --- a/package/rene/esound/devfs.patch.disabled +++ /dev/null @@ -1,361 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/esound/devfs.patch.disabled -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./docs/html/miscellaneous.html.orig Wed Mar 21 14:32:34 2001 -+++ ./docs/html/miscellaneous.html Wed Mar 21 14:32:34 2001 -@@ -138,7 +138,7 @@ - - added network support - -- optional /dev/dsp fallback for stream play and record -+ optional /dev/sound/dsp fallback for stream play and record - - other forgotten features and bug fixes - ---- ./docs/html/planned-development.html.orig Wed Mar 21 14:32:34 2001 -+++ ./docs/html/planned-development.html Wed Mar 21 14:32:34 2001 -@@ -69,7 +69,7 @@ - >

Porting of more sound playing applications. For sound programs that -- send their output to /dev/dsp, this is usually a trivial process. -+ send their output to /dev/sound/dsp, this is usually a trivial process. - Anyone willing to lend a hand in this effort will be duly appreciated. -

- Porting of more sound playing applications. For sound programs that -- send their output to /dev/dsp, this is usually a trivial process. -+ send their output to /dev/sound/dsp, this is usually a trivial process. - Anyone willing to lend a hand in this effort will be duly appreciated. - - ---- ./AUTHORS.orig Wed Mar 21 14:32:28 2001 -+++ ./AUTHORS Wed Mar 21 14:32:28 2001 -@@ -51,7 +51,7 @@ - Jimmy Olsen : hpux driver fixes - - Manish Singh : misc autoconf hackery, the magic -- /dev/dsp to esd rerouter. -+ /dev/sound/dsp to esd rerouter. - - Philippe Defert: aix driver fixes - ---- ./ChangeLog.orig Wed Mar 21 14:32:28 2001 -+++ ./ChangeLog Wed Mar 21 14:32:28 2001 -@@ -93,7 +93,7 @@ - - 1999-10-11 Drazen Kacar - -- * audio_solaris.c: Don't spit warnings if /dev/audio doesn't -+ * audio_solaris.c: Don't spit warnings if /dev/sound/audio doesn't - exist. User probably knows he doesn't have a sound card. - - 1999-10-06 Russell Steinthal -@@ -345,8 +345,8 @@ - - Mon Jan 25 03:16:30 PST 1999 Manish Singh - -- * esddsp.c: added a /dev/mixer wrapper. Set ESDDSP_MIXER=1 to -- for all /dev/mixer access to be trapped. It will save and load -+ * esddsp.c: added a /dev/sound/mixer wrapper. Set ESDDSP_MIXER=1 to -+ for all /dev/sound/mixer access to be trapped. It will save and load - the mixer settings in ~/.esddsp.{name}. - - 1999-01-25 Yo Ric Dude -@@ -670,7 +670,7 @@ - - * esddsp.c: somewhat of a rewrite. We only try to use esound - if an open() fails. This lets the no esound case fall back to -- /dev/dsp, and also doesn't do a strcmp on every call to open. -+ /dev/sound/dsp, and also doesn't do a strcmp on every call to open. - Got rid of the varargs junk in ioctl, I've never seen an ioctl - with more than one extra arg anyway (please tell me if I'm wrong). - Reworked the code, so we're not so x11amp specific, i.e. the -@@ -702,7 +702,7 @@ - 1998-10-17 Yo Ric Dude - - * esddsp.c: added Yosh's slick trick for transparently -- rerouting /dev/dsp to esd. Only tested with Linux and -+ rerouting /dev/sound/dsp to esd. Only tested with Linux and - x11amp. Directions are in the source file for the brave. - - Sat Oct 17 02:20:42 PDT 1998 Manish Singh -@@ -1112,7 +1112,7 @@ - 1998-05-24 Yo 'Ric Dude - - * clients.c, esd.c, esdlib.c: -- added ability to free and reclaim /dev/dsp for use by other -+ added ability to free and reclaim /dev/sound/dsp for use by other - programs, without invalidating any sample references within - the daemon. sound output is consumed by daemon, and ignored - until the daemon is resumed. created esd_lock() and esd_unlock() -@@ -1154,7 +1154,7 @@ - Sat Apr 25 03:03:11 1998 Yo 'Ric Dude - - * TODO, audio.c, clients.c, esd.h, esdcat.c, esdlib.c, esdrec.c: -- added the /dev/dsp fallback feature to client lib -+ added the /dev/sound/dsp fallback feature to client lib - - Sat Apr 18 23:57:15 1998 Yo 'Ric Dude - ---- ./NEWS.orig Wed Mar 21 14:32:28 2001 -+++ ./NEWS Wed Mar 21 14:32:29 2001 -@@ -11,7 +11,7 @@ - New Stuff in EsounD version 0.2: - - o esd_play_stream_fallback, esd_record_stream_fallback -- - if default esd is not available, revert to /dev/dsp -+ - if default esd is not available, revert to /dev/sound/dsp - for playback/record - - o esd_open_sound ---- ./esddsp.in.orig Wed Mar 21 14:32:29 2001 -+++ ./esddsp.in Wed Mar 21 14:32:29 2001 -@@ -87,7 +87,7 @@ - echo "command line: $@" - fi - --# setup esd to hijack calls made to /dev/dsp -+# setup esd to hijack calls made to /dev/sound/dsp - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ ---- ./esddsp.c.orig Wed Mar 21 14:32:30 2001 -+++ ./esddsp.c Wed Mar 21 14:32:30 2001 -@@ -183,7 +183,7 @@ - mode = va_arg (args, mode_t); - va_end (args); - -- if (!strcmp (pathname, "/dev/dsp")) -+ if (!strcmp (pathname, "/dev/sound/dsp")) - { - if (!getenv ("ESPEAKER")) - { -@@ -194,13 +194,13 @@ - return ret; - } - -- DPRINTF ("hijacking /dev/dsp open, and taking it to esd...\n"); -+ DPRINTF ("hijacking /dev/sound/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")) -+ else if (use_mixer && !strcmp (pathname, "/dev/sound/mixer")) - { -- DPRINTF ("hijacking /dev/mixer open, and taking it to esd...\n"); -+ DPRINTF ("hijacking /dev/sound/mixer open, and taking it to esd...\n"); - return (mixfd = (*func) (mixer, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)); - } - else -@@ -215,7 +215,7 @@ - - int *arg = (int *) argp; - -- DPRINTF ("hijacking /dev/dsp ioctl, and sending it to esd " -+ DPRINTF ("hijacking /dev/sound/dsp ioctl, and sending it to esd " - "(%d : %x - %p)\n", fd, request, argp); - - switch (request) -@@ -262,7 +262,7 @@ - - - default: -- DPRINTF ("unhandled /dev/dsp ioctl (%x - %p)\n", request, argp); -+ DPRINTF ("unhandled /dev/sound/dsp ioctl (%x - %p)\n", request, argp); - break; - } - -@@ -310,7 +310,7 @@ - - int *arg = (int *) argp; - -- DPRINTF ("hijacking /dev/mixer ioctl, and sending it to esd " -+ DPRINTF ("hijacking /dev/sound/mixer ioctl, and sending it to esd " - "(%d : %x - %p)\n", fd, request, argp); - - switch (request) -@@ -369,7 +369,7 @@ - break; - - default: -- DPRINTF ("unhandled /dev/mixer ioctl (%x - %p)\n", request, argp); -+ DPRINTF ("unhandled /dev/sound/mixer ioctl (%x - %p)\n", request, argp); - break; - } - ---- ./esdlib.c.orig Wed Mar 21 14:32:30 2001 -+++ ./esdlib.c Wed Mar 21 14:32:30 2001 -@@ -814,7 +814,7 @@ - if ( host ) - return -1; - -- /* go for /dev/dsp */ -+ /* go for /dev/sound/dsp */ - esd_audio_format = format; - esd_audio_rate = rate; - socket_out = esd_audio_open(); -@@ -1079,7 +1079,7 @@ - if ( host ) - return -1; - -- /* go for /dev/dsp */ -+ /* go for /dev/sound/dsp */ - esd_audio_format = format; - esd_audio_rate = rate; - socket_out = esd_audio_open(); ---- ./audio.c.orig Wed Mar 21 14:32:30 2001 -+++ ./audio.c Wed Mar 21 14:32:30 2001 -@@ -12,9 +12,9 @@ - /* globals */ - esd_format_t esd_audio_format = ESD_BITS16 | ESD_STEREO; - int esd_audio_rate = ESD_DEFAULT_RATE; --char *esd_audio_device = NULL; /* aux device spec: /dev/dsp2, lineout, etc. */ -+char *esd_audio_device = NULL; /* aux device spec: /dev/sound/dsp2, lineout, etc. */ - --/* the audio device, /dev/dsp, file descriptor */ -+/* the audio device, /dev/sound/dsp, file descriptor */ - static int esd_audio_fd = -1; - - /*******************************************************************/ ---- ./audio_hpux.c.orig Wed Mar 21 14:32:31 2001 -+++ ./audio_hpux.c Wed Mar 21 14:32:31 2001 -@@ -10,7 +10,7 @@ - #define ARCH_esd_audio_open - int esd_audio_open() - { -- const char *device = "/dev/audio"; -+ const char *device = "/dev/sound/audio"; - - int afd = -1; - int mode = O_WRONLY; ---- ./audio_oss.c.orig Wed Mar 21 14:32:31 2001 -+++ ./audio_oss.c Wed Mar 21 14:32:31 2001 -@@ -19,7 +19,7 @@ - #define ARCH_esd_audio_devices - const char *esd_audio_devices() - { -- return "/dev/dsp, /dev/dsp2, etc."; -+ return "/dev/sound/dsp, /dev/sound/dsp2, etc."; - } - - -@@ -38,7 +38,7 @@ - mode |= O_NONBLOCK; - - /* open the sound device */ -- device = esd_audio_device ? esd_audio_device : "/dev/dsp"; -+ device = esd_audio_device ? esd_audio_device : "/dev/sound/dsp"; - if ((afd = open(device, mode, 0)) == -1) - { /* Opening device failed */ - perror(device); ---- ./audio_mklinux.c.orig Wed Mar 21 14:32:31 2001 -+++ ./audio_mklinux.c Wed Mar 21 14:32:31 2001 -@@ -11,7 +11,7 @@ - #define ARCH_esd_audio_open - int esd_audio_open() - { -- const char *device = "/dev/dsp"; -+ const char *device = "/dev/sound/dsp"; - - int afd = -1, value = 0, test = 0; - int mode = O_WRONLY; ---- ./audio_solaris.c.orig Mon Sep 10 02:56:35 2001 -+++ ./audio_solaris.c Fri Oct 5 12:42:32 2001 -@@ -19,7 +19,7 @@ - /* if you want to confirm proper device setup, uncomment the following line */ - /* #define ESDBG_DRIVER */ - --static char *default_device = "/dev/audio"; -+static char *default_device = "/dev/sound/audio"; - - static char *my_ports = NULL; - ---- ./esd.c.orig Wed Mar 21 14:32:31 2001 -+++ ./esd.c Wed Mar 21 14:32:31 2001 -@@ -620,7 +620,7 @@ - esd_audio_rate = default_rate; - ESD_AUDIO_STUFF; - -- /* open and initialize the audio device, /dev/dsp */ -+ /* open and initialize the audio device, /dev/sound/dsp */ - itmp = esd_audio_open(); - if (itmp == -2) { /* Special return value indicates open of device failed, don't bother - trying */ ---- ./esd.h.orig Wed Mar 21 14:32:32 2001 -+++ ./esd.h Wed Mar 21 14:32:32 2001 -@@ -53,9 +53,9 @@ - ESD_PROTO_SAMPLE_STOP, /* stop a looping sample when done */ - ESD_PROTO_SAMPLE_KILL, /* stop the looping sample immed. */ - -- /* free and reclaim /dev/dsp functionality */ -- ESD_PROTO_STANDBY, /* release /dev/dsp and ignore all data */ -- ESD_PROTO_RESUME, /* reclaim /dev/dsp and play sounds again */ -+ /* free and reclaim /dev/sound/dsp functionality */ -+ ESD_PROTO_STANDBY, /* release /dev/sound/dsp and ignore all data */ -+ ESD_PROTO_RESUME, /* reclaim /dev/sound/dsp and play sounds again */ - - /* TODO: move these to a more logical place. NOTE: will break the protocol */ - ESD_PROTO_SAMPLE_GETID, /* get the ID for an already-cached sample */ -@@ -141,7 +141,7 @@ - int esd_resume( int esd ); - - /* open a socket for playing, monitoring, or recording as a stream */ --/* the *_fallback functions try to open /dev/dsp if there's no EsounD */ -+/* the *_fallback functions try to open /dev/sound/dsp if there's no EsounD */ - int esd_play_stream( esd_format_t format, int rate, - const char *host, const char *name ); - int esd_play_stream_fallback( esd_format_t format, int rate, ---- ./TIPS.orig Wed Mar 21 14:32:33 2001 -+++ ./TIPS Wed Mar 21 14:32:33 2001 -@@ -47,7 +47,7 @@ - - To make sure the recoding works, try this WITHOUT esd running: - --dd bs=8k count=4 sample.au -+dd bs=8k count=4 sample.au - - - Cthugha - An Oscilloscope on Acid -@@ -60,7 +60,7 @@ - esdmon > /tmp/cthugha.com - - NOTE: xcthugha may complain about: --Can't open `/dev/dsp' for writing. (16 - Device or resource busy) -+Can't open `/dev/sound/dsp' for writing. (16 - Device or resource busy) - No problem, keep on truckin'. esd gets the sound device, and - cthugha gets the data it needs. - diff --git a/package/rene/esound/esound-alsa-pcm-newapi.patch.disabled b/package/rene/esound/esound-alsa-pcm-newapi.patch.disabled deleted file mode 100644 index 5f0ed4171..000000000 --- a/package/rene/esound/esound-alsa-pcm-newapi.patch.disabled +++ /dev/null @@ -1,43 +0,0 @@ -**** This patch should be removed when updating to esound >0.2.32 -**** -**** patch by Łukasz Mach -**** released under the GPL license -**** -**** updates to the new alsa pcm api used since 0.9.0_rc4 -**** (http://bugzilla.gnome.org/show_bug.cgi?id=129709) - ---- ../esound-0.2.32.orig/audio_alsa09.c Thu Mar 20 09:34:19 2003 -+++ ./audio_alsa09.c Sat Dec 20 03:01:11 2003 -@@ -136,15 +136,17 @@ - alsaerr = -1; - return handle; - } -- -- err = snd_pcm_hw_params_set_rate_near(handle, hwparams, speed, 0); -+ -+ int t_dir=0; -+ int t_speed=speed; -+ err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &t_speed, &t_dir); - if (err < 0) { - if (alsadbg) - fprintf(stderr, "%s\n", snd_strerror(err)); - alsaerr = -1; - return handle; - } -- if (err != speed) { -+ if (t_speed != speed) { - if (alsadbg) - fprintf(stderr, "Rate not avaliable %i != %i\n", speed, err); - alsaerr = -1; -@@ -176,8 +178,9 @@ - alsaerr = -1; - return handle; - } -- -- err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, BUFFERSIZE); -+ -+ snd_pcm_uframes_t t_bufsize=BUFFERSIZE; -+ err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &t_bufsize); - if (err < 0) { - if (alsadbg) - fprintf(stderr, "Buffersize:%s\n", snd_strerror(err)); diff --git a/package/rene/esound/esound.desc b/package/rene/esound/esound.desc index 9591ccbee..81688a334 100644 --- a/package/rene/esound/esound.desc +++ b/package/rene/esound/esound.desc @@ -33,8 +33,8 @@ [L] GPL [S] Stable -[V] 0.2.34 +[V] 0.2.35 [P] X -?---5---9 112.100 -[D] 1080358357 esound-0.2.34.tar.bz2 ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/esound/0.2/ +[D] 4200168297 esound-0.2.35.tar.bz2 ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/esound/0.2/