From 7398d6cd1aa3fe4674c50ac474acbea824061a66 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Sun, 25 Jan 2009 01:25:39 +0000
Subject: [PATCH] let SDL do the audio conversions as smpeg doesn't do them
 very well ok pvalchev

---
 devel/smpeg/Makefile                          |  4 +-
 devel/smpeg/patches/patch-audio_MPEGaudio_cpp | 44 +++++++++++++++++--
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index b2a8a211905..d56a200cbf5 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.28 2009/01/09 17:43:38 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2009/01/25 01:25:39 jakemsr Exp $
 
 COMMENT=	mpeg video player library with sound support
 
 DISTNAME=	smpeg-0.4.4
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 SHARED_LIBS=	smpeg 2.0
 CATEGORIES=	devel graphics
 
diff --git a/devel/smpeg/patches/patch-audio_MPEGaudio_cpp b/devel/smpeg/patches/patch-audio_MPEGaudio_cpp
index b5c762ff658..b6737f78c12 100644
--- a/devel/smpeg/patches/patch-audio_MPEGaudio_cpp
+++ b/devel/smpeg/patches/patch-audio_MPEGaudio_cpp
@@ -1,7 +1,43 @@
-$OpenBSD: patch-audio_MPEGaudio_cpp,v 1.1 2002/06/08 09:21:19 pvalchev Exp $
---- audio/MPEGaudio.cpp.orig	Wed Apr  4 15:42:40 2001
-+++ audio/MPEGaudio.cpp	Sat Jun  8 04:15:54 2002
-@@ -200,9 +200,11 @@ void
+$OpenBSD: patch-audio_MPEGaudio_cpp,v 1.2 2009/01/25 01:25:39 jakemsr Exp $
+--- audio/MPEGaudio.cpp.orig	Wed Apr  4 13:42:40 2001
++++ audio/MPEGaudio.cpp	Sat Jan 24 04:31:08 2009
+@@ -54,10 +54,16 @@ MPEGaudio:: MPEGaudio(MPEGstream *stream, bool initSDL
+         if ( sdl_audio ) {
+             /* Open the audio, get actual audio hardware format and convert */
+             bool audio_active;
++#ifdef DISABLE_SDL_CONVERSIONS
+             SDL_AudioSpec actual;
+             audio_active = (SDL_OpenAudio(&wanted, &actual) == 0);
+             if ( audio_active ) {
+                 ActualSpec(&actual);
++#else
++            audio_active = (SDL_OpenAudio(&wanted, NULL) == 0);
++            if ( audio_active ) {
++                ActualSpec(&wanted);
++#endif
+                 valid_stream = true;
+             } else {
+                 SetError(SDL_GetError());
+@@ -112,6 +118,8 @@ MPEGaudio:: WantedSpec(SDL_AudioSpec *wanted)
+ void
+ MPEGaudio:: ActualSpec(const SDL_AudioSpec *actual)
+ {
++#ifdef DISABLE_SDL_CONVERSIONS
++
+     /* Splay can optimize some of the conversion */
+     if ( actual->channels == 1 && outputstereo ) {
+         forcetomonoflag = true;
+@@ -131,6 +139,9 @@ MPEGaudio:: ActualSpec(const SDL_AudioSpec *actual)
+ 	;
+ #endif
+     }
++
++#endif	/* DISABLE_SDL_CONVERSIONS */
++
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+     if ( actual->format != AUDIO_S16LSB)
+ #else
+@@ -200,9 +211,11 @@ void
  MPEGaudio:: Stop(void)
  {
      if ( valid_stream ) {