diff options
author | drochner <drochner> | 2009-11-22 21:05:17 +0000 |
---|---|---|
committer | drochner <drochner> | 2009-11-22 21:05:17 +0000 |
commit | da1080b192c8f4c97dd254d3fc442164c23e8582 (patch) | |
tree | 7d0b8be3549088629983a34be8185bb2e5179394 /sysutils | |
parent | 1a67e4a8ecc8defe8c2448033bbefad8957396a1 (diff) | |
download | pkgsrc-da1080b192c8f4c97dd254d3fc442164c23e8582.tar.gz |
update to 1.2.3
changes:
- many bug and compile fixes
- new native Linux SCSI backend
- See ChangeLog for details
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/cdrdao/Makefile.common | 5 | ||||
-rw-r--r-- | sysutils/cdrdao/PLIST | 6 | ||||
-rw-r--r-- | sysutils/cdrdao/distinfo | 21 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-aa | 21 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ab | 26 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ad | 8 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ae | 22 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ai | 30 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-aj | 10 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-ap | 13 | ||||
-rw-r--r-- | sysutils/cdrdao/patches/patch-at | 97 |
11 files changed, 152 insertions, 107 deletions
diff --git a/sysutils/cdrdao/Makefile.common b/sysutils/cdrdao/Makefile.common index f69fb840777..ba97a401341 100644 --- a/sysutils/cdrdao/Makefile.common +++ b/sysutils/cdrdao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2007/02/22 19:27:10 wiz Exp $ +# $NetBSD: Makefile.common,v 1.8 2009/11/22 21:05:17 drochner Exp $ DISTNAME= cdrdao-${CDRDAO_VER} CATEGORIES= sysutils @@ -10,13 +10,12 @@ HOMEPAGE= http://cdrdao.sourceforge.net/ COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode CDRDAODIR= ${.CURDIR}/../../sysutils/cdrdao -FILESDIR= ${CDRDAODIR}/files PATCHDIR= ${CDRDAODIR}/patches DISTINFO_FILE= ${CDRDAODIR}/distinfo PKG_INSTALLATION_TYPES= overwrite pkgviews -CDRDAO_VER= 1.2.2 +CDRDAO_VER= 1.2.3 GNU_CONFIGURE= YES USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/sysutils/cdrdao/PLIST b/sysutils/cdrdao/PLIST index 47cc21a95f6..6a49acea8a5 100644 --- a/sysutils/cdrdao/PLIST +++ b/sysutils/cdrdao/PLIST @@ -1,10 +1,12 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:02 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2009/11/22 21:05:17 drochner Exp $ bin/cdrdao bin/cue2toc bin/toc2cddb bin/toc2cue man/man1/cdrdao.1 man/man1/cue2toc.1 +man/man1/toc2cddb.1 +man/man1/toc2cue.1 share/cdrdao/drivers share/doc/cdrdao/README share/doc/cdrdao/README.PlexDAE @@ -18,6 +20,8 @@ share/doc/cdrdao/testtocs/data6.toc share/doc/cdrdao/testtocs/data7.toc share/doc/cdrdao/testtocs/mode1_rw.toc share/doc/cdrdao/testtocs/mode1_rw_raw.toc +share/doc/cdrdao/testtocs/pregap1.toc +share/doc/cdrdao/testtocs/pregap2.toc share/doc/cdrdao/testtocs/t1.toc share/doc/cdrdao/testtocs/t2.toc share/doc/cdrdao/testtocs/t3.toc diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo index 4368668a417..7125a2a371f 100644 --- a/sysutils/cdrdao/distinfo +++ b/sysutils/cdrdao/distinfo @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.20 2009/08/11 15:44:14 taca Exp $ +$NetBSD: distinfo,v 1.21 2009/11/22 21:05:17 drochner Exp $ -SHA1 (cdrdao-1.2.2.tar.bz2) = 2699e56e00342c1fa2a3815ed02418fe964b276b -RMD160 (cdrdao-1.2.2.tar.bz2) = c537c535a4106655f89f7cfa5895ffcb5b9464e2 -Size (cdrdao-1.2.2.tar.bz2) = 1408344 bytes -SHA1 (patch-aa) = c79fcb39b1ee0bb36f41b1db8401c2f9f97a04c4 -SHA1 (patch-ab) = 90b8be33404a1a8212399610553a05a4d7c77b39 +SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f +RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523 +Size (cdrdao-1.2.3.tar.bz2) = 1428695 bytes +SHA1 (patch-aa) = 9606723ae593981c6b98083990c2b17c1ace5dc2 SHA1 (patch-ac) = 4608827f9202ef5aed35ddda426dc7a9574bc18f -SHA1 (patch-ad) = 2c092aa6755f6029bbd07db9fee03e655081fdb7 -SHA1 (patch-ae) = 0d352c9815401131b8d6ec8ecf5ecc8e1a572b45 +SHA1 (patch-ad) = b2baa69007fce6637049b9cf6fd0b95ef94560e3 +SHA1 (patch-ae) = 3243fc8a0b81aa7ef49940c5fbadb70e094d16cf SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a SHA1 (patch-ah) = 1ec8be46c29c4af2f5fdecccae5b2aa4a7f9893f -SHA1 (patch-ai) = 130d05798d6835f3c317c7806b1b5b40a05fe7f3 -SHA1 (patch-aj) = 233ffacfe7ccecba0ac6118b18357771465a20dd +SHA1 (patch-ai) = cf46de1a2d0d466bcdb30d9123f17de7c571d6b2 +SHA1 (patch-aj) = 16bd87d3217019a07af3441f0593db2496cd7279 SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643 SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17 -SHA1 (patch-ap) = 800b4a1237c788e1b99cd1b79c53c0aab2e653f6 SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81 +SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa index a608ef5eaca..72f2f73e0c9 100644 --- a/sysutils/cdrdao/patches/patch-aa +++ b/sysutils/cdrdao/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2006/12/11 12:28:36 drochner Exp $ +$NetBSD: patch-aa,v 1.8 2009/11/22 21:05:17 drochner Exp $ ---- dao/ScsiIf-lib.cc.orig 2006-09-19 11:07:11.000000000 +0200 +--- dao/ScsiIf-lib.cc.orig 2009-02-22 11:40:11.000000000 +0100 +++ dao/ScsiIf-lib.cc -@@ -289,6 +289,12 @@ int ScsiIf::inquiry() +@@ -288,6 +288,12 @@ int ScsiIf::inquiry() revision_[i] = 0; } @@ -15,18 +15,3 @@ $NetBSD: patch-aa,v 1.7 2006/12/11 12:28:36 drochner Exp $ return 0; } -@@ -430,6 +436,7 @@ const int ScsiIf::lun () - #include "ScsiIf-common.cc" - //<<<<<<< ScsiIf-lib.cc - -+#if 0 - #ifndef linux - - /* Function for mapping any SCSI device to the corresponding SG device. -@@ -576,5 +583,6 @@ const char *ScsiIfImpl::openScsiDevAsSg( - } - - #endif /* linux */ -+#endif - //======= - //>>>>>>> 1.6 diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab deleted file mode 100644 index 2a6530d7aa8..00000000000 --- a/sysutils/cdrdao/patches/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2006/12/11 12:28:36 drochner Exp $ - ---- dao/main.cc.orig 2006-09-19 11:07:11.000000000 +0200 -+++ dao/main.cc -@@ -129,7 +129,7 @@ static HANDLE fh = NULL; - static char devstr[10]; - #endif - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - - # ifdef USE_SCGLIB - static const char *SCSI_DEVICE = "0,0,0"; -@@ -145,7 +145,11 @@ static int FIFO_BUFFERS = 32; - - #else - --static const char *SCSI_DEVICE = "0,0,0"; -+#if defined (__i386__) -+static const char *SCSI_DEVICE = "/dev/rcd0d"; -+#else -+static const char *SCSI_DEVICE = "/dev/rcd0c"; -+#endif /* __i386__ */ - static int FIFO_BUFFERS = 32; - - #endif diff --git a/sysutils/cdrdao/patches/patch-ad b/sysutils/cdrdao/patches/patch-ad index dd87d726d6f..14b63dc9cdc 100644 --- a/sysutils/cdrdao/patches/patch-ad +++ b/sysutils/cdrdao/patches/patch-ad @@ -1,12 +1,12 @@ -$NetBSD: patch-ad,v 1.3 2004/06/20 19:05:25 dillo Exp $ +$NetBSD: patch-ad,v 1.4 2009/11/22 21:05:18 drochner Exp $ ---- dao/GenericMMC.cc.orig 2004-06-05 21:40:52.000000000 +0200 +--- dao/GenericMMC.cc.orig 2009-02-21 22:54:48.000000000 +0100 +++ dao/GenericMMC.cc -@@ -2019,6 +2019,7 @@ CdRawToc *GenericMMC::getRawToc(int sess +@@ -2065,6 +2065,7 @@ CdRawToc *GenericMMC::getRawToc(int sess } dataLen = ((reqData[0] << 8) | reqData[1]) + 2; + dataLen = (dataLen + 1) & ~1; - message(4, "Raw toc data len: %d", dataLen); + log_message(4, "Raw toc data len: %d", dataLen); diff --git a/sysutils/cdrdao/patches/patch-ae b/sysutils/cdrdao/patches/patch-ae index 741f730dd1b..5beefedc6c6 100644 --- a/sysutils/cdrdao/patches/patch-ae +++ b/sysutils/cdrdao/patches/patch-ae @@ -1,17 +1,17 @@ -$NetBSD: patch-ae,v 1.3 2004/07/19 02:21:57 fredb Exp $ +$NetBSD: patch-ae,v 1.4 2009/11/22 21:05:18 drochner Exp $ ---- dao/ScsiIf-linux.cc.orig 2004-04-12 20:23:44.000000000 -0500 +--- dao/ScsiIf-linux.cc.orig 2009-09-28 12:12:03.000000000 +0200 +++ dao/ScsiIf-linux.cc -@@ -398,6 +398,12 @@ - for (i = 3; i >= 0 && revision_[i] == ' '; i--) { - revision_[i] = 0; - } +@@ -269,6 +269,12 @@ int ScsiIf::inquiry() + for (i = 3; i >= 0 && revision_[i] == ' '; i--) { + revision_[i] = 0; + } + -+ if (vendor_[0] == 0) -+ strncpy(vendor_, "UNKNOWN", 8); ++ if (vendor_[0] == 0) ++ strncpy(vendor_, "UNKNOWN", 8); + -+ if (product_[0] == 0) -+ strncpy(product_, "UNKNOWN", 8); ++ if (product_[0] == 0) ++ strncpy(product_, "UNKNOWN", 8); - return 0; + return 0; } diff --git a/sysutils/cdrdao/patches/patch-ai b/sysutils/cdrdao/patches/patch-ai index 82623cb87e5..49dfd020af4 100644 --- a/sysutils/cdrdao/patches/patch-ai +++ b/sysutils/cdrdao/patches/patch-ai @@ -1,26 +1,26 @@ -$NetBSD: patch-ai,v 1.3 2006/05/29 15:22:29 drochner Exp $ +$NetBSD: patch-ai,v 1.4 2009/11/22 21:05:18 drochner Exp $ ---- configure.orig 2005-11-23 21:26:24.000000000 +0100 +--- configure.orig 2009-10-05 13:58:33.000000000 +0200 +++ configure -@@ -10336,7 +10336,7 @@ fi - *-freebsd2*) - scsilib_libs="$scsilib_libs" - ;; -- *-freebsd[34567]*) -+ *-freebsd[34567]* | *-dragonfly*) +@@ -10072,7 +10072,7 @@ if test "$scglib" = yes; then + scsilib_objs="ScsiIf-lib.o" + + case "$host" in +- *-freebsd*) ++ *-freebsd* | *-dragonfly*) scsilib_libs="$scsilib_libs -lcam" ;; esac -@@ -10355,7 +10355,7 @@ else +@@ -10090,7 +10090,7 @@ else scsilib_objs="ScsiIf-linux.o sg_err.o" ;; -- *-freebsd[34567]*) -+ *-freebsd[34567]* | *-dragonfly*) +- *-freebsd*) ++ *-freebsd* | *-dragonfly*) scsilib_libs="-lcam" scsilib_objs="ScsiIf-freebsd-cam.o" ;; -@@ -10583,7 +10583,7 @@ case "$host" in +@@ -10130,7 +10130,7 @@ case "$host" in esac case "$host" in @@ -29,12 +29,12 @@ $NetBSD: patch-ai,v 1.3 2006/05/29 15:22:29 drochner Exp $ if test "$use_pthreads" = yes; then LDFLAGS="-pthread $LDFLAGS" thread_libs="" -@@ -10601,7 +10601,7 @@ _ACEOF +@@ -10148,7 +10148,7 @@ _ACEOF esac case "$host" in -- *-linux* | *-freebsd[4567]* | *-solaris*) -+ *-linux* | *-freebsd[4567]* | *-solaris* | *-netbsd* | *-dragonfly*) +- *-linux* | *-freebsd* | *-solaris*) ++ *-linux* | *-freebsd* | *-solaris* | *-netbsd* | *-dragonfly*) sound_if_obj=SoundIF-ao.o ;; diff --git a/sysutils/cdrdao/patches/patch-aj b/sysutils/cdrdao/patches/patch-aj index 7aecc5d9af9..e53ed9544a6 100644 --- a/sysutils/cdrdao/patches/patch-aj +++ b/sysutils/cdrdao/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2005/06/04 19:05:38 adrianp Exp $ +$NetBSD: patch-aj,v 1.2 2009/11/22 21:05:18 drochner Exp $ ---- xdao/SoundIF-solaris.cc.orig 2004-07-04 22:05:21.000000000 +0200 +--- xdao/SoundIF-solaris.cc.orig 2007-12-29 13:31:54.000000000 +0100 +++ xdao/SoundIF-solaris.cc -@@ -42,6 +42,7 @@ +@@ -45,6 +45,7 @@ * Sound interface for Solaris. Thanks to Tobias Oetiker <oetiker@ee.ethz.ch>. */ @@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.1 2005/06/04 19:05:38 adrianp Exp $ #include <sys/audioio.h> #include <stdio.h> #include <assert.h> -@@ -194,7 +195,7 @@ int SoundIFImpl::setupDevice() +@@ -197,7 +198,7 @@ int SoundIFImpl::setupDevice() auinf.play.sample_rate=44100; auinf.play.channels=2; auinf.play.precision=16; @@ -18,4 +18,4 @@ $NetBSD: patch-aj,v 1.1 2005/06/04 19:05:38 adrianp Exp $ + auinf.play.encoding=AUDIO_ENCODING_SLINEAR_BE; if (ioctl(dspFd_, AUDIO_SETINFO, &auinf) < 0) { - message(-1, _("Cannot setup audio interface: %s"), strerror(errno)); + log_message(-1, _("Cannot setup audio interface: %s"), strerror(errno)); diff --git a/sysutils/cdrdao/patches/patch-ap b/sysutils/cdrdao/patches/patch-ap deleted file mode 100644 index 76f9f1b1175..00000000000 --- a/sysutils/cdrdao/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2007/10/30 19:01:30 drochner Exp $ - ---- xdao/xcdrdao.cc.orig 2007-10-05 14:50:17.000000000 +0200 -+++ xdao/xcdrdao.cc -@@ -136,7 +136,7 @@ int main(int argc, char* argv[]) - installSignalHandler(SIGCHLD, signalHandler); - - // setup periodic GUI updates -- Glib::signal_timeout().connect(SigC::slot(&guiUpdatePeriodic), 2000); -+ Glib::signal_timeout().connect(sigc::ptr_fun(&guiUpdatePeriodic), 2000); - - installSignalHandler(SIGPIPE, SIG_IGN); - diff --git a/sysutils/cdrdao/patches/patch-at b/sysutils/cdrdao/patches/patch-at new file mode 100644 index 00000000000..d40c2bb53db --- /dev/null +++ b/sysutils/cdrdao/patches/patch-at @@ -0,0 +1,97 @@ +$NetBSD: patch-at,v 1.1 2009/11/22 21:05:18 drochner Exp $ + +--- dao/ScsiIf-netbsd.cc.orig 2009-02-22 11:47:01.000000000 +0100 ++++ dao/ScsiIf-netbsd.cc +@@ -22,9 +22,7 @@ + #include <unistd.h> + + #include "ScsiIf.h" +- +-/* can't include trackdb/util.h */ +-extern void message(int level, const char *fmt, ...); ++#include "log.h" + + #include "decodeSense.cc" + +@@ -91,7 +89,7 @@ int ScsiIf::init() + { + if (impl_->name_ == NULL) return 1; + if ((impl_->fd_ = open(impl_->name_, O_RDWR, 0)) < 0) { +- message(-2, "init: %s", strerror(errno)); ++ log_message(-2, "init: %s", strerror(errno)); + return 1; + } + if (inquiry()) return 2; +@@ -193,29 +191,29 @@ void ScsiIf::printError() + p += snprintf(p, s + sizeof(s) - p, ", BUF=%p", impl_->screq_.databuf); + p += snprintf(p, s + sizeof(s) - p, ", LEN=%lu", impl_->screq_.datalen); + p += snprintf(p, s + sizeof(s) - p, ", TO=%lu", impl_->screq_.timeout); +- message(-2, s); ++ log_message(-2, s); + } + if (impl_->error_ != NULL) { +- message(-2, impl_->error_); ++ log_message(-2, impl_->error_); + } else switch (impl_->screq_.retsts) { + case SCCMD_OK: switch (impl_->screq_.status) { +- case 0x00: message(-2, "GOOD"); break; +- case 0x02: message(-2, "CHECK CONDITION"); break; +- case 0x04: message(-2, "CONDITION MET"); break; +- case 0x08: message(-2, "BUSY"); break; +- case 0x10: message(-2, "INTERMEDIATE"); break; +- case 0x14: message(-2, "INTERMEDIATE, CONDITION MET"); break; +- case 0x18: message(-2, "RESERVATION CONFLICT"); break; +- case 0x22: message(-2, "COMMAND TERMINATED"); break; +- case 0x28: message(-2, "QUEUE FULL"); break; +- default: message(-2, "undefined status"); ++ case 0x00: log_message(-2, "GOOD"); break; ++ case 0x02: log_message(-2, "CHECK CONDITION"); break; ++ case 0x04: log_message(-2, "CONDITION MET"); break; ++ case 0x08: log_message(-2, "BUSY"); break; ++ case 0x10: log_message(-2, "INTERMEDIATE"); break; ++ case 0x14: log_message(-2, "INTERMEDIATE, CONDITION MET"); break; ++ case 0x18: log_message(-2, "RESERVATION CONFLICT"); break; ++ case 0x22: log_message(-2, "COMMAND TERMINATED"); break; ++ case 0x28: log_message(-2, "QUEUE FULL"); break; ++ default: log_message(-2, "undefined status"); + } break; +- case SCCMD_TIMEOUT: message(-2, "timeout"); break; +- case SCCMD_BUSY: message(-2, "busy"); break; ++ case SCCMD_TIMEOUT: log_message(-2, "timeout"); break; ++ case SCCMD_BUSY: log_message(-2, "busy"); break; + case SCCMD_SENSE: decodeSense(impl_->screq_.sense, + impl_->screq_.senselen_used); break; +- case SCCMD_UNKNOWN: message(-2, "unknown error"); break; +- default: message(-2, "undefined retsts"); break; ++ case SCCMD_UNKNOWN: log_message(-2, "unknown error"); break; ++ default: log_message(-2, "undefined retsts"); break; + } + } + +@@ -259,7 +257,7 @@ int ScsiIf::inquiry() + return inq(impl_->fd_, vendor_, product_, revision_); + } + +-ScsiIf::ScanData *ScsiIf::scan(int *len) ++ScsiIf::ScanData *ScsiIf::scan(int *len, char *devpath) + { + DIR *dirp; + struct dirent *dp; +@@ -289,6 +287,9 @@ ScsiIf::ScanData *ScsiIf::scan(int *len) + strcat(s, dp->d_name); + if ((fd = open(s, O_RDWR, 0)) >= 0) { + if (ioctl(fd, SCIOCIDENTIFY, &saddr) >= 0) { ++#if 1 ++ scanData[*len].dev = s; ++#else + switch (saddr.type) { + case TYPE_SCSI: + scanData[*len].bus = saddr.addr.scsi.scbus; +@@ -305,6 +306,7 @@ ScsiIf::ScanData *ScsiIf::scan(int *len) + scanData[*len].id = + scanData[*len].lun = -1; + } ++#endif + if (inq(fd, scanData[*len].vendor, + scanData[*len].product, + scanData[*len].revision) == 0) (*len)++; |