diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-12 13:19:41 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-12 13:19:41 +0800 |
| commit | edc794b85d054027d9e759d4631c1b7243007850 (patch) | |
| tree | df804f26e80ff4bb3ed4b197737dc09cf6572c8b /audio | |
| parent | 4372089ff91c3a884f6845d07f2ac8a7f2e64429 (diff) | |
| download | marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar.gz marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar.bz2 marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar.lz marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar.xz marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.tar.zst marcuscom-ports-edc794b85d054027d9e759d4631c1b7243007850.zip | |
Fix the patch so that the result actually compiles.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3923 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 19 | ||||
| -rw-r--r-- | audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c | 19 |
2 files changed, 26 insertions, 12 deletions
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c index d2d5df9ad..4942519dd 100644 --- a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -1,14 +1,13 @@ --- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 -+++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:10:19 2005 -@@ -1443,15 +1443,19 @@ ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ return FALSE; } -+#if defined(__FreeBSD__) ++#if !defined(__FreeBSD__) + /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM -+ * device. */ -+ return TRUE; -+#endif ++ * device. ++ */ + fd = open (device, O_RDONLY | O_NONBLOCK); if (fd < 0) { @@ -23,3 +22,11 @@ if (ioctl (fd, CDIOCGETVOL, 0) < 0) { #else if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c index d2d5df9ad..4942519dd 100644 --- a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c +++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -1,14 +1,13 @@ --- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 -+++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:10:19 2005 -@@ -1443,15 +1443,19 @@ ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ return FALSE; } -+#if defined(__FreeBSD__) ++#if !defined(__FreeBSD__) + /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM -+ * device. */ -+ return TRUE; -+#endif ++ * device. ++ */ + fd = open (device, O_RDONLY | O_NONBLOCK); if (fd < 0) { @@ -23,3 +22,11 @@ if (ioctl (fd, CDIOCGETVOL, 0) < 0) { #else if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } |