Allowing building on DragonFly.

3 files changed, 36 insertions, 4 deletions

diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 963dbbe0ab4..ef0ed91de0e 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2005/09/20 12:11:54 dmcmahill Exp $
+$NetBSD: distinfo,v 1.23 2005/10/10 22:51:04 joerg Exp $
 
 SHA1 (xine-lib-1.0.2.tar.gz) = fb2018b3c9405bab91c6530f60c954d4ce7ba9fe
 RMD160 (xine-lib-1.0.2.tar.gz) = 28c1d12ddde1699d1fb47453c3af5e2ffa07b9bb
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
 SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
 SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55
-SHA1 (patch-ag) = 536e98365a149624083b23cc65af8d4c2320b8d8
+SHA1 (patch-ag) = 8134c2f55e98b857acdee942be4a61914788bc10
 SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
 SHA1 (patch-ai) = f71e3cb57bf30cbf9653a469c040b6e3f717ba97
 SHA1 (patch-aj) = a213d316b5e3e486fe4c7c474a449408972db6f0
@@ -30,3 +30,4 @@ SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
 SHA1 (patch-bh) = ad36e3953ef1b91751ec6668af3135b449dade72
 SHA1 (patch-bi) = 5cec5978b248493384f7953a850b339298a3e1c0
 SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
+SHA1 (patch-cd) = a080c745d08ded46db7c1173fe55350c1eb9ff33
diff --git a/multimedia/xine-lib/patches/patch-ag b/multimedia/xine-lib/patches/patch-ag
index 5402da145e4..185568fa385 100644
--- a/multimedia/xine-lib/patches/patch-ag
+++ b/multimedia/xine-lib/patches/patch-ag
@@ -1,7 +1,16 @@
-$NetBSD: patch-ag,v 1.8 2005/05/02 11:29:35 drochner Exp $
+$NetBSD: patch-ag,v 1.9 2005/10/10 22:51:04 joerg Exp $
 
---- configure.ac.orig	2005-04-26 10:09:18.000000000 +0200
+--- configure.ac.orig	2005-04-26 08:09:18.000000000 +0000
 +++ configure.ac
+@@ -192,7 +192,7 @@ dnl threads and OS specific stuff
+ dnl ---------------------------------------------
+ 
+ case "$host" in
+-  *-*-freebsd*)
++  *-*-freebsd* | *-*-dragonfly*)
+     THREAD_LIBS="-L/usr/local/lib -pthread"
+     THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
+ 
 @@ -402,6 +402,9 @@ AC_CHECK_LIB(socket, socket, NET_LIBS="-
  AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
  AC_SUBST(NET_LIBS)
@@ -92,3 +101,12 @@ $NetBSD: patch-ag,v 1.8 2005/05/02 11:29:35 drochner Exp $
  AC_SUBST(GNOME_VFS_CFLAGS)
  AC_SUBST(GNOME_VFS_LIBS)
  if test x"$no_gnome_vfs" != "xyes"; then
+@@ -1452,7 +1465,7 @@ int has_timeout=sizeof(test.timeout);],
+      	    AC_DEFINE([HAVE_WIN32_CDROM], [1], 
+                       [Define 1 if you have MinGW CD-ROM support])
+ 	 ;;
+-         freebsd4.*)
++         freebsd4.* | dragonfly*)
+      	    AC_DEFINE([HAVE_FREEBSD_CDROM], [1], 
+                       [Define 1 if you have FreeBSD CD-ROM support])
+ 	 ;;
diff --git a/multimedia/xine-lib/patches/patch-cd b/multimedia/xine-lib/patches/patch-cd
new file mode 100644
index 00000000000..574c1b183fe
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-cd
@@ -0,0 +1,13 @@
+$NetBSD: patch-cd,v 1.1 2005/10/10 22:51:04 joerg Exp $
+
+--- src/video_out/libdha/sysdep/pci_freebsd.c.orig	2005-07-10 21:02:09.000000000 +0000
++++ src/video_out/libdha/sysdep/pci_freebsd.c
+@@ -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