summaryrefslogtreecommitdiff
path: root/multimedia/mplayer-share/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mplayer-share/patches')
-rw-r--r--multimedia/mplayer-share/patches/patch-aa11
-rw-r--r--multimedia/mplayer-share/patches/patch-ab11
-rw-r--r--multimedia/mplayer-share/patches/patch-ae33
-rw-r--r--multimedia/mplayer-share/patches/patch-da11
-rw-r--r--multimedia/mplayer-share/patches/patch-dc11
-rw-r--r--multimedia/mplayer-share/patches/patch-dd11
-rw-r--r--multimedia/mplayer-share/patches/patch-de20
-rw-r--r--multimedia/mplayer-share/patches/patch-df11
-rw-r--r--multimedia/mplayer-share/patches/patch-dg12
-rw-r--r--multimedia/mplayer-share/patches/patch-dh21
-rw-r--r--multimedia/mplayer-share/patches/patch-di11
-rw-r--r--multimedia/mplayer-share/patches/patch-dj38
-rw-r--r--multimedia/mplayer-share/patches/patch-dk11
-rw-r--r--multimedia/mplayer-share/patches/patch-dm29
-rw-r--r--multimedia/mplayer-share/patches/patch-do13
15 files changed, 249 insertions, 5 deletions
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 3792da5f5c1..75f0629cefc 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.10 2005/05/30 12:43:30 wiz Exp $
;;
--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 --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab
index 59cc28f6df7..dec1592039b 100644
--- a/multimedia/mplayer-share/patches/patch-ab
+++ b/multimedia/mplayer-share/patches/patch-ab
@@ -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 @@ $NetBSD: patch-ab,v 1.4 2005/05/30 12:43:30 wiz Exp $
//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 --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae
index 45001887af5..6574e155ce6 100644
--- a/multimedia/mplayer-share/patches/patch-ae
+++ b/multimedia/mplayer-share/patches/patch-ae
@@ -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 --git a/multimedia/mplayer-share/patches/patch-da b/multimedia/mplayer-share/patches/patch-da
new file mode 100644
index 00000000000..f6a9f74661a
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-da
@@ -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 --git a/multimedia/mplayer-share/patches/patch-dc b/multimedia/mplayer-share/patches/patch-dc
new file mode 100644
index 00000000000..5f47172e5ba
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dc
@@ -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 --git a/multimedia/mplayer-share/patches/patch-dd b/multimedia/mplayer-share/patches/patch-dd
new file mode 100644
index 00000000000..3e3cb4fc662
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dd
@@ -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 --git a/multimedia/mplayer-share/patches/patch-de b/multimedia/mplayer-share/patches/patch-de
new file mode 100644
index 00000000000..4f4d34e07f8
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-de
@@ -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 --git a/multimedia/mplayer-share/patches/patch-df b/multimedia/mplayer-share/patches/patch-df
new file mode 100644
index 00000000000..6f712806bbf
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-df
@@ -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 --git a/multimedia/mplayer-share/patches/patch-dg b/multimedia/mplayer-share/patches/patch-dg
new file mode 100644
index 00000000000..75456ab8985
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dg
@@ -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 --git a/multimedia/mplayer-share/patches/patch-dh b/multimedia/mplayer-share/patches/patch-dh
new file mode 100644
index 00000000000..926780759b4
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dh
@@ -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 --git a/multimedia/mplayer-share/patches/patch-di b/multimedia/mplayer-share/patches/patch-di
new file mode 100644
index 00000000000..9796f3d6b65
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-di
@@ -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 --git a/multimedia/mplayer-share/patches/patch-dj b/multimedia/mplayer-share/patches/patch-dj
new file mode 100644
index 00000000000..d07b0d0e7c1
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dj
@@ -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__ */
+
+ #if defined(__svr4__)
+ {
diff --git a/multimedia/mplayer-share/patches/patch-dk b/multimedia/mplayer-share/patches/patch-dk
new file mode 100644
index 00000000000..b8fc88b1dd1
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dk
@@ -0,0 +1,11 @@
+--- loader/pe_image.c.orig 2005-05-20 20:16:31.000000000 +0200
++++ loader/pe_image.c 2005-05-20 20:16:45.000000000 +0200
+@@ -905,7 +905,7 @@
+ */
+ static void __attribute__((noinline)) extend_stack_for_dll_alloca(void)
+ {
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ volatile int* mem=alloca(0x20000);
+ *mem=0x1234;
+ #endif
diff --git a/multimedia/mplayer-share/patches/patch-dm b/multimedia/mplayer-share/patches/patch-dm
new file mode 100644
index 00000000000..9e6b6bab525
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-dm
@@ -0,0 +1,29 @@
+--- osdep/getch2.c.orig 2005-05-20 20:17:34.000000000 +0200
++++ osdep/getch2.c 2005-05-20 20:17:57.000000000 +0200
+@@ -220,7 +220,7 @@
+ struct termios tio_new;
+ #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
+ tcgetattr(0,&tio_orig);
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
+ ioctl(0,TIOCGETA,&tio_orig);
+ #else
+ ioctl(0,TCGETS,&tio_orig);
+@@ -231,7 +231,7 @@
+ tio_new.c_cc[VTIME] = 0;
+ #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
+ tcsetattr(0,TCSANOW,&tio_new);
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
+ ioctl(0,TIOCSETA,&tio_new);
+ #else
+ ioctl(0,TCSETS,&tio_new);
+@@ -245,7 +245,7 @@
+ #ifdef HAVE_TERMIOS
+ #if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GLIBC__)
+ tcsetattr(0,TCSANOW,&tio_orig);
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
+ ioctl(0,TIOCSETA,&tio_orig);
+ #else
+ ioctl(0,TCSETS,&tio_orig);
diff --git a/multimedia/mplayer-share/patches/patch-do b/multimedia/mplayer-share/patches/patch-do
new file mode 100644
index 00000000000..d738b90403b
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-do
@@ -0,0 +1,13 @@
+$NetBSD: patch-do,v 1.1 2005/05/31 19:15:11 jmmv Exp $
+
+--- libdha/sysdep/pci_freebsd.c.orig 2002-05-03 14:56:29.000000000 +0200
++++ libdha/sysdep/pci_freebsd.c 2005-05-20 21:15:13.000000000 +0200
+@@ -8,7 +8,7 @@
+ /* machine/console.h seems to be outdated by recent FreeBSD *
+ * however pcvt_ioctl.h seems to exist for very long time */
+ /* #include <machine/console.h>*/
+-#include <machine/pcvt_ioctl.h>
++#include <sys/kbio.h>
+ #ifndef GCCUSESGAS
+ #define GCCUSESGAS
+ #endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 11:53:31 +0000