Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

15
sysutils/cdrdao/DESCR Normal file
View File

@@ -0,0 +1,15 @@
Disk at Once CD recording, featuring:
Full control over length and contents of pre-gaps (pause areas between tracks).
Pre-gaps may be completely omitted,
e.g. for dividing live recordings into tracks.
Control over sub-channel data like:
catalog number
copy, pre-emphasis, 2-/4-channel flags
ISRC code
index marks
Support for exact audio or data CD copying.
Tracks may be composed of different audio files supporting
non destructive cut.
Accepts WAVE and raw audio files.
CD-TEXT reading and writing with drives that support it.

40
sysutils/cdrdao/Makefile Normal file
View File

@@ -0,0 +1,40 @@
# $NetBSD: Makefile,v 1.35 2012/10/23 19:50:54 asau Exp $
.include "../../sysutils/cdrdao/Makefile.common"
PKGREVISION= 1
PKGNAME= cdrdao-${CDRDAO_VER}
COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
CONFIGURE_ARGS+= --without-xdao
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
CONFIGURE_ARGS+= --without-posix-threads
.endif
post-install:
${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao
${INSTALL_MAN} ${WRKSRC}/README \
${WRKSRC}/README.PlexDAE \
${DESTDIR}${PREFIX}/share/doc/cdrdao
${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \
${DESTDIR}${PREFIX}/share/doc/cdrdao/testtocs
${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao
${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \
${DESTDIR}${PREFIX}/share/examples/cdrdao
${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy
${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
${WRKSRC}/contrib/psxcopy-0.2/README \
${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \
${WRKSRC}/contrib/psxcopy-0.2/read-psx \
${WRKSRC}/contrib/psxcopy-0.2/write-psx \
${DESTDIR}${PREFIX}/share/examples/cdrdao/psxcopy
${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
${DESTDIR}${PREFIX}/share/examples/cdrdao
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -0,0 +1,54 @@
# $NetBSD: Makefile.common,v 1.10 2012/03/22 11:28:38 hans Exp $
DISTNAME= cdrdao-${CDRDAO_VER}
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= david@maxwell.net
HOMEPAGE= http://cdrdao.sourceforge.net/
COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
CDRDAODIR= ${.CURDIR}/../../sysutils/cdrdao
PATCHDIR= ${CDRDAODIR}/patches
DISTINFO_FILE= ${CDRDAODIR}/distinfo
PKG_INSTALLATION_TYPES= overwrite pkgviews
CDRDAO_VER= 1.2.3
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
# don't pick up an installed libcdda_paranoia
LDFLAGS+= -L../paranoia
LDFLAGS.SunOS= -lvolmgt -lnsl
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
CONFIGURE_ARGS+=--with-scglib
.endif
.if !empty(CC:M*gcc*)
MAKE_ENV+= CCOM=gcc
.endif
# override ARCH to avoid picking up a bad ${ARCH} during the build
MAKE_ENV+= ARCH=""
post-extract:
${CP} ${WRKSRC}/scsilib/RULES/os-freebsd.id ${WRKSRC}/scsilib/RULES/os-dragonfly.id
post-configure:
cd ${WRKSRC}/scsilib/RULES ; \
${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
.include "../../audio/libao/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/pccts/buildlink3.mk"

41
sysutils/cdrdao/PLIST Normal file
View File

@@ -0,0 +1,41 @@
@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
share/doc/cdrdao/testtocs/cdtext.toc
share/doc/cdrdao/testtocs/data1.toc
share/doc/cdrdao/testtocs/data2.toc
share/doc/cdrdao/testtocs/data3.toc
share/doc/cdrdao/testtocs/data4.toc
share/doc/cdrdao/testtocs/data5.toc
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
share/doc/cdrdao/testtocs/t4.toc
share/doc/cdrdao/testtocs/t5.toc
share/doc/cdrdao/testtocs/t6.toc
share/doc/cdrdao/testtocs/t7.toc
share/doc/cdrdao/testtocs/t8.toc
share/doc/cdrdao/testtocs/t9.toc
share/examples/cdrdao/mp32dao.pl
share/examples/cdrdao/psxcopy/Makefile
share/examples/cdrdao/psxcopy/README
share/examples/cdrdao/psxcopy/cdjob.c
share/examples/cdrdao/psxcopy/psxdump.c
share/examples/cdrdao/psxcopy/read-psx
share/examples/cdrdao/psxcopy/write-psx
share/examples/cdrdao/wav2dao.pl

25
sysutils/cdrdao/distinfo Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: distinfo,v 1.26 2013/05/03 16:14:47 drochner Exp $
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) = b2baa69007fce6637049b9cf6fd0b95ef94560e3
SHA1 (patch-ae) = 39bb65ebce0ab53675a34963f718d74083412cff
SHA1 (patch-af) = 6db55b356b6f78f26472f710ecef2f98ce0051ca
SHA1 (patch-ag) = e5466c41d1f6e492a57588ccbc2cdfe5696b0a8a
SHA1 (patch-ah) = a1c82bed76fee272e4afffdcad0a7e5c101f235c
SHA1 (patch-ai) = cf46de1a2d0d466bcdb30d9123f17de7c571d6b2
SHA1 (patch-aj) = 16bd87d3217019a07af3441f0593db2496cd7279
SHA1 (patch-al) = eba32acd367714c668feb2662a486476577d0643
SHA1 (patch-am) = 2b0f687b8ed233580c3ef497ad50ed01ca8a69dc
SHA1 (patch-ao) = fbc7694628c2dc0f6f631d5f6d6c66801fff1d17
SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa
SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b
SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81
SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d
SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
SHA1 (patch-av) = 1053b438744ce9e64e0ab093679ed71fbce9a533
SHA1 (patch-aw) = 152cc7d2f58b97ecbb766b9f3682884515a170a1
SHA1 (patch-ba) = b6b7ccae9edf1e816aac76a7d94b7bf67fc1671a

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-aa,v 1.8 2009/11/22 21:05:17 drochner Exp $
--- dao/ScsiIf-lib.cc.orig 2009-02-22 11:40:11.000000000 +0100
+++ dao/ScsiIf-lib.cc
@@ -288,6 +288,12 @@ int ScsiIf::inquiry()
revision_[i] = 0;
}
+ if (vendor_[0] == 0)
+ strncpy(vendor_, "UNKNOWN", 8);
+
+ if (product_[0] == 0)
+ strncpy(product_, "UNKNOWN", 8);
+
return 0;
}

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-ac,v 1.4 2004/05/29 08:05:08 dillo Exp $
--- scsilib/include/btorder.h.orig 2004-02-10 00:34:00.000000000 +0100
+++ scsilib/include/btorder.h
@@ -28,6 +28,9 @@
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
#define _INCL_SYS_TYPES_H
#endif
+#ifdef __NetBSD__
+#include <machine/endian.h>
+#endif
#ifndef _MCONFIG_H
#include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)
-# if defined(__BIG_ENDIAN__)
+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
# define _BIT_FIELDS_HTOL
# else
# define _BIT_FIELDS_LTOH

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ad,v 1.4 2009/11/22 21:05:18 drochner Exp $
--- dao/GenericMMC.cc.orig 2009-02-21 22:54:48.000000000 +0100
+++ dao/GenericMMC.cc
@@ -2065,6 +2065,7 @@ CdRawToc *GenericMMC::getRawToc(int sess
}
dataLen = ((reqData[0] << 8) | reqData[1]) + 2;
+ dataLen = (dataLen + 1) & ~1;
log_message(4, "Raw toc data len: %d", dataLen);

View File

@@ -0,0 +1,27 @@
$NetBSD: patch-ae,v 1.5 2011/01/29 20:48:07 markd Exp $
Fix building with GLIBC 2.12 gentoo bug #332237
--- dao/ScsiIf-linux.cc.orig 2009-09-28 12:12:03.000000000 +0200
+++ dao/ScsiIf-linux.cc
@@ -30,6 +30,7 @@
#include <asm/param.h>
#include <scsi/scsi.h>
#include <scsi/sg.h>
+#include <sys/stat.h>
#include "ScsiIf.h"
#include "sg_err.h"
@@ -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 (product_[0] == 0)
+ strncpy(product_, "UNKNOWN", 8);
return 0;
}

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-af,v 1.1 2004/07/19 02:21:57 fredb Exp $
--- dao/ScsiIf-nt.cc.orig 2001-09-03 12:37:42.000000000 -0500
+++ dao/ScsiIf-nt.cc
@@ -332,6 +332,12 @@
revision_[i] = 0;
}
+ if (vendor_[0] == 0)
+ strncpy(vendor_, "UNKNOWN", 8);
+
+ if (product_[0] == 0)
+ strncpy(product_, "UNKNOWN", 8);
+
return 0;
}

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-ag,v 1.3 2004/07/19 02:21:57 fredb Exp $
--- dao/ScsiIf-win.cc.orig 2001-09-03 12:37:42.000000000 -0500
+++ dao/ScsiIf-win.cc
@@ -355,5 +355,15 @@
revision_[i] = 0;
}
+ if (vendor_[0] == 0)
+ {
+ strncpy(vendor_, "UNKNOWN", 8);
+ }
+
+ if (product_[0] == 0)
+ {
+ strncpy(product_, "UNKNOWN", 8);
+ }
+
return 0;
}

View File

@@ -0,0 +1,25 @@
$NetBSD: patch-ah,v 1.2 2010/01/10 05:39:30 obache Exp $
--- dao/ScsiIf-freebsd-cam.cc.orig 2007-12-29 12:26:33.000000000 +0000
+++ dao/ScsiIf-freebsd-cam.cc
@@ -32,6 +32,7 @@
#include "ScsiIf.h"
#include "log.h"
+#include "util.h"
#define DEF_RETRY_COUNT 1
@@ -220,6 +221,12 @@ int ScsiIf::inquiry()
for (i = 3; i >= 0 && revision_[i] == ' '; i--)
revision_[i] = 0;
+ if (vendor_[0] == 0)
+ strncpy(vendor_, "UNKNOWN", 8);
+
+ if (product_[0] == 0)
+ strncpy(product_, "UNKNOWN", 8);
+
return 0;
}

View File

@@ -0,0 +1,40 @@
$NetBSD: patch-ai,v 1.4 2009/11/22 21:05:18 drochner Exp $
--- configure.orig 2009-10-05 13:58:33.000000000 +0200
+++ configure
@@ -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
@@ -10090,7 +10090,7 @@ else
scsilib_objs="ScsiIf-linux.o sg_err.o"
;;
- *-freebsd*)
+ *-freebsd* | *-dragonfly*)
scsilib_libs="-lcam"
scsilib_objs="ScsiIf-freebsd-cam.o"
;;
@@ -10130,7 +10130,7 @@ case "$host" in
esac
case "$host" in
- *-freebsd*)
+ *-freebsd* | *-dragonfly*)
if test "$use_pthreads" = yes; then
LDFLAGS="-pthread $LDFLAGS"
thread_libs=""
@@ -10148,7 +10148,7 @@ _ACEOF
esac
case "$host" in
- *-linux* | *-freebsd* | *-solaris*)
+ *-linux* | *-freebsd* | *-solaris* | *-netbsd* | *-dragonfly*)
sound_if_obj=SoundIF-ao.o
;;

View File

@@ -0,0 +1,21 @@
$NetBSD: patch-aj,v 1.2 2009/11/22 21:05:18 drochner Exp $
--- xdao/SoundIF-solaris.cc.orig 2007-12-29 13:31:54.000000000 +0100
+++ xdao/SoundIF-solaris.cc
@@ -45,6 +45,7 @@
* Sound interface for Solaris. Thanks to Tobias Oetiker <oetiker@ee.ethz.ch>.
*/
+#include <sys/types.h>
#include <sys/audioio.h>
#include <stdio.h>
#include <assert.h>
@@ -197,7 +198,7 @@ int SoundIFImpl::setupDevice()
auinf.play.sample_rate=44100;
auinf.play.channels=2;
auinf.play.precision=16;
- auinf.play.encoding=AUDIO_ENCODING_LINEAR;
+ auinf.play.encoding=AUDIO_ENCODING_SLINEAR_BE;
if (ioctl(dspFd_, AUDIO_SETINFO, &auinf) < 0) {
log_message(-1, _("Cannot setup audio interface: %s"), strerror(errno));

View File

@@ -0,0 +1,22 @@
$NetBSD: patch-al,v 1.1 2005/10/10 21:36:56 joerg Exp $
--- dao/dao.cc.orig 2005-07-10 10:19:53.000000000 +0000
+++ dao/dao.cc
@@ -55,7 +55,7 @@
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#define IPC_ARG_T void
#else
#define IPC_ARG_T msgbuf
@@ -892,7 +892,7 @@ static int getSharedMemory(long nofBuffe
maxSegmentSize = info.shmmax;
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
maxSegmentSize = 4 * 1024 * 1024; // 4 MB
#else
maxSegmentSize = 1 * 1024 * 1024; // 1 MB

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-am,v 1.1 2005/10/10 21:36:56 joerg Exp $
--- scsilib/libscg/scsihack.c.orig 2005-07-10 10:22:38.000000000 +0000
+++ scsilib/libscg/scsihack.c
@@ -129,7 +129,7 @@ EXPORT scg_ops_t scg_std_ops = {
#endif /* linux */
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#define SCSI_IMPL /* We have a SCSI implementation for *BSD */
#include "scsi-bsd.c"

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-ao,v 1.1 2005/10/10 21:36:56 joerg Exp $
--- scsilib/include/xmconfig.h.orig 2005-07-10 10:24:39.000000000 +0000
+++ scsilib/include/xmconfig.h
@@ -763,9 +763,9 @@ extern "C" {
#endif
/*
- * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS
+ * Prototype for FreeBSD / NetBSD / OpenBSD / BSD/OS / DragonFly
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
# define PROTOTYPES
# define HAVE_AOUT
# define HAVE_STDARG_H

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-aq,v 1.1 2009/08/11 15:44:14 taca Exp $
Avoid confliction with getline(3).
--- scsilib/include/schily.h.orig 2004-03-05 09:30:40.000000000 +0900
+++ scsilib/include/schily.h
@@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int
extern char *findbytes __PR((const void *, int, char));
extern int findline __PR((const char *, char, const char *,
int, char **, int));
-extern int getline __PR((char *, int));
+extern int get_line __PR((char *, int));
extern int getstr __PR((char *, int));
extern int breakline __PR((char *, char, char **, int));
extern int getallargs __PR((int *, char * const**, const char *, ...));

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ar,v 1.1 2009/08/11 15:44:14 taca Exp $
Avoid confliction with getline(3).
--- scsilib/libscg/scsitransp.c.orig 2004-06-18 05:20:27.000000000 +0900
+++ scsilib/libscg/scsitransp.c
@@ -323,7 +323,7 @@ scg_yes(msg)
js_printf("%s", msg);
flush();
- if (getline(okbuf, sizeof (okbuf)) == EOF)
+ if (get_line(okbuf, sizeof (okbuf)) == EOF)
exit(EX_BAD);
if (streql(okbuf, "y") || streql(okbuf, "yes") ||
streql(okbuf, "Y") || streql(okbuf, "YES"))

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-as,v 1.1 2009/08/11 15:44:14 taca Exp $
Avoid confliction with getline(3).
--- scsilib/libschily/stdio/fgetline.c.orig 2004-08-08 20:02:05.000000000 +0900
+++ scsilib/libschily/stdio/fgetline.c
@@ -64,7 +64,7 @@ fgetline(f, buf, len)
}
EXPORT int
-getline(buf, len)
+get_line(buf, len)
char *buf;
int len;
{

View File

@@ -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)++;

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-au,v 1.1 2010/05/19 18:22:14 drochner Exp $
--- ./trackdb/FormatOgg.cc.orig 2010-05-19 14:56:10.000000000 +0000
+++ ./trackdb/FormatOgg.cc
@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit
return FS_WRONG_FORMAT;
}
+ memset(&outFormat_, 0, sizeof(outFormat_));
outFormat_.bits = 16;
outFormat_.rate = 44100;
outFormat_.channels = 2;

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-av,v 1.1 2010/05/19 18:22:14 drochner Exp $
--- trackdb/FormatMp3.cc.orig 2010-05-19 14:58:05.000000000 +0000
+++ trackdb/FormatMp3.cc
@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit
// Initialize libao for WAV output;
ao_sample_format out_format;
+ memset(&out_format, 0, sizeof(out_format));
out_format.bits = 16;
out_format.rate = 44100;
out_format.channels = 2;

View File

@@ -0,0 +1,20 @@
$NetBSD: patch-aw,v 1.2 2011/07/08 18:18:16 drochner Exp $
--- xdao/SoundIF-ao.cc.orig 2005-04-22 02:01:49.000000000 +0000
+++ xdao/SoundIF-ao.cc
@@ -18,6 +18,7 @@
*/
#include <ao/ao.h>
+#include <string.h>
#include "SoundIF.h"
#include "Sample.h"
@@ -37,6 +38,7 @@ SoundIF::SoundIF()
impl_ = new SoundIFImpl;
impl_->driverId = ao_default_driver_id();
+ memset(&impl_->format, 0, sizeof(impl_->format));
impl_->format.bits = 16;
impl_->format.rate = 44100;
impl_->format.channels = 2;

View File

@@ -0,0 +1,47 @@
$NetBSD: patch-ba,v 1.1 2013/05/03 16:14:47 drochner Exp $
adapt to libao's output format
--- trackdb/TrackData.cc.orig 2009-04-20 21:20:17.000000000 +0000
+++ trackdb/TrackData.cc
@@ -642,7 +642,7 @@ int TrackData::waveLength(const char *fi
char magic[4];
long headerLen = 0;
long len;
- short waveFormat;
+ unsigned short waveFormat;
short waveChannels;
long waveRate;
short waveBits;
@@ -715,7 +715,7 @@ int TrackData::waveLength(const char *fi
waveFormat = readShort(fp);
- if (waveFormat != 1) {
+ if (waveFormat != 1 && waveFormat != 0xfffe) {
// not PCM format
log_message(-2, "%s: not in PCM format.", filename);
fclose(fp);
@@ -749,7 +749,21 @@ int TrackData::waveLength(const char *fi
return 2;
}
- len -= 16;
+ if (waveFormat == 1)
+ len -= 16;
+ else {
+ readShort(fp); // cbsize
+ readShort(fp); // validbits
+ readLong(fp); // channelmask
+ waveFormat = readShort(fp); // subformat
+ if (waveFormat != 1) {
+ // not PCM format
+ log_message(-2, "%s: not in PCM format.", filename);
+ fclose(fp);
+ return 2;
+ }
+ len -= 26;
+ }
// skip chunk data
if (fseek(fp, len, SEEK_CUR) != 0) {