Move mplayer-share to the multimedia category (coming from graphics).

This is version 1.0rc3.

4 files changed, 127 insertions, 0 deletions

diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
new file mode 100644
index 00000000000..0e25c94f57a
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
+
+--- configure.orig	2003-12-08 22:33:31.000000000 +0100
++++ configure
+@@ -367,8 +367,8 @@ for ac_option do
+     _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
+     ;;
+   --with-extralibdir=*)
+-    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+-#    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
++#    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
++    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+     ;;
+   --enable-runtime-cpudetection)
+     _runtime_cpudetection=yes
+@@ -431,7 +431,7 @@ if test -z "$_target" ; then
+       case "`( uname -m ) 2>&1`" in
+       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
+       ia64) host_arch=ia64 ;;
+-      x86_64) host_arch=x86_64 ;;
++      x86_64|amd64) host_arch=x86_64 ;;
+       ppc) host_arch=ppc ;;
+       alpha) host_arch=alpha ;;
+       sparc*) host_arch=sparc ;;
+@@ -499,7 +499,7 @@ if test "$_skip_cc_check" != yes ; then
+  for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
+   echocheck "$_cc version"
+   cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
+-  cc_version=`( $_cc -dumpversion ) 2>&1`
++  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
+   if test "$?" -gt 0; then
+     cc_version="not found"
+   fi
+@@ -819,7 +819,7 @@ EOF
+     _optimizing=''
+     ;;
+ 
+-  x86_64)
++  x86_64|amd64)
+     _def_arch='#define ARCH_X86_64 1'
+     _target_arch='TARGET_ARCH_X86_64 = yes'
+     iproc='x86_64'
diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
new file mode 100644
index 00000000000..356de5452e1
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
+
+--- loader/win32.c.orig	2003-09-06 00:08:23.000000000 +0200
++++ loader/win32.c	2004-01-24 15:39:14.000000000 +0100
+@@ -1374,8 +1374,11 @@
+ 	printf("Win32 Warning: Leaving uninitialized Critical Section %p!!\n", c);
+ 	return;
+     }
+-    cs->locked=0;
+-    pthread_mutex_unlock(&(cs->mutex));
++    if (cs->locked)
++    {
++	cs->locked=0;
++	pthread_mutex_unlock(&(cs->mutex));
++    }
+     return;
+ }
+ 
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
new file mode 100644
index 00000000000..9ffcf07c320
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
+
+--- mp_msg.c.orig	2003-09-12 17:46:16.000000000 +0200
++++ mp_msg.c
+@@ -34,6 +34,7 @@ void mp_msg_init(){
+ #ifdef MP_DEBUG
+     fprintf(stdout, "Using GNU internationalization\n");
+     fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
++#if 0
+     fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
+ #endif
+     setlocale(LC_ALL, ""); /* set from the environment variables */
+@@ -41,9 +42,12 @@ void mp_msg_init(){
+     textdomain("mplayer");
+ #ifdef MP_DEBUG
+     fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
++#if 0
+     fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL));
+ #endif
+ #endif
++#endif
++#endif
+     mp_msg_set_level(MSGL_STATUS);
+ }
+ 
diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
new file mode 100644
index 00000000000..c7f2352ea2a
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -0,0 +1,42 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
+
+--- libmpdemux/tvi_bsdbt848.c.orig	Sat Oct  4 19:29:01 2003
++++ libmpdemux/tvi_bsdbt848.c
+@@ -41,6 +41,7 @@
+ 
+ #ifdef __NetBSD__
+ #include <dev/ic/bt8xx.h>
++#include <sys/audioio.h>
+ #else
+ #include <machine/ioctl_meteor.h>
+ #include <machine/ioctl_bt848.h>
+@@ -785,14 +786,29 @@ return(priv->dspbytesread * 1.0 / priv->
+ static int get_audio_framesize(priv_t *priv)
+ {
+ int bytesavail;
++#ifdef __NetBSD__
++struct audio_info auinf;
++#endif
+ 
+ if(priv->dspready == FALSE) return 0;
+ 
++#ifdef __NetBSD__
++if(ioctl(priv->dspfd, AUDIO_GETINFO, &auinf) < 0)
++    {
++    perror("AUDIO_GETINFO");
++    return(TVI_CONTROL_FALSE);
++    }
++else
++    {
++    bytesavail = auinf.record.seek; /* * priv->dspsamplesize; */
++    }
++#else
+ if(ioctl(priv->dspfd, FIONREAD, &bytesavail) < 0) 
+     {
+     perror("FIONREAD");
+     return(TVI_CONTROL_FALSE);
+     }
++#endif
+ 
+ /* When mencoder wants audio data, it wants data..
+    it won't go do anything else until it gets it :( */