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, 0 insertions, 61 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 deleted file mode 100644 index 1ec1fc50f..000000000 --- a/audio/gnome-media/files/patch-cddb-slave2_gnet-private.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index f316b7f01..000000000 --- a/audio/gnome-media/files/patch-cddb-slave2_tcp.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index dee1aa989..000000000 --- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c +++ /dev/null @@ -1,30 +0,0 @@ ---- gnome-cd/gst-cdrom.c.orig Mon Jan 22 09:01:38 2007 -+++ gnome-cd/gst-cdrom.c Mon Feb 12 15:59:18 2007 -@@ -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 - -@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * - #ifdef __sun - res = TRUE; - #else -- 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)); |