summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Medinas <metalgod@gentoo.org>2005-08-21 02:36:34 +0000
committerLuis Medinas <metalgod@gentoo.org>2005-08-21 02:36:34 +0000
commitad6eefdedac5698f68bd8a86a6cec8559df5ad3e (patch)
tree89b3d77be6e13b2518e78aafb5bab91a5a91dbed
parentAdd support for USE=zlib by Steve Dibb in #103150. (diff)
downloadgentoo-2-ad6eefdedac5698f68bd8a86a6cec8559df5ad3e.tar.gz
gentoo-2-ad6eefdedac5698f68bd8a86a6cec8559df5ad3e.tar.bz2
gentoo-2-ad6eefdedac5698f68bd8a86a6cec8559df5ad3e.zip
Added a few patches to fix cdrecord problems when users needs to burn cd/dvd. Fixes bug #102940.
(Portage version: 2.0.51.22-r2)
-rw-r--r--app-cdr/cdrtools/ChangeLog12
-rw-r--r--app-cdr/cdrtools/Manifest11
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r1.ebuild123
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch12
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch22
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch11
-rw-r--r--app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha03-r12
7 files changed, 189 insertions, 4 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index ac3b8e656871..dec3929e2d2c 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.125 2005/08/18 14:26:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.126 2005/08/21 02:36:34 metalgod Exp $
+
+*cdrtools-2.01.01_alpha03-r1 (21 Aug 2005)
+
+ 21 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+ +files/cdrtools-2.01.01a03-rezero.patch,
+ +files/cdrtools-2.01.01a03-warnings.patch,
+ +files/cdrtools-2.01a27-writemode.patch,
+ +cdrtools-2.01.01_alpha03-r1.ebuild:
+ Added a few patches to fix cdrecord problems when users needs to burn
+ cd/dvd. Fixes bug #102940.
18 Aug 2005; Lars Weiler <pylon@gentoo.org>
cdrtools-2.01.01_alpha03.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 56b09a7c7afc..535caf679a66 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,13 +1,18 @@
-MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
MD5 e41c6c2a51c7d888a34747f125afea47 ChangeLog 18627
MD5 5a2a9ad0ab6a40d5ee27662bf265bc41 cdrtools-2.01-r1.ebuild 2830
-MD5 b99aca1cac4436f277c4583809661008 cdrtools-2.01.01_alpha01-r2.ebuild 3614
MD5 7851326782af5e5357d8e24d8decee25 cdrtools-2.01-r3.ebuild 3608
+MD5 b99aca1cac4436f277c4583809661008 cdrtools-2.01.01_alpha01-r2.ebuild 3614
+MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
MD5 6a597a4b76d527942bed17efc28db24e cdrtools-2.01.01_alpha03.ebuild 3520
+MD5 1bba8216b7bfd86277d4cac22dcf8f56 cdrtools-2.01.01_alpha03-r1.ebuild 3595
MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
-MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01-r1 67
MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r3 147
MD5 0e8283f78b14f3ead0e78d197e1d5ed1 files/digest-cdrtools-2.01.01_alpha01-r2 153
+MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
MD5 5a55a164c3584a99297b99bf7975c1d6 files/cdrtools-2.01a32-scan.patch 12397
MD5 a5a56cb102587325619a4d3a610d0085 files/digest-cdrtools-2.01.01_alpha03 153
+MD5 5c79e3ba5125fdb0695604c77a00b707 files/cdrtools-2.01.01a03-rezero.patch 558
+MD5 118ed27cd1f6e1cc5e48adc622bb8528 files/cdrtools-2.01.01a03-warnings.patch 853
+MD5 9c89bdd0371267dc24f8640160b9ea9e files/cdrtools-2.01a27-writemode.patch 477
+MD5 a5a56cb102587325619a4d3a610d0085 files/digest-cdrtools-2.01.01_alpha03-r1 153
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r1.ebuild
new file mode 100644
index 000000000000..ec2c04c6421e
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha03-r1.ebuild,v 1.1 2005/08/21 02:36:34 metalgod Exp $
+
+inherit eutils gnuconfig toolchain-funcs flag-o-matic
+
+MY_CRYPT_VERS="2.01-encrypt-1.0rc1"
+
+DESCRIPTION="A set of tools for CD recording, including cdrecord"
+HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
+ on-the-fly-crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+
+LICENSE="GPL-2 freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="on-the-fly-crypt unicode"
+
+DEPEND="virtual/libc
+ !app-cdr/dvdrtools"
+RDEPEND="on-the-fly-crypt? ( sys-fs/cryptsetup )"
+PROVIDE="virtual/cdrtools"
+
+S=${WORKDIR}/${PN}-2.01.01
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # CAN-2004-0806 - Bug 63187
+ epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch
+
+ epatch ${FILESDIR}/${PN}-2.01a32-scan.patch
+ epatch ${FILESDIR}/${PN}-2.01a27-writemode.patch
+ epatch ${FILESDIR}/${PN}-2.01.01a03-warnings.patch
+ epatch ${FILESDIR}/${PN}-2.01.01a03-rezero.patch
+
+ # Add support for On-The-Fly AES encryption
+ # http://burbon04.gmxhome.de/linux/CDREncryption.html
+ if use on-the-fly-crypt; then
+ epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+ fi
+
+ # ppc-macos support
+ cd ${S}/DEFAULTS
+ use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
+ sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+ sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+
+ cd ${S}/librscg
+ sed -i "s:/opt/schily:/usr:g" scsi-remote.c
+
+ cd ${S}/RULES
+ ln -sf i386-linux-cc.rul x86_64-linux-cc.rul
+ ln -sf i386-linux-gcc.rul x86_64-linux-gcc.rul
+ ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
+ ln -sf mips-linux-cc.rul mips64-linux-cc.rul
+}
+
+src_compile() {
+ gnuconfig_update
+
+ use unicode && append-flags "-finput-charset=ISO-8859-1 -fexec-charset=UTF-8"
+
+ emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+}
+
+src_install() {
+ cd ${S}
+
+ dobin cdda2wav/OBJ/*-*-cc/cdda2wav || die "cdda2wav"
+ dobin cdrecord/OBJ/*-*-cc/cdrecord || die "cdrecord"
+ dobin mkisofs/OBJ/*-*-cc/mkisofs || die "mkisofs"
+ dobin readcd/OBJ/*-*-cc/readcd || die "readcd"
+ dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
+
+ insinto /usr/include
+ doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
+
+ cd mkisofs/diag/OBJ/*-*-cc
+ dobin devdump isodump isoinfo isovfy || die "dobin"
+
+ cd ${S}
+ insinto /etc/default
+ doins rscsi/rscsi.dfl
+ doins cdrecord/cdrecord.dfl
+
+ cd ${S}/libs/*-*-cc
+ dolib.a *.a || die "dolib failed"
+
+ cd ${S}
+ insinto /usr/include/scsilib
+ doins include/*.h
+ insinto /usr/include/scsilib/scg
+ doins include/scg/*.h
+
+ cd ${S}
+ dodoc ABOUT Changelog README README.{ATAPI,audio,cdplus,cdrw,cdtext,clone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
+ doman */*.1
+ doman */*.8
+
+ cd ${S}/doc
+ docinto print
+ dodoc *.ps
+}
+
+pkg_postinst() {
+ einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+ if use ppc-macos ; then
+ einfo
+ einfo "Darwin/OS X use the following device names:"
+ einfo
+ einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+ einfo
+ einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+ einfo
+ else
+ echo
+ einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
+ einfo "should be used for IDE CD writers. And make sure that the permissions"
+ einfo "on this device are set properly and your user is in the correct groups."
+ fi
+}
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch
new file mode 100644
index 000000000000..7e8d71f7a6c2
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch
@@ -0,0 +1,12 @@
+--- cdrtools-2.01.01/cdrecord/cdrecord.c.rezero 2005-08-03 12:50:28.000000000 +0200
++++ cdrtools-2.01.01/cdrecord/cdrecord.c 2005-08-03 12:50:53.000000000 +0200
+@@ -3880,7 +3880,8 @@
+ scsi_start_stop_unit(scgp, 1, 0, immed);
+ wait_unit_ready(scgp, 120);
+ scgp->silent++;
+- rezero_unit(scgp); /* Is this needed? Not supported by some drvives */
++ /* kernel >= 2.6.12 does not like that as user
++ rezero_unit(scgp); */ /* Is this needed? Not supported by some drvives */
+ scgp->silent--;
+ test_unit_ready(scgp);
+ scsi_start_stop_unit(scgp, 1, 0, immed);
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
new file mode 100644
index 000000000000..86aaad40fecb
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-warnings.patch
@@ -0,0 +1,22 @@
+--- cdrtools-2.01.01/RULES/mk-gmake.id.warnings 2005-07-22 16:01:01.000000000 +0200
++++ cdrtools-2.01.01/RULES/mk-gmake.id 2005-07-22 16:05:27.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ ifndef ARCH_DONE
+
+-__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
++#__gmake_warn:= $(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 2)
+
+ _MACHCMD= (mach || uname -p || true) 2> /dev/null
+ _ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
+--- cdrtools-2.01.01/cdrecord/cdrecord.c.warnings 2005-07-22 16:01:01.000000000 +0200
++++ cdrtools-2.01.01/cdrecord/cdrecord.c 2005-07-22 16:01:01.000000000 +0200
+@@ -4894,6 +4894,8 @@
+ #ifdef HAVE_UNAME
+ struct utsname un;
+
++ /* Try not to break the diff for each cdrecord release */
++ return;
+ if (uname(&un) >= 0) {
+ /*
+ * I really hope that the Linux kernel developers will soon
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch b/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch
new file mode 100644
index 000000000000..68f0e8a2fd3f
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch
@@ -0,0 +1,11 @@
+--- cdrtools-2.01/cdrecord/cdrecord.c.writemode 2004-03-12 13:37:54.164860489 +0100
++++ cdrtools-2.01/cdrecord/cdrecord.c 2004-03-12 13:38:02.747937392 +0100
+@@ -3597,8 +3597,6 @@
+ errmsgno(EX_BAD, "No write mode specified.\n");
+ errmsgno(EX_BAD, "Asuming -tao mode.\n");
+ errmsgno(EX_BAD, "Future versions of cdrecord may have different drive dependent defaults.\n");
+- errmsgno(EX_BAD, "Continuing in 5 seconds...\n");
+- sleep(5);
+ tao = 1;
+ }
+ tracks++;
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha03-r1 b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha03-r1
new file mode 100644
index 000000000000..5e5a8969111b
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha03-r1
@@ -0,0 +1,2 @@
+MD5 6c5683a6f85c89cc163307a5e434086c cdrtools-2.01.01a03.tar.bz2 1423541
+MD5 785184b45952798c72b26e3da9db0e0f cdrtools-2.01-encrypt-1.0rc1.diff.gz 25384