Add and update 2.11.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4047 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 91 insertions, 0 deletions

diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h b/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h
new file mode 100644
index 000000000..1ec1fc50f
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_gnet-private.h
@@ -0,0 +1,11 @@
+--- cddb-slave2/gnet-private.h.orig	Tue Aug 31 19:58:18 2004
++++ cddb-slave2/gnet-private.h	Tue Aug 31 20:02:23 2004
+@@ -68,7 +68,7 @@
+ #include <resolv.h>
+ #include <netdb.h>
+ 
+-#ifndef __socklen_t_defined
++#if !defined(__socklen_t_defined) && !defined(__FreeBSD__)
+ typedef guint32 socklen_t;
+ #endif
+ 
diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
new file mode 100644
index 000000000..f316b7f01
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c
@@ -0,0 +1,20 @@
+--- cddb-slave2/tcp.c.orig	Mon Sep 20 14:52:50 2004
++++ cddb-slave2/tcp.c	Sat Mar 12 03:30:52 2005
+@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd
+ 		continue;
+ 
+ 	      sa_in6->sin6_scope_id = ifindex;
+-	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa));
++	      con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6));
+ 	      if (con == 0 || errno == EINPROGRESS)
+ 				break;
+ 
+@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd
+       memcpy(&sa, &addr->sa, sizeof(sa));
+       sa_in = (struct sockaddr_in *) &sa;
+       sa_in->sin_family = AF_INET;
+-      con = connect(s->sockfd, &sa, sizeof(s->sa));
++      con = connect(s->sockfd, &sa, sizeof(sa));
+     }
+ 
+   /* Connect (but non-blocking!) */
diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure
new file mode 100644
index 000000000..e2224d930
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Jun  1 17:42:05 2004
++++ configure	Tue Jun  1 18:38:15 2004
+@@ -24584,7 +24584,7 @@
+ *FreeBSD*)
+ 	CDROM_HOST=bsd
+ 	CDROM_HOST_BSD=true
+-	default_cd_device="/dev/acd0c"
++	default_cd_device="/dev/%%CDROM%%"
+ 	;;
+ *NetBSD*)
+ 	CDROM_HOST=bsd
diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
new file mode 100644
index 000000000..8d49db7bc
--- /dev/null
+++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c
@@ -0,0 +1,49 @@
+--- gnome-cd/gst-cdparanoia-cdrom.c.orig	Mon Apr  4 16:25:49 2005
++++ gnome-cd/gst-cdparanoia-cdrom.c	Mon Apr  4 16:26:14 2005
+@@ -1224,6 +1224,16 @@
+ 		*status = NULL;
+ 		return FALSE;
+ 	}
++#else
++	if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) {
++		realstatus->cd = GNOME_CDROM_STATUS_NO_DISC;
++		realstatus->audio = GNOME_CDROM_AUDIO_NOTHING;
++		realstatus->track = -1;
++
++		gst_cdparanoia_cdrom_close (lcd);
++		return TRUE;
++	}
++	realstatus->cd = GNOME_CDROM_STATUS_OK;
+ #endif
+ 
+ 	gst_cdparanoia_cdrom_close (lcd);
+@@ -1421,15 +1431,18 @@
+ 		return FALSE;
+ 	}
+ 
++#if !defined(__FreeBSD__)
++	/* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM
++	 * device.
++	 */
++
+ 	fd = open (device, O_RDONLY | O_NONBLOCK);
+ 	if (fd < 0) {
+ 		return FALSE;
+ 	}
+ 
+ 	/* Fire a harmless ioctl at the device. */
+-#if defined(__FreeBSD__)
+-	if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) {
+-#elif defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 	if (ioctl (fd, CDIOCGETVOL, 0) < 0) {
+ #else
+ 	if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) {
+@@ -1441,6 +1454,7 @@
+ 	}
+ 
+ 	close (fd);
++#endif /* __FreeBSD__ */
+ 
+ 	return TRUE;
+ }