[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Apply a set of fixes to impro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2643cc2b65ad
branches:  trunk
changeset: 494898:2643cc2b65ad
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue May 31 19:15:11 2005 +0000

description:
Apply a set of fixes to improve support of other OSes (specially DragonFly).
All these changes are already in mplayer's repository.
Patches provided by Joerg Sonnenberger in private mail.

diffstat:

 multimedia/mplayer-share/distinfo         |  20 +++++++++++++---
 multimedia/mplayer-share/patches/patch-aa |  11 ++++++++-
 multimedia/mplayer-share/patches/patch-ab |  11 ++++++++-
 multimedia/mplayer-share/patches/patch-ae |  33 ++++++++++++++++++++++++--
 multimedia/mplayer-share/patches/patch-da |  11 ++++++++
 multimedia/mplayer-share/patches/patch-dc |  11 ++++++++
 multimedia/mplayer-share/patches/patch-dd |  11 ++++++++
 multimedia/mplayer-share/patches/patch-de |  20 ++++++++++++++++
 multimedia/mplayer-share/patches/patch-df |  11 ++++++++
 multimedia/mplayer-share/patches/patch-dg |  12 +++++++++
 multimedia/mplayer-share/patches/patch-dh |  21 +++++++++++++++++
 multimedia/mplayer-share/patches/patch-di |  11 ++++++++
 multimedia/mplayer-share/patches/patch-dj |  38 +++++++++++++++++++++++++++++++
 multimedia/mplayer-share/patches/patch-dk |  11 ++++++++
 multimedia/mplayer-share/patches/patch-dm |  29 +++++++++++++++++++++++
 multimedia/mplayer-share/patches/patch-do |  13 ++++++++++
 16 files changed, 265 insertions(+), 9 deletions(-)

diffs (truncated from 367 to 300 lines):

diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Tue May 31 19:05:17 2005 +0000
+++ b/multimedia/mplayer-share/distinfo Tue May 31 19:15:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/05/30 12:44:09 wiz Exp $
+$NetBSD: distinfo,v 1.21 2005/05/31 19:15:11 jmmv Exp $
 
 SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
 RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
@@ -12,9 +12,21 @@
 SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
 RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
 Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = 39fb120fb93c3d5cbbbce74b8680a235cfe93fa0
-SHA1 (patch-ab) = 022cf7b043c7b3e4e76efd5891b0035bfa216ade
+SHA1 (patch-aa) = 7e4eaab0042979c44271c361d00e1c05a04c93bc
+SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
 SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
 SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
-SHA1 (patch-ae) = 1acef0fca1362c32dd5467d2d3e06e8446b4850c
+SHA1 (patch-ae) = 601808d8c89cba68156fb3c95fe9fcfb8da4fca0
 SHA1 (patch-af) = 6eab8572b239f6ac7afc03ad6254a7c97f90663e
+SHA1 (patch-da) = be092da4f854708c1ef47f10c26e361c095a6799
+SHA1 (patch-dc) = b11ef06a89f13e2ae5e013d569aa5acc99c770aa
+SHA1 (patch-dd) = e5b23b73a1e53e3185ecbac26042432395cd5e63
+SHA1 (patch-de) = 923814d978a3ed2b00494cf7f7fd17acd72aa610
+SHA1 (patch-df) = 0a85d1d8fbbbc1a86436e7364b72619a9a32e2d7
+SHA1 (patch-dg) = 1633dfd61c83796ce148ede22bafbe01f67d2bd4
+SHA1 (patch-dh) = 639638d871af2462945d8c5e454cae291a15e939
+SHA1 (patch-di) = 5b4c7d96537882422fb648181a93ec9ba9e13c7e
+SHA1 (patch-dj) = e72e08dda9f3eb97bf5e63751bf18999f1689434
+SHA1 (patch-dk) = 744911451794b554f9754b4cd77cf24520ed0f8e
+SHA1 (patch-dm) = b57da36cce0b896b51ca1ff2eef3c58ed95e2b68
+SHA1 (patch-do) = dbd4705c81ee4e6fa7cefc93dc187733a739d710
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-aa
--- a/multimedia/mplayer-share/patches/patch-aa Tue May 31 19:05:17 2005 +0000
+++ b/multimedia/mplayer-share/patches/patch-aa Tue May 31 19:15:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2005/05/30 12:43:30 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2005/05/31 19:15:11 jmmv Exp $
 
 --- configure.orig     2005-04-13 13:46:35.000000000 +0200
 +++ configure
@@ -39,3 +39,12 @@
      ;;
    --with-dxr2incdir=*)
      _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
+@@ -2382,7 +2383,7 @@
+ echocheck "lrintf"
+ cat > $TMPC << EOF
+ #include <math.h>
+-int main(void) { (void) lrintf(0.0); return 0; }
++int main(void) { long (*foo)(double); foo = lrintf; (void)(*foo)(0.0); return 0; }
+ EOF
+ _lrintf=no
+ cc_check $_ld_lm && _lrintf=yes
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-ab
--- a/multimedia/mplayer-share/patches/patch-ab Tue May 31 19:05:17 2005 +0000
+++ b/multimedia/mplayer-share/patches/patch-ab Tue May 31 19:15:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2005/05/30 12:43:30 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2005/05/31 19:15:11 jmmv Exp $
 
 --- loader/win32.c.orig        2005-04-15 22:17:12.000000000 +0200
 +++ loader/win32.c
@@ -14,3 +14,12 @@
  
      //if (alccnt < 40000) printf("MY_RELEASE: %p\t%ld    (%d)\n", header, header->size, alccnt);
  #else
+@@ -993,7 +995,7 @@
+ 
+ /* disable cpuid based detection (mplayer's cpudetect.c does this - see above) */
+ #ifndef MPLAYER
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__svr4__) || defined(__DragonFly__)
+     do_cpuid(1, regs);
+     switch ((regs[0] >> 8) & 0xf) {                   // cpu family
+     case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-ae
--- a/multimedia/mplayer-share/patches/patch-ae Tue May 31 19:05:17 2005 +0000
+++ b/multimedia/mplayer-share/patches/patch-ae Tue May 31 19:15:11 2005 +0000
@@ -1,8 +1,35 @@
-$NetBSD: patch-ae,v 1.4 2005/05/30 12:43:30 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2005/05/31 19:15:11 jmmv Exp $
 
 --- cpudetect.c.orig   2005-01-12 22:56:25.000000000 +0100
-+++ cpudetect.c
-@@ -334,6 +334,10 @@ static void check_os_katmai_support( voi
++++ cpudetect.c        2005-05-20 20:00:44.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <machine/cpu.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+@@ -169,7 +169,7 @@
+ #endif
+ 
+               /* FIXME: Does SSE2 need more OS support, too? */
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__OpenBSD__) || defined(__DragonFly__)
+               if (caps->hasSSE)
+                       check_os_katmai_support();
+               if (!caps->hasSSE)
+@@ -324,7 +324,7 @@
+ #ifdef ARCH_X86_64
+    gCpuCaps.hasSSE=1;
+    gCpuCaps.hasSSE2=1;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+    int has_sse=0, ret;
+    size_t len=sizeof(has_sse);
+ 
+@@ -334,6 +334,10 @@
  
  #elif defined(__NetBSD__) || defined (__OpenBSD__)
  #if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__)
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-da
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-da Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,11 @@
+--- libdha/pci.c.orig  2005-05-20 20:00:58.000000000 +0200
++++ libdha/pci.c       2005-05-20 20:01:07.000000000 +0200
+@@ -62,7 +62,7 @@
+ /* OS depended stuff */
+ #if defined (linux)
+ #include "sysdep/pci_linux.c"
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined(__DragonFly__)
+ #include "sysdep/pci_freebsd.c"
+ #elif defined (__386BSD__)
+ #include "sysdep/pci_386bsd.c"
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-dc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-dc Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,11 @@
+--- libmpcodecs/ad_realaud.c.orig      2005-05-20 20:01:46.000000000 +0200
++++ libmpcodecs/ad_realaud.c   2005-05-20 20:01:52.000000000 +0200
+@@ -35,7 +35,7 @@
+       free(ize);
+ }
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ void *__ctype_b=NULL;
+ #endif
+ 
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-dd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-dd Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,11 @@
+--- libmpcodecs/vd_realvid.c.orig      2005-05-20 20:04:14.000000000 +0200
++++ libmpcodecs/vd_realvid.c   2005-05-20 20:04:24.000000000 +0200
+@@ -79,7 +79,7 @@
+ //    exit(1);
+ }
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ void ___brk_addr(void) {exit(0);}
+ char **__environ={NULL};
+ #undef stderr
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-de
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-de Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,20 @@
+--- libmpdemux/cddb.c.orig     2005-05-20 20:04:55.000000000 +0200
++++ libmpdemux/cddb.c  2005-05-20 20:05:16.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ #if defined(__linux__)
+       #include <linux/cdrom.h>
+-#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+       #include <sys/cdio.h>
+ #endif
+ 
+@@ -82,7 +82,7 @@
+       return tochdr.cdth_trk1;
+ }
+ 
+-#elif defined(__FreeBSD__) || defined(__bsdi__)
++#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ int 
+ read_toc(const char *dev) {
+       int drive;
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-df
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-df Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,11 @@
+--- libmpdemux/stream_vcd.c.orig       2005-05-20 20:10:45.000000000 +0200
++++ libmpdemux/stream_vcd.c    2005-05-20 20:10:59.000000000 +0200
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/cdrio.h>
+ #include "vcd_read_fbsd.h" 
+ #elif defined(__NetBSD__) || defined (__OpenBSD__)
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-dg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-dg Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,12 @@
+--- libmpdemux/tvi_bsdbt848.c.orig     2005-05-20 20:11:15.000000000 +0200
++++ libmpdemux/tvi_bsdbt848.c  2005-05-20 20:11:56.000000000 +0200
+@@ -43,6 +43,9 @@
+ #ifdef __NetBSD__
+ #include <dev/ic/bt8xx.h>
+ #include <sys/audioio.h>
++#elif defined(__DragonFly__)
++#include <dev/video/meteor/ioctl_meteor.h>
++#include <dev/video/bktr/ioctl_bt848.h>
+ #elif __FreeBSD_version >= 502100
+ #include <dev/bktr/ioctl_meteor.h>
+ #include <dev/bktr/ioctl_bt848.h>
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-dh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-dh Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,21 @@
+--- libmpdvdkit2/bswap.h.orig  2005-05-20 20:12:12.000000000 +0200
++++ libmpdvdkit2/bswap.h       2005-05-20 20:13:32.000000000 +0200
+@@ -88,12 +88,17 @@
+ }
+ #define B2N_64(x) x = bswap_64(x)
+ 
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
++#define B2N_16(x) x = be16toh(x)
++#define B2N_32(x) x = be32toh(x)
++#define B2N_64(x) x = be64toh(x)
++
+ /* This is a slow but portable implementation, it has multiple evaluation 
+  * problems so beware.
+  * FreeBSD and Solaris don't have <byteswap.h> or any other such 
+  * functionality! 
+  */
+-
+ #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(__CYGWIN__)
+ #define B2N_16(x) \
+  x = ((((x) & 0xff00) >> 8) | \
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-di
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-di Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,11 @@
+--- libmpdvdkit2/dvd_reader.c.orig     2005-05-20 20:13:48.000000000 +0200
++++ libmpdvdkit2/dvd_reader.c  2005-05-20 20:13:55.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include <limits.h>
+ #include <dirent.h>
+  
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__)
+ #define SYS_BSD 1
+ #endif
+ 
diff -r e0bf4959f10b -r 2643cc2b65ad multimedia/mplayer-share/patches/patch-dj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-dj Tue May 31 19:15:11 2005 +0000
@@ -0,0 +1,38 @@
+--- loader/ldt_keeper.c.orig   2005-05-20 20:14:38.000000000 +0200
++++ loader/ldt_keeper.c        2005-05-20 20:16:22.000000000 +0200
+@@ -50,7 +50,7 @@
+ }
+ #endif
+ #else
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #include <machine/segments.h>
+ #include <machine/sysarch.h>
+ #endif
+@@ -165,7 +165,7 @@
+ #endif
+ #endif
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ static void LDT_EntryToBytes( unsigned long *buffer, const struct modify_ldt_ldt_s *content )
+ {
+     *buffer++ = ((content->base_addr & 0x0000ffff) << 16) |
+@@ -227,7 +227,7 @@
+     }
+ #endif /*linux*/
+ 
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+     {
+         unsigned long d[2];
+ 
+@@ -246,7 +246,7 @@
+             printf("Did you reconfigure the kernel with \"options USER_LDT\"?\n");
+         }
+     }
+-#endif  /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ */
++#endif  /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ */
+