summaryrefslogtreecommitdiff
path: root/audio/xmms-cdread/files/patch-cdrombsd.h
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-03-23 08:59:35 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-03-23 08:59:35 +0000
commitacb669235c2734bf5cc1ad1bdc6dda896f6b7a42 (patch)
tree39f81a9414760ae377a53edc7f5a7dcac05d6e48 /audio/xmms-cdread/files/patch-cdrombsd.h
parent- Limit built parallelism as GHC is not fully jobs-safe (diff)
Remove some expired xmms ports (abandonware, unmaintained):
2014-03-23 audio/p5-Xmms: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-a52dec: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-audiofile: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-cdread: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-crossfade: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-crystality: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-defx: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-efxmms: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-eq: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-faad: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-fc: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-fxt: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-infopipe: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-jack: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-liveice: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-mac: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-mad: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-midi: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-modplug: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-mp3cue: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-osssurround: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-quix3dn: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-sid: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-sndfile: Abandonware, please consider using multimedia/audacious instead 2014-03-23 audio/xmms-tfmx: Abandonware, please consider using multimedia/audacious instead 2014-03-23 chinese/xmms: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-blursk: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-dancingparticles: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-dflowers: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-dscope: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-dspectogram: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-dspectral: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-finespectrum: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-fishmatic: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-gdancer: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-iris: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-jess: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-nebulus: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-paranormal: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-scivi: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-vumeter: Abandonware, please consider using multimedia/audacious instead 2014-03-23 graphics/xmms-waterfall: Abandonware, please consider using multimedia/audacious instead 2014-03-23 multimedia/gxmms: Abandonware, please consider using multimedia/audacious instead 2014-03-23 multimedia/xmms-status-plugin: Abandonware, please consider using multimedia/audacious instead 2014-03-23 russian/xmms: Abandonware, please consider using multimedia/audacious instead 2014-03-23 x11-themes/xmms-bluecurve-theme: Abandonware, please consider using multimedia/audacious instead 2014-03-23 x11-themes/xmms-eq-skins: Abandonware, please consider using multimedia/audacious instead 2014-03-23 x11-themes/xmms-vumeter-skins: Abandonware, please consider using multimedia/audacious instead
Diffstat (limited to 'audio/xmms-cdread/files/patch-cdrombsd.h')
-rw-r--r--audio/xmms-cdread/files/patch-cdrombsd.h68
1 files changed, 0 insertions, 68 deletions
diff --git a/audio/xmms-cdread/files/patch-cdrombsd.h b/audio/xmms-cdread/files/patch-cdrombsd.h
deleted file mode 100644
index 37f8e17e9d87..000000000000
--- a/audio/xmms-cdread/files/patch-cdrombsd.h
+++ /dev/null
@@ -1,68 +0,0 @@
---- cdrombsd.h.orig Sat Aug 18 14:09:10 2001
-+++ cdrombsd.h Thu Mar 4 09:55:32 2004
-@@ -5,15 +5,17 @@
- #ifndef CDROMBSD_H
- #define CDROMBSD_H
- #include <sys/param.h>
-+#include <sys/cdrio.h>
-+#ifndef CD_FRAMESIZE_RAW
-+#define CD_FRAMESIZE_RAW 2352
-+#endif
- /*\
- |*| FreeBSD (?) specific code
- \*/
-
--#define GET_LBA(entry) ((entry.addr_type == CD_LBA_FORMAT) ? \
-- ntohl(entry.addr.lba) : \
-- ((entry.addr.msf.minute * 60 + \
-- entry.addr.msf.second) * 75 + \
-- entry.addr.msf.frame))
-+#define GET_LBA(entry) ((entry.addr.msf.minute * 60 \
-+ + entry.addr.msf.second) * 75 \
-+ + entry.addr.msf.frame)
-
-
- /*\
-@@ -26,16 +28,14 @@
- int fd;
- fd = open(device, O_RDONLY|O_NONBLOCK);
- if (fd < 0) return -1;
--#ifdef CDROM_SELECT_SPEED
- if (!(*flags & FLAG_FAIL_SPD) &&
-- (ioctl(fd, CDROM_SELECT_SPEED, cd_cfg.cdrom_speed) < 0)) {
-+ (ioctl(fd, CDRIOCREADSPEED, &cd_cfg.cdrom_speed) < 0)) {
- if (errno == ENOTTY) {
- close(fd);
- return -1;
- }
- *flags |= FLAG_FAIL_SPD;
- }
--#endif
- return fd;
- }
-
-@@ -84,6 +84,16 @@
- |*| from device cdfd, at position lba
- |*| Return number of successfully read frames, -1 on error.
- \*/
-+#if __FreeBSD_version >= 501106
-+static int
-+cdrom_read_audio(int cdfd, int lba, char *buf, int btw)
-+{
-+ int bsize = CD_FRAMESIZE_RAW;
-+ if (ioctl(cdfd, CDRIOCSETBLOCKSIZE, &bsize) == -1) return -errno;
-+ if (pread(cdfd, buf, btw*bsize, (lba - 150)*bsize) != btw*bsize) return 0;
-+ return btw;
-+}
-+#else // 4-STABLE
- static int
- cdrom_read_audio(int cdfd, int lba, char *buf, int btw)
- {
-@@ -101,6 +111,7 @@
- } while (--rtr >= 0);
- return -1;
- }
-+#endif // FreeBSD_version
-
- /*\ Play audio from lba address from, to lba address to
- |*| return -1 on failure