diff options
Diffstat (limited to 'audio/gnome-media/files')
-rw-r--r-- | audio/gnome-media/files/patch-cddb-slave2_gnet-private.h | 11 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-cddb-slave2_tcp.c | 20 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c | 30 |
3 files changed, 61 insertions, 0 deletions
diff --git a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h b/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h new file mode 100644 index 000000000..1ec1fc50f --- /dev/null +++ b/audio/gnome-media/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/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c new file mode 100644 index 000000000..f316b7f01 --- /dev/null +++ b/audio/gnome-media/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/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c new file mode 100644 index 000000000..3871826c5 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c @@ -0,0 +1,30 @@ +--- gnome-cd/gst-cdrom.c.orig Tue Dec 19 20:44:39 2006 ++++ gnome-cd/gst-cdrom.c Wed Dec 20 00:48:26 2006 +@@ -44,13 +44,17 @@ + #endif + + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +-# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY ++# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL ++struct ioc_vol vol_value; ++# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR &vol_value + # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT + #elif defined(__NetBSD__) || defined(__OpenBSD__) + # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCGETVOL ++# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0 + # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT + #else + # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDROM_GET_CAPABILITY ++# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR 0 + # define GST_CDROM_IOCTL_EJECT_REQUEST CDROMEJECT + #endif + +@@ -187,7 +191,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * + + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd >= 0) { +- if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) { ++ if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) { + res = TRUE; + } else { + GST_DEBUG ("ioctl() failed: %s", g_strerror (errno)); |