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

update cdrtools to 3.00.

Browse Source 
based on initial diff from pascal@
lots of feedback and compiling on alpha from naddy@

OK naddy@
This commit is contained in:
sebastia 2011-12-07 07:56:12 +00:00
parent 4ccb599ba8
commit 5ab7f6dfe2
12 changed files with 67 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sysutils/cdrtools/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.18 2011/11/10 14:13:06 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2011/12/07 07:56:12 sebastia Exp $
COMMENT= ISO 9660 filesystem and CD creation tools
COMMENT= ISO 9660 filesystem and CD/DVD/BD creation tools
DISTNAME= cdrtools-2.01
REVISION = 2
DISTNAME= cdrtools-3.00
CATEGORIES= sysutils
HOMEPAGE= http://cdrecord.berlios.de/old/private/cdrecord.html
HOMEPAGE= http://cdrecord.berlios.de/private/cdrecord.html
# GPL
# mostly CDDL, some components GPL (see COPYING)
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -17,11 +16,16 @@ WANTLIB= c ossaudio
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
http://spacehopper.org/mirrors/berlios/cdrecord/
USE_GMAKE= Yes
USE_GROFF = Yes
MAKE_ENV= MAKEPROG=${MAKE_PROGRAM} \
CCOM=${CC}
USE_GMAKE= Yes
MAKE_ENV += MAKEPROG=${MAKE_PROGRAM}
MAKE_FLAGS = GMAKE_NOWARN=true CC="${CC}" CC++="${CXX}" \
LDCC="${CC}" LDCC++="${CXX}" \
MKC++DEP="${CXX} -M" MKDEP="${CC} -M" \
DYNLD="${CC}" DYNLDC++="${CXX}" \
GCCOPTOPT="" RANLIB=ranlib AR=ar \
OSS_SOUND_DEV='"/dev/audio"'
NO_REGRESS= Yes

10
sysutils/cdrtools/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cdrtools-2.01.tar.gz) = b1iILfukxhXi69gaVl98+g==
RMD160 (cdrtools-2.01.tar.gz) = bSEDiRh4mQL/d0/Nqsd4Coy0a74=
SHA1 (cdrtools-2.01.tar.gz) = tnShidN189FEf0hEwqlidRuTP8E=
SHA256 (cdrtools-2.01.tar.gz) = FDyuPVXzHZb+qjE84suSDBltd+vLyiooD/ygHinXX1c=
SIZE (cdrtools-2.01.tar.gz) = 1736017
MD5 (cdrtools-3.00.tar.gz) = uyHO/vz7t2zySRIOiXj/3Q==
RMD160 (cdrtools-3.00.tar.gz) = nDIjluU6k8q3BaUPEMI9rDuOGSc=
SHA1 (cdrtools-3.00.tar.gz) = LNfRcl4NoiZ7egM8x0QpXW4rxrk=
SHA256 (cdrtools-3.00.tar.gz) = YyZ2Lai4KByakQxm/mmM1NG8XzPDe1no8cgzQ8JfPpg=
SIZE (cdrtools-3.00.tar.gz) = 2479860

34
sysutils/cdrtools/patches/patch-RULES_cc-gcc_rul Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-RULES_cc-gcc_rul,v 1.1 2011/12/07 07:56:12 sebastia Exp $
--- RULES/cc-gcc.rul.orig Wed May 9 14:25:30 2007
+++ RULES/cc-gcc.rul Thu Nov 17 16:25:51 2011
@@ -19,9 +19,9 @@
# file and include the License file CDDL.Schily.txt from this distribution.
###########################################################################
-CPPFLAGS= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
-C++FLAGS= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
+CPPFLAGS+= -DSCHILY_BUILD $(CPPOPTS) $(CPPOPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+C++FLAGS+= $(C++OPTS) $(C++WARNOPTS) $(C++OPTOPT) $(G++OPTOPT) $(C++OPTX)
CPPOPTS= -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(INCDIRSX:%=-I%) $(OSDEFS)
COPTS=
@@ -29,7 +29,7 @@ COPTS=
CWOPTS= -Wall -Wtraditional
CWOPTS= -Wall -Wno-unknown-pragmas \
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
-COPTOPT= -O
+COPTOPT=
COPTDYN= -fpic
COPTGPROF= -pg
C++OPTS=
@@ -45,7 +45,7 @@ SHL_SUFFIX= .so.1
LIBS_PATH= -L$(OLIBSDIR)
LIBS_PATH_STATIC= -L$(OLIBSDIR_STATIC)
-LDFLAGS= $(LDOPTS) $(LDOPTX)
+LDFLAGS+= $(LDOPTS) $(LDOPTX)
LDLIBS= $(LIBS) $(LIBX)
LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%)

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

@ -1,47 +0,0 @@
$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 Mon Oct 29 03:10:07 2007
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(GCCOPTOPT) $(COPTX)
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
COPTS=
CWOPTS= -Wall -Wtraditional \
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
-COPTOPT= -O
+COPTOPT=
KDEFINES= -DKERNEL -D_KERNEL
COPTDYN= -fpic
COPTGPROF= -pg
@@ -47,7 +47,7 @@ LIB_KVM=
LIBS_PATH= -L$(OLIBSDIR)
-LDFLAGS= $(LDOPTS) $(LDOPTX)
+LDFLAGS+= $(LDOPTS) $(LDOPTX)
LDLIBS= $(LIBS) $(LIBX)
#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGET_BASE).so
FLOAT_OPTIONS=
-CC= @echo " ==> COMPILING \"$@\""; gcc
-LDCC= @echo " ==> LINKING \"$@\""; gcc
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
+CC= @echo " ==> COMPILING \"$@\""; $(CCOM)
+LDCC= @echo " ==> LINKING \"$@\""; $(CCOM)
+DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CCOM)
RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
ARFLAGS= cr
LORDER= lorder
TSORT= tsort
RMDEP= :
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CCOM) -M
MKDEP_OUT=

12
sysutils/cdrtools/patches/patch-RULES_mk-gmake_id
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-RULES_mk-gmake_id,v 1.1 2009/10/10 09:25:11 espie Exp $
--- RULES/mk-gmake.id.orig Sat Oct 10 11:20:15 2009
+++ RULES/mk-gmake.id Sat Oct 10 11:20:33 2009
@@ -37,7 +37,7 @@ MAKEPROG= gmake
ifndef ARCH_DONE
-__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 5)
+__gmake_warn:= :
_MACHCMD= (mach || uname -p || true) 2> /dev/null
_ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null

15
sysutils/cdrtools/patches/patch-RULES_rules_cnf
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-RULES_rules_cnf,v 1.2 2003/02/17 15:32:58 naddy Exp $
--- RULES/rules.cnf.orig Sun Jul 21 01:50:27 2002
+++ RULES/rules.cnf Sun Jul 21 01:51:20 2002
@@ -33,8 +33,9 @@ $(OINCSDIR):
#
# Hack until the <mach>-<os>-*cc.rul files are updated
#
-_HCCCOM= $(OARCH:%-gcc=gcc)
-HCCCOM= $(_HCCCOM:%-cc=cc)
+#_HCCCOM= $(OARCH:%-gcc=gcc)
+#HCCCOM= $(_HCCCOM:%-cc=cc)
+HCCCOM= $(C_ARCH)
_CCCOM= $(_UNIQ)$(CCCOM)
__CCCOM= $(_CCCOM:$(_UNIQ)=$(HCCCOM))

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

@ -1,12 +0,0 @@
$OpenBSD: patch-cdda2wav_local_cnf_in,v 1.4 2011/11/01 16:44:19 naddy 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@

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

@ -1,56 +0,0 @@
$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;

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

@ -1,17 +0,0 @@
$OpenBSD: patch-include_btorder_h,v 1.2 2004/11/30 05:44:03 jolan Exp $
--- include/btorder.h.orig 2003-06-15 14:41:00.000000000 -0700
+++ include/btorder.h 2004-01-15 23:45:38.000000000 -0800
@@ -20,6 +20,13 @@
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifdef __OpenBSD__
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define _BIT_FIELDS_LTOH
+#elif BYTE_ORDER == BIG_ENDIAN
+#define _BIT_FIELDS_HTOL
+#endif
+#endif
#ifndef _BTORDER_H
#define _BTORDER_H

14
sysutils/cdrtools/patches/patch-libschily_getargs_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libschily_getargs_c,v 1.1 2004/11/30 05:44:03 jolan Exp $
--- libschily/getargs.c.orig Mon Oct 6 04:01:07 2003
+++ libschily/getargs.c Thu Oct 7 20:48:29 2004
@@ -266,8 +266,8 @@ LOCAL int
doflag(pac, pav, argp, fmt, setargs, oargs)
int *pac;
char *const **pav;
- register const char *argp;
- register const char *fmt;
+ const char *argp;
+ const char *fmt;
BOOL setargs;
va_list oargs;
{

8
sysutils/cdrtools/patches/patch-libschily_printf_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libschily_printf_c,v 1.1 2003/02/17 15:32:58 naddy Exp $
--- libschily/printf.c.orig Sun Nov 10 23:19:50 2002
+++ libschily/printf.c Sun Nov 10 23:20:22 2002
@@ -23,7 +23,7 @@
$OpenBSD: patch-libschily_printf_c,v 1.2 2011/12/07 07:56:12 sebastia Exp $
--- libschily/printf.c.orig Tue Oct 18 15:16:34 2011
+++ libschily/printf.c Tue Oct 18 15:16:44 2011
@@ -19,7 +19,7 @@
#ifdef printf
# define __no_undef__
#else

20
sysutils/cdrtools/pkg/PLIST
View File

@ -1,14 +1,14 @@
@comment $OpenBSD: PLIST,v 1.7 2004/11/30 05:44:03 jolan Exp $
@comment $OpenBSD: PLIST,v 1.8 2011/12/07 07:56:12 sebastia Exp $
@conflict cdrecord-*
bin/cdda2wav
bin/cdrecord
bin/devdump
bin/isodebug
bin/isodump
bin/isoinfo
bin/isovfy
bin/mkisofs
bin/readcd
@bin bin/cdda2wav
@bin bin/cdrecord
@bin bin/devdump
@bin bin/isodebug
@bin bin/isodump
@bin bin/isoinfo
@bin bin/isovfy
@bin bin/mkisofs
@bin bin/readcd
@man man/man1/cdda2wav.1
@man man/man1/cdrecord.1
@man man/man1/devdump.1