[Glibc-bsd-commits] r1386 - trunk/web/patches/upstream-only
Robert Millan
rmh at costa.debian.org
Tue Mar 21 09:04:12 UTC 2006
Author: rmh
Date: 2006-03-21 09:04:10 +0000 (Tue, 21 Mar 2006)
New Revision: 1386
Modified:
trunk/web/patches/upstream-only/cdrtools.diff
Log:
Update.
Modified: trunk/web/patches/upstream-only/cdrtools.diff
===================================================================
--- trunk/web/patches/upstream-only/cdrtools.diff 2006-03-20 23:31:41 UTC (rev 1385)
+++ trunk/web/patches/upstream-only/cdrtools.diff 2006-03-21 09:04:10 UTC (rev 1386)
@@ -1,10 +1,6 @@
-
-Author: rmh
-Status: upstream rejected/ignored it
-
-diff -Nur cdrtools-2.01.old/README.FreeBSD cdrtools-2.01/README.FreeBSD
---- cdrtools-2.01.old/README.FreeBSD 2004-05-19 16:11:07.000000000 +0200
-+++ cdrtools-2.01/README.FreeBSD 2005-08-18 13:54:42.000000000 +0200
+diff -Nur cdrtools-2.01.01.old/README.FreeBSD cdrtools-2.01.01/README.FreeBSD
+--- cdrtools-2.01.01.old/README.FreeBSD 2004-05-19 16:11:07.000000000 +0200
++++ cdrtools-2.01.01/README.FreeBSD 2006-03-21 09:57:15.000000000 +0100
@@ -1,42 +1,14 @@
-Important notice for ATAPI support on FreeBSD:
+Important notice for ATAPI support on FreeBSD and derivatives:
@@ -56,9 +52,9 @@
/*--------------------------------------------------------------------------*/
From shamrock at cypherpunks.to Mon May 3 07:35:50 1999
-diff -Nur cdrtools-2.01.old/RULES/os-gnu-kfreebsd.def cdrtools-2.01/RULES/os-gnu-kfreebsd.def
---- cdrtools-2.01.old/RULES/os-gnu-kfreebsd.def 1970-01-01 01:00:00.000000000 +0100
-+++ cdrtools-2.01/RULES/os-gnu-kfreebsd.def 2005-08-18 13:51:58.000000000 +0200
+diff -Nur cdrtools-2.01.01.old/RULES/os-gnu-kfreebsd.def cdrtools-2.01.01/RULES/os-gnu-kfreebsd.def
+--- cdrtools-2.01.01.old/RULES/os-gnu-kfreebsd.def 1970-01-01 01:00:00.000000000 +0100
++++ cdrtools-2.01.01/RULES/os-gnu-kfreebsd.def 2006-03-21 09:57:15.000000000 +0100
@@ -0,0 +1,23 @@
+#ident "@(#)os-gnu-kfreebsd.def 1.1 05/08/18 "
+###########################################################################
@@ -83,102 +79,131 @@
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+###########################################################################
+MANSTYLE= bsd
-diff -Nur cdrtools-2.01.old/cdda2wav/interface.c cdrtools-2.01/cdda2wav/interface.c
---- cdrtools-2.01.old/cdda2wav/interface.c 2004-08-05 11:57:27.000000000 +0200
-+++ cdrtools-2.01/cdda2wav/interface.c 2005-08-18 13:19:10.000000000 +0200
-@@ -439,12 +439,12 @@
+diff -Nur cdrtools-2.01.01.old/cdda2wav/interface.c cdrtools-2.01.01/cdda2wav/interface.c
+--- cdrtools-2.01.01.old/cdda2wav/interface.c 2006-02-15 01:59:53.000000000 +0100
++++ cdrtools-2.01.01/cdda2wav/interface.c 2006-03-21 09:58:50.000000000 +0100
+@@ -446,13 +446,13 @@
#endif
- #endif
break;
--#if defined (__linux__) || defined (__FreeBSD__)
-+#if defined (__linux__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
+
+-#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__)
++#if defined (__linux__) || defined (__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#if defined (__linux__)
case SCSI_CDROM_MAJOR: /* scsi cd */
default: /* for example ATAPI cds */
#else
--#if defined (__FreeBSD__)
-+#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
- case 117:
- if (!S_ISCHR(statstruct->st_mode)) {
- fprintf(stderr, "%s is not a char device\n",pdev_name);
-diff -Nur cdrtools-2.01.old/cdda2wav/ioctl.c cdrtools-2.01/cdda2wav/ioctl.c
---- cdrtools-2.01.old/cdda2wav/ioctl.c 2003-12-27 17:29:28.000000000 +0100
-+++ cdrtools-2.01/cdda2wav/ioctl.c 2005-08-18 13:19:10.000000000 +0200
-@@ -156,7 +156,7 @@
+-#if defined (__FreeBSD__) || defined(__DragonFly__)
+-#if __FreeBSD_version >= 501113
++#if defined (__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++#if __FreeBSD_version >= 501113 || defined(__FreeBSD_kernel__)
+ case 4: /* GEOM */
+ /* FALLTHROUGH */
+ #endif
+diff -Nur cdrtools-2.01.01.old/cdda2wav/ioctl.c cdrtools-2.01.01/cdda2wav/ioctl.c
+--- cdrtools-2.01.01.old/cdda2wav/ioctl.c 2006-02-15 02:30:37.000000000 +0100
++++ cdrtools-2.01.01/cdda2wav/ioctl.c 2006-03-21 10:01:15.000000000 +0100
+@@ -59,11 +59,11 @@
+ #include <cdrecord.h>
+
+ #if defined (HAVE_IOCTL_INTERFACE)
+-#if !defined(sun) && !defined(__sun) && !(defined(__FreeBSD__) && (__FreeBSD_version >= 501112))
++#if !defined(sun) && !defined(__sun) && !(defined(__FreeBSD__) && (__FreeBSD_version >= 501112)) && !defined(__FreeBSD_kernel__)
+ static struct cdrom_read_audio arg;
+ #endif
+
+-#if (defined(__FreeBSD__) && __FreeBSD_version >= 400014) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) && __FreeBSD_version >= 400014) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ static unsigned sector_size;
+ #endif
+
+@@ -76,7 +76,7 @@
+ int fAudioMode;
+ unsigned uSectorsize;
+ {
+-#if (defined(__FreeBSD__) && __FreeBSD_version >= 400014) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) && __FreeBSD_version >= 400014) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ if (scgp && scgp->verbose)
+ fprintf(stderr, "EnableCdda_cooked (CDRIOCSETBLOCKSIZE)...\n");
+
+@@ -172,7 +172,7 @@
fprintf( stderr, "can't get TocEntry #%d lba (error %d).\n", i+1, err );
exit( MEDIA_ERROR );
}
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
#endif
}
-@@ -168,7 +168,7 @@
+@@ -184,7 +184,7 @@
fprintf( stderr, "can't get TocEntry LEADOUT lba (error %d).\n", err );
exit( MEDIA_ERROR );
}
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
entry[i].cdte_addr.lba = be32_to_cpu(entry[i].cdte_addr.lba);
#endif
-@@ -196,7 +196,7 @@
+@@ -212,8 +212,8 @@
{
/* trash the cache */
--#if defined __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- static struct cdrom_read_audio arg2;
-
- arg2.address.lba = find_an_off_sector(lSector, SectorBurstVal);
-@@ -266,7 +266,7 @@
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 501112
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++#if (defined(__FreeBSD__) && __FreeBSD_version >= 501112) || defined(__FreeBSD_kernel__)
+ pread(global.cooked_fd, (void *) &p[0], 3*CD_FRAMESIZE_RAW,
+ find_an_off_sector(lSector, SectorBurstVal)*CD_FRAMESIZE_RAW);
+ #else
+@@ -287,8 +287,8 @@
static int nothing_read = 1;
/* read 2352 bytes audio data */
--#if defined __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- arg.address.lba = lSector;
- arg.addr_format = CDROM_LBA;
- arg.nframes = SectorBurstVal;
-@@ -395,7 +395,7 @@
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) && __FreeBSD_version >= 501112
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
++#if (defined(__FreeBSD__) && __FreeBSD_version >= 501112) || defined(__FreeBSD_kernel__)
+ if (x && x->verbose) {
+ fprintf(stderr, "ReadCdRom_cooked (pread)...\n");
+ }
+@@ -428,7 +428,7 @@
{
struct cdrom_subchnl sub_ch;
--#if defined __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
struct cd_sub_channel_info sub_ch_info;
if (x && x->verbose) {
-@@ -433,7 +433,7 @@
+@@ -466,7 +466,7 @@
return NULL;
}
case GET_POSITIONDATA:
--#if defined __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
sub_ch.data_format = CD_CURRENT_POSITION;
#endif
#if defined (__linux__)
-diff -Nur cdrtools-2.01.old/cdda2wav/mycdrom.h cdrtools-2.01/cdda2wav/mycdrom.h
---- cdrtools-2.01.old/cdda2wav/mycdrom.h 2002-09-04 14:07:16.000000000 +0200
-+++ cdrtools-2.01/cdda2wav/mycdrom.h 2005-08-18 13:19:11.000000000 +0200
-@@ -52,7 +52,7 @@
+diff -Nur cdrtools-2.01.01.old/cdda2wav/mycdrom.h cdrtools-2.01.01/cdda2wav/mycdrom.h
+--- cdrtools-2.01.01.old/cdda2wav/mycdrom.h 2006-02-15 00:58:24.000000000 +0100
++++ cdrtools-2.01.01/cdda2wav/mycdrom.h 2006-03-21 10:01:57.000000000 +0100
+@@ -58,7 +58,7 @@
# endif /* if 0 */
# else /* not Sun SVR4 */
--# if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__
-+# if defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __NetBSD__ || defined __OpenBSD__
- # if !defined CDIOCREADAUDIO
+-# if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __DragonFly__
++# if defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ || defined __DragonFly__ || defined __FreeBSD_kernel__
+ # if (defined(__FreeBSD__) && __FreeBSD_version < 228000) || !defined(CDIOCREADAUDIO)
# undef HAVE_IOCTL_INTERFACE
# else
-diff -Nur cdrtools-2.01.old/libscg/scsihack.c cdrtools-2.01/libscg/scsihack.c
---- cdrtools-2.01.old/libscg/scsihack.c 2003-11-28 02:33:18.000000000 +0100
-+++ cdrtools-2.01/libscg/scsihack.c 2005-08-18 13:19:11.000000000 +0200
-@@ -129,7 +129,7 @@
+diff -Nur cdrtools-2.01.01.old/libscg/scsihack.c cdrtools-2.01.01/libscg/scsihack.c
+--- cdrtools-2.01.01.old/libscg/scsihack.c 2006-01-30 11:40:18.000000000 +0100
++++ cdrtools-2.01.01/libscg/scsihack.c 2006-03-21 09:59:20.000000000 +0100
+@@ -128,7 +128,7 @@
#endif /* linux */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#define SCSI_IMPL /* We have a SCSI implementation for *BSD */
#include "scsi-bsd.c"
More information about the Glibc-bsd-commits
mailing list