cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make 'cdda2wav -e' work

Browse Source
This commit is contained in:
jakemsr 2007-11-11 01:41:11 +00:00
parent d514f9d146
commit f6c7471654
4 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/cdrtools/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2007/09/15 21:14:01 merdely Exp $
# $OpenBSD: Makefile,v 1.14 2007/11/11 01:41:11 jakemsr Exp $
COMMENT= ISO 9660 filesystem and CD creation tools
DISTNAME= cdrtools-2.01
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= sysutils
HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html

6
sysutils/cdrtools/patches/patch-RULES_i386-openbsd-cc_rul
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.2 2003/02/17 15:32:58 naddy Exp $
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.3 2007/11/11 01:41:11 jakemsr Exp $
--- RULES/i386-openbsd-cc.rul.orig Tue Oct 15 13:43:40 2002
+++ RULES/i386-openbsd-cc.rul Sun Oct 27 16:12:12 2002
+++ RULES/i386-openbsd-cc.rul Mon Oct 29 03:10:07 2007
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
@ -26,7 +26,7 @@ $OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.2 2003/02/17 15:32:58 naddy Exp $
LDLIBS= $(LIBS) $(LIBX)
#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE
@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
FLOAT_OPTIONS=

17
sysutils/cdrtools/patches/patch-cdda2wav_local_cnf_in
View File

@ -1,7 +1,16 @@
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.2 2004/11/30 05:44:03 jolan Exp $
--- cdda2wav/local.cnf.in.orig 2003-09-04 01:35:24.000000000 -0700
+++ cdda2wav/local.cnf.in 2004-01-15 23:48:57.000000000 -0800
@@ -137,5 +137,5 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVI
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.3 2007/11/11 01:41:11 jakemsr Exp $
--- cdda2wav/local.cnf.in.orig Thu Sep 4 01:35:46 2003
+++ cdda2wav/local.cnf.in Mon Oct 29 03:18:42 2007
@@ -43,7 +43,7 @@ HAVE_IOCTL= $(__HAVE_IOCTL:$(_UNIQ)$(HAVE_BSD_OS)$(HAV
############# Sound device support
#to disable sound support comment out the corresponding line with HAVE_SOUND
-OSS_SOUND_DEV= '"/dev/dsp"'
+OSS_SOUND_DEV= '"/dev/audio"'
SUN_SOUND_DEV= '"/dev/audio"'
HAVE_OSS= @HAVE_OSS@
@@ -137,5 +137,5 @@ $(WANT_INFOFILES) $(WANT_MD5) -DAUX_DEVICE=$(AUX_DEVIC
LIBS += @LIBS@

56
sysutils/cdrtools/patches/patch-cdda2wav_sndconfig_c Normal file
View File

@ -0,0 +1,56 @@
$OpenBSD: patch-cdda2wav_sndconfig_c,v 1.1 2007/11/11 01:41:11 jakemsr Exp $
--- cdda2wav/sndconfig.c.orig Mon Oct 29 03:51:04 2007
+++ cdda2wav/sndconfig.c Mon Oct 29 03:59:12 2007
@@ -163,11 +163,11 @@ int init_soundcard(rate, bits)
(MY_LITTLE_ENDIAN ? AFMT_S16_LE : AFMT_S16_BE);
int mask;
- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_GETBLKSIZE, &dummy) == -1) {
+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_GETBLKSIZE, &dummy) == -1) {
fprintf(stderr, "Cannot get blocksize for %s\n", snd_device);
global.echo = 0;
}
- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SYNC, NULL) == -1) {
+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SYNC, NULL) == -1) {
fprintf(stderr, "Cannot sync for %s\n", snd_device);
global.echo = 0;
}
@@ -180,7 +180,7 @@ int init_soundcard(rate, bits)
#endif
/* check, if the sound device can do the requested format */
- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_GETFMTS, &mask) == -1) {
+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_GETFMTS, &mask) == -1) {
perror("fatal error:");
return -1;
}
@@ -191,25 +191,25 @@ int init_soundcard(rate, bits)
myformat = AFMT_U8;
}
}
- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SETFMT, &myformat) == -1) {
+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SETFMT, &myformat) == -1) {
fprintf(stderr, "Cannot set %d bits/sample for %s\n",bits, snd_device);
global.echo = 0;
}
/* limited sound devices may not support stereo */
if (stereo
- && ioctl(global.soundcard_fd, (int)SNDCTL_DSP_STEREO, &stereo) == -1) {
+ && ioctl(global.soundcard_fd, SNDCTL_DSP_STEREO, &stereo) == -1) {
fprintf(stderr, "Cannot set stereo mode for %s\n", snd_device);
stereo = 0;
}
if (!stereo
- && ioctl(global.soundcard_fd, (int)SNDCTL_DSP_STEREO, &stereo) == -1) {
+ && ioctl(global.soundcard_fd, SNDCTL_DSP_STEREO, &stereo) == -1) {
fprintf(stderr, "Cannot set mono mode for %s\n", snd_device);
global.echo = 0;
}
/* set the sample rate */
- if (ioctl(global.soundcard_fd, (int)SNDCTL_DSP_SPEED, &garbled_rate) == -1) {
+ if (ioctl(global.soundcard_fd, SNDCTL_DSP_SPEED, &garbled_rate) == -1) {
fprintf(stderr, "Cannot set rate %d.%2d Hz for %s\n",
(int)rate, (int)(rate*100)%100, snd_device);
global.echo = 0;