*sigh* more stuff that got missed in the previous commit

x11/kde/multimedia3/patches/patch-configure_in

@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure_in,v 1.32 2008/04/13 09:48:57 espie Exp $
+$OpenBSD: patch-configure_in,v 1.33 2009/01/29 22:37:21 jakemsr Exp $
 --- configure.in.orig	Wed Feb 13 16:06:50 2008
 +++ configure.in	Sun Apr 13 06:31:48 2008
 @@ -164,22 +164,22 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS],
@@ -142,15 +142,6 @@ $OpenBSD: patch-configure_in,v 1.32 2008/04/13 09:48:57 espie Exp $
    FreeBSD | DragonFly)
      OS_TYPE="BSD"
      AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
-@@ -1389,7 +1382,7 @@ KDE_MPEGLIB_COMPILES
- 
- THIS_LIB_LIBS="-lX11 -lXext -lm ${XVLIBS} ${DGALIBS} "
- THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} "
--THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD}"
-+THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD} ${LIBOSSAUDIO}"
- AC_SUBST(THIS_LIB_LIBS)
- dnl =======================================================
- dnl FILE: ./mpeglib/lib/mpegplay/configure.in.in
 @@ -1768,7 +1761,7 @@ dnl Check for new internal xine symbol names
  KDE_CHECK_LIB(xine, _x_ao_new_port, :, 
  [

x11/kde/multimedia3/patches/patch-mpeglib_configure_in_in

@@ -1,5 +1,5 @@
---- mpeglib/configure.in.in.orig	Mon Oct  8 11:48:54 2007
+--- mpeglib/configure.in.in.orig	Mon Oct  8 02:48:54 2007
-+++ mpeglib/configure.in.in	Wed Oct 24 11:58:58 2007
++++ mpeglib/configure.in.in	Sun Dec 28 13:40:17 2008
 @@ -164,6 +164,9 @@ case "$OS_TYPE" in
    NetBSD)
      kde_mpeglib_compiles=yes
@@ -10,23 +10,16 @@
    Linux)
      kde_mpeglib_compiles=yes
      ;;
-@@ -194,6 +197,12 @@ case "$OS_TYPE" in
+@@ -192,6 +195,12 @@ case "$OS_TYPE" in
-     AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
-     ;;
  
+   Linux)
+     AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])
++    ;;
++
 +  OpenBSD)
 +    OS_TYPE="BSD"
 +    AC_CHECK_LIB(c_r, pthread_create, [LIBPTHREAD="-pthread"])
 +    AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
-+    ;;
+     ;;
-+
-   FreeBSD | DragonFly)
-     OS_TYPE="BSD"
-     AC_DEFINE(OS_BSD,1,[Define if you have BSD pthread])
-@@ -237,5 +246,5 @@ KDE_MPEGLIB_COMPILES
  
- THIS_LIB_LIBS="-lX11 -lXext -lm ${XVLIBS} ${DGALIBS} "
+   FreeBSD | DragonFly)
- THIS_LIB_LIBS="${THIS_LIB_LIBS} ${XVIDMODELIBS} ${SDLLIB} ${CDDALIBS} "
--THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD}"
-+THIS_LIB_LIBS="${THIS_LIB_LIBS} ${OGG_VORBISLIBS} ${LIBPTHREAD} ${LIBOSSAUDIO}"
- AC_SUBST(THIS_LIB_LIBS)

x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_Linux_cpp

@@ -1,32 +0,0 @@
-$OpenBSD: patch-mpeglib_lib_util_audio_audioIO_Linux_cpp,v 1.3 2003/01/27 19:53:58 espie Exp $
---- mpeglib/lib/util/audio/audioIO_Linux.cpp.orig	Sun Oct 27 00:20:37 2002
-+++ mpeglib/lib/util/audio/audioIO_Linux.cpp	Fri Jan  3 14:41:49 2003
-@@ -30,6 +30,9 @@
- #elif defined(HAVE_MACHINE_SOUNDCARD_H) 
- 	#undef AUSIZ
- 	#include <machine/soundcard.h>
-+#elif defined(HAVE_SOUNDCARD_H)
-+	#undef AUSIZ
-+	#include <soundcard.h>
- #elif defined(__NetBSD__)
- 	#undef AUSIZ
- 	#include <soundcard.h>
-@@ -37,6 +40,9 @@
- 	// fallback:
- 	#include <linux/soundcard.h>
- #endif
-+#ifdef __OpenBSD__
-+#define AUDIO_DEVICE_NAME "/dev/audio"
-+#endif
- 
- 
- /* optimal fragment size */
-@@ -68,7 +74,7 @@ void audioDestruct() {
-    should open the audio device, perform any special initialization	
- */
- int  audioOpen() {
--  audio_fd = open ("/dev/dsp", O_WRONLY, 0);
-+  audio_fd = open (AUDIO_DEVICE_NAME, O_WRONLY, 0);
-   if (audio_fd < 0)  {
-     perror("Unable to open the audio");
-   }

x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp

@@ -0,0 +1,25 @@
+$OpenBSD: patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
+--- mpeglib/lib/util/audio/audioIO_SunOS.cpp.orig	Sun Dec 28 14:56:16 2008
++++ mpeglib/lib/util/audio/audioIO_SunOS.cpp	Sun Dec 28 14:59:46 2008
+@@ -8,10 +8,11 @@
+  */
+ 
+ #include <sys/types.h>
+-#include <sys/stropts.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <sys/ioctl.h>
+ #include <sys/audioio.h>
+ #include "audioIO.h"
+ #include <iostream.h>
+@@ -128,7 +129,7 @@ void mixerSetVolume(int leftVolume,int rightVolume) {
+   //someone should fix the volume on solaris
+   balance=0;
+   
+-  auinfo.play.balance=(uchar_t)balance;
++  auinfo.play.balance=(unsigned char)balance;
+   if (ioctl(audio_fd,AUDIO_SETINFO,&auinfo)<0)
+     perror("Unable to set sound volume");
+ }

x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_cpp

@@ -0,0 +1,15 @@
+$OpenBSD: patch-mpeglib_lib_util_audio_audioIO_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
+--- mpeglib/lib/util/audio/audioIO.cpp.orig	Sun Dec 28 13:31:48 2008
++++ mpeglib/lib/util/audio/audioIO.cpp	Sun Dec 28 13:32:36 2008
+@@ -26,7 +26,11 @@
+ #endif
+ 
+ #ifdef OS_BSD
++#ifdef __OpenBSD__
++  #include "audioIO_SunOS.cpp"
++#else
+   #include "audioIO_Linux.cpp"
++#endif
+ #endif
+ 
+ #if defined(OS_IRIX) || defined(OS_IRIX64)