[pkgsrc/trunk]: pkgsrc/devel/SDL Patch to make audio work on IRIX 5, from Geo...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f627ecad5be
branches:  trunk
changeset: 478191:1f627ecad5be
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jul 19 10:48:46 2004 +0000

description:
Patch to make audio work on IRIX 5, from Georg Schwarz.

diffstat:

 devel/SDL/distinfo         |   3 +-
 devel/SDL/patches/patch-aw |  64 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletions(-)

diffs (85 lines):

diff -r da3ca9ee0759 -r 1f627ecad5be devel/SDL/distinfo
--- a/devel/SDL/distinfo        Mon Jul 19 10:43:01 2004 +0000
+++ b/devel/SDL/distinfo        Mon Jul 19 10:48:46 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: distinfo,v 1.32 2004/07/19 10:48:46 wiz Exp $
 
 SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
 Size (SDL-1.2.7.tar.gz) = 2470936 bytes
@@ -13,6 +13,7 @@
 SHA1 (patch-at) = 5e470473bd9ed1d278b23a06db8af2b346301794
 SHA1 (patch-au) = 7571582ea7654f99f721ef6d1c81a7bee3fb712a
 SHA1 (patch-av) = a19c162dcb85cf0d0d1c1d6ab50651782b60a96f
+SHA1 (patch-aw) = 6f6b2ca8cc499b23f95591f874c436318d2fcf1a
 SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729
 SHA1 (patch-bb) = 48407d4a2d881cb3427b29682fc7e417023d1b99
 SHA1 (patch-bc) = 40012e55c20e8c10b575a6de0ac4f3f2a35baf15
diff -r da3ca9ee0759 -r 1f627ecad5be devel/SDL/patches/patch-aw
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-aw        Mon Jul 19 10:48:46 2004 +0000
@@ -0,0 +1,64 @@
+$NetBSD: patch-aw,v 1.1 2004/07/19 10:48:46 wiz Exp $
+
+--- src/audio/dmedia/SDL_irixaudio.c.orig      2003-08-30 21:13:02.000000000 +0200
++++ src/audio/dmedia/SDL_irixaudio.c
+@@ -28,6 +28,7 @@ static char rcsid =
+ #endif
+ 
+ /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */
++/* patch for IRIX 5 by Georg Schwarz 18/07/2004 */
+ 
+ #include <stdlib.h>
+ 
+@@ -39,6 +40,21 @@ static char rcsid =
+ #include "SDL_irixaudio.h"
+ 
+ 
++#ifdef AL_RESOURCE /* as a test whether we use the "new" IRIX
++                       audio libraries */
++#define NEW_IRIX_AUDIO
++#else
++#define alClosePort(x) ALcloseport(x)
++#define alFreeConfig(x) ALfreeconfig(x)
++#define alGetFillable(x) ALgetfillable(x)
++#define alNewConfig() ALnewconfig()
++#define alOpenPort(x,y,z) ALopenport(x,y,z)
++#define alSetChannels(x,y) ALsetchannels(x,y)
++#define alSetQueueSize(x,y) ALsetqueuesize(x,y)
++#define alSetSampFmt(x,y) ALsetsampfmt(x,y)
++#define alSetWidth(x,y) ALsetwidth(x,y)
++#endif
++
+ /* Audio driver functions */
+ static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec);
+ static void AL_WaitAudio(_THIS);
+@@ -137,7 +153,11 @@ static void AL_CloseAudio(_THIS)
+ static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec)
+ {
+       ALconfig audio_config;
++#ifdef NEW_IRIX_AUDIO
+       ALpv audio_param;
++#else
++      long audio_param[2];
++#endif
+       int width;
+ 
+       /* Determine the audio parameters from the AudioSpec */
+@@ -165,9 +185,16 @@ static int AL_OpenAudio(_THIS, SDL_Audio
+       SDL_CalculateAudioSpec(spec);
+ 
+       /* Set output frequency */
++#ifdef NEW_IRIX_AUDIO
+       audio_param.param = AL_RATE;
+       audio_param.value.i = spec->freq;
+-      if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 ) {
++      if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 )
++#else
++      audio_param[0] = AL_OUTPUT_RATE;
++      audio_param[1] = spec->freq;
++      if( ALsetparams(AL_DEFAULT_DEVICE, audio_param, 2) < 0 )
++#endif
++      {
+               SDL_SetError("alSetParams failed");
+               return(-1);
+       }