diff options
| author | dholland <dholland> | 2011-09-04 23:10:30 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-09-04 23:10:30 +0000 |
| commit | 3fb66200691c3e8916383faea083569676c4794c (patch) | |
| tree | 0c2c6a3417c788876ef1e38f0e9b007f0163c1c1 | |
| parent | 62cbb0e5a4aad2de55d2c0d1ad521f59556c8482 (diff) | |
| download | pkgsrc-3fb66200691c3e8916383faea083569676c4794c.tar.gz | |
- Adjust cdrom access logic so all the BSDs go to the BSD cdrom code,
not just FreeBSD and OpenBSD.
- Update NOT_FOR_PLATFORM: the only BSD for which the cdrom code can
actually work is DragonFly. The others are missing ioctls it uses.
This could probably be fixed up readily by someone who knows how cdrom
access is supposed to work, if any such person cares.
- Allow clang until proven otherwise.
| -rw-r--r-- | audio/xmms-cdread/Makefile | 12 | ||||
| -rw-r--r-- | audio/xmms-cdread/distinfo | 4 | ||||
| -rw-r--r-- | audio/xmms-cdread/patches/patch-ab | 16 |
3 files changed, 25 insertions, 7 deletions
diff --git a/audio/xmms-cdread/Makefile b/audio/xmms-cdread/Makefile index 8133dcf9032..ddffa5b777e 100644 --- a/audio/xmms-cdread/Makefile +++ b/audio/xmms-cdread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/04/22 13:43:01 obache Exp $ +# $NetBSD: Makefile,v 1.3 2011/09/04 23:10:30 dholland Exp $ # DISTNAME= xmms-cdread-0.14a @@ -12,8 +12,14 @@ COMMENT= XMMS input plugin that reads audio data from CDs PKG_DESTDIR_SUPPORT= user-destdir -NOT_FOR_PLATFORM= Interix-*-* NetBSD-*-* -ONLY_FOR_COMPILER= gcc +# no cdrom access code +NOT_FOR_PLATFORM= Interix-*-* + +# The BSD cdrom access code ostensibly for FreeBSD requires: +# - CDIOREADTOCENTRY ioctl, which NetBSD and OpenBSD don't have +# - CDIOCREADAUDIO ioctl, which only Dragonfly has +NOT_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* +ONLY_FOR_COMPILER= gcc clang GNU_CONFIGURE= yes USE_LIBTOOL= yes diff --git a/audio/xmms-cdread/distinfo b/audio/xmms-cdread/distinfo index 813e273e0ba..0b77e370868 100644 --- a/audio/xmms-cdread/distinfo +++ b/audio/xmms-cdread/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $ +$NetBSD: distinfo,v 1.2 2011/09/04 23:10:30 dholland Exp $ SHA1 (xmms-cdread-0.14a.tar.gz) = b0408433618f1f237cd2a42999a2a67642d4a778 RMD160 (xmms-cdread-0.14a.tar.gz) = bcea65cf1919071d8036d1219979376d6632ae09 Size (xmms-cdread-0.14a.tar.gz) = 153811 bytes SHA1 (patch-aa) = 623e9df7f7eb4aef6c5b2ef7445575081067a199 -SHA1 (patch-ab) = 70a1c4f7565a55fdbc7154481cd6fb03cb68b864 +SHA1 (patch-ab) = a5b9b4e670f6d40f0ddd97dff74a033069584cb7 diff --git a/audio/xmms-cdread/patches/patch-ab b/audio/xmms-cdread/patches/patch-ab index 7ca298e2f4a..af727248ee2 100644 --- a/audio/xmms-cdread/patches/patch-ab +++ b/audio/xmms-cdread/patches/patch-ab @@ -1,7 +1,19 @@ -$NetBSD: patch-ab,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2011/09/04 23:10:30 dholland Exp $ ---- cdread.c.orig 2001-08-18 14:29:43.000000000 +0300 +- support more OSes +- avoid gross linker abuse + +--- cdread.c.orig 2001-08-18 11:29:43.000000000 +0000 +++ cdread.c +@@ -57,7 +57,7 @@ struct cd_cfg cd_cfg; + #endif + + /*\ Neat.. Three OSes with three different ways of talking to CDROM drives.. \*/ +-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)) ++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) + #include "cdrombsd.h" + #elif defined(__SOLARIS__) || defined(__Solaris__) || defined(__solaris__) || defined(__sun__) || defined(sun) + #include "cdromsolaris.h" @@ -377,7 +377,7 @@ init_thread(gchar *device) } |