diff options
| author | xtraeme <xtraeme> | 2004-04-23 15:28:13 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-04-23 15:28:13 +0000 |
| commit | e1296b66889878fc9f005c1ae211d7f9770edcd6 (patch) | |
| tree | fd17aa0d0890123142d9716a4705358c903e7866 /audio/xmms | |
| parent | fb1e8f6a18ebce88839bb6851bcbd9093ddf7131 (diff) | |
| download | pkgsrc-e1296b66889878fc9f005c1ae211d7f9770edcd6.tar.gz | |
Make this build in NetBSD -current (statfs->statvfs).
Diffstat (limited to 'audio/xmms')
| -rw-r--r-- | audio/xmms/distinfo | 4 | ||||
| -rw-r--r-- | audio/xmms/patches/patch-aa | 30 |
2 files changed, 23 insertions, 11 deletions
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo index 5b10e99f8d6..e5447359352 100644 --- a/audio/xmms/distinfo +++ b/audio/xmms/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2003/10/05 10:56:37 xtraeme Exp $ +$NetBSD: distinfo,v 1.16 2004/04/23 15:28:13 xtraeme Exp $ SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68 Size (xmms-1.2.7.tar.gz) = 2860908 bytes -SHA1 (patch-aa) = b1945d9d161cc538e5dda1014571f582be1a951c +SHA1 (patch-aa) = 06743383b9167082ca7596c12e751aaa1a3f36b6 SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250 SHA1 (patch-ac) = 4c3dc43fd83bacfacd376235d3723aeee96570f2 SHA1 (patch-ad) = 7645b1a2bbb338c9bea8b2015d5763486f77d16a diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa index 4ce316e457f..da61e84483d 100644 --- a/audio/xmms/patches/patch-aa +++ b/audio/xmms/patches/patch-aa @@ -1,8 +1,20 @@ -$NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2004/04/23 15:28:13 xtraeme Exp $ ---- Input/cdaudio/cdaudio.c.orig Tue Feb 5 15:39:11 2002 -+++ Input/cdaudio/cdaudio.c Thu Mar 21 19:08:26 2002 -@@ -398,7 +398,7 @@ +--- Input/cdaudio/cdaudio.c.orig 2004-04-23 17:20:46.000000000 +0200 ++++ Input/cdaudio/cdaudio.c 2004-04-23 17:23:52.000000000 +0200 +@@ -214,7 +214,11 @@ + FILE *mounts; + struct mntent *mnt; + #elif defined(HAVE_GETMNTINFO) ++#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */ ++ struct statvfs *fsp; ++#else + struct statfs *fsp; ++#endif + int entries; + #endif + +@@ -398,7 +402,7 @@ if (cdda_fd < 0) return; @@ -11,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ close(cdda_fd); cdda_fd = -1; stop_timeout_id = gtk_timeout_add(STOP_DELAY * 100, stop_timeout, NULL); -@@ -409,11 +409,11 @@ +@@ -409,11 +413,11 @@ if (p) { pause_time = get_time(); @@ -25,7 +37,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ pause_time = -1; } is_paused = p; -@@ -554,9 +554,11 @@ +@@ -554,9 +558,11 @@ struct cd_sub_channel_info subinfo; subchnl.address_format = CD_MSF_FORMAT; subchnl.data_format = CD_CURRENT_POSITION; @@ -38,7 +50,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ return(LBA(subchnl.data->what.position.absaddr.msf)); } -@@ -591,6 +593,7 @@ +@@ -591,6 +597,7 @@ { struct ioc_toc_header tochdr; struct ioc_read_toc_entry tocentry; @@ -46,7 +58,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ int i; if (ioctl(fd, CDIOREADTOCHEADER, &tochdr)) -@@ -601,6 +604,8 @@ +@@ -601,6 +608,8 @@ tocentry.address_format = CD_MSF_FORMAT; tocentry.starting_track = i; @@ -55,7 +67,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/21 18:52:31 drochner Exp $ if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry)) return FALSE; info->track[i].minute = -@@ -617,6 +622,8 @@ +@@ -617,6 +626,8 @@ tocentry.address_format = CD_MSF_FORMAT; tocentry.starting_track = 0xAA; |