support for transcode >= 0.6.12

Package-Manager: portage-2.0.51.19

5 files changed, 146 insertions, 11 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 18ae33eea720..980c6d75e8a5 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.97 2005/03/28 20:54:46 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.98 2005/04/14 15:24:04 carlo Exp $
+
+*k3b-0.11.23-r1 (14 Apr 2005)
+
+  14 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/k3b-dvdrip-transcode.patch, +k3b-0.11.23-r1.ebuild:
+  support for transcode >= 0.6.12, thanks to James Roberts-Thomson, #83516
 
 *k3b-0.11.23 (28 Mar 2005)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 312e3edf54f3..00f731807a90 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,16 +1,19 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 333eaab63eb718cab524e0169bcc2956 k3b-0.11.17.ebuild 3454
 MD5 e5ab5a820b79edb45adbbb99daf8aab6 k3b-0.11.23.ebuild 3103
-MD5 4aa8fcfa7cbe99ac395db30e431f6f33 k3b-0.11.20.ebuild 3258
-MD5 cb5adb6127546e24d965148cf362699f k3b-0.11.18.ebuild 3269
-MD5 0ce31246402976c4596b1c929faec0ea ChangeLog 13775
 MD5 ff00293c626b651a2118bbcc6aed8709 k3b-0.11.19.ebuild 3258
-MD5 333eaab63eb718cab524e0169bcc2956 k3b-0.11.17.ebuild 3454
+MD5 922471c2988878912715fb7c51c95654 k3b-0.11.23-r1.ebuild 3133
+MD5 4aa8fcfa7cbe99ac395db30e431f6f33 k3b-0.11.20.ebuild 3258
 MD5 4a18731d572ed5af0b368bef67ab4775 k3b-0.11.22.ebuild 3103
-MD5 07a27bd19c22330f89e89f0e3d663a3a files/digest-k3b-0.11.17 132
-MD5 1981f7fa1e6130f50d53e11eec308fca files/digest-k3b-0.11.19 132
-MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23 132
-MD5 a241e6d966bd333debe30f5654aeccae files/digest-k3b-0.11.22 132
-MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132
+MD5 cb5adb6127546e24d965148cf362699f k3b-0.11.18.ebuild 3269
+MD5 2bf6cdbe0f77081303e185012033175c ChangeLog 13992
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 e863d7c5a6bc253125a06ba6b230d561 files/k3b-0.11.18-configure-libsamplerate.patch 830
+MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23-r1 132
 MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
+MD5 07a27bd19c22330f89e89f0e3d663a3a files/digest-k3b-0.11.17 132
+MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132
+MD5 1981f7fa1e6130f50d53e11eec308fca files/digest-k3b-0.11.19 132
 MD5 f88983da017f717fb05f05512a718b03 files/digest-k3b-0.11.20 132
+MD5 a241e6d966bd333debe30f5654aeccae files/digest-k3b-0.11.22 132
+MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23 132
+MD5 126b536a3df3e9f61867b04e116d97d3 files/k3b-dvdrip-transcode.patch 1241
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.23-r1 b/app-cdr/k3b/files/digest-k3b-0.11.23-r1
new file mode 100644
index 000000000000..9bb16a54e08c
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.11.23-r1
@@ -0,0 +1,2 @@
+MD5 eaff485fb4c431aae715b0ef95c43fcf k3b-0.11.23.tar.bz2 3195224
+MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
new file mode 100644
index 000000000000..855fae55267b
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
@@ -0,0 +1,20 @@
+diff -Narup k3b-0.11.20.orig/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.20/src/rip/k3bdvdrippingprocess.cpp
+--- k3b-0.11.20.orig/src/rip/k3bdvdrippingprocess.cpp	2004-06-02 21:31:41.000000000 +1200
++++ k3b-0.11.20/src/rip/k3bdvdrippingprocess.cpp	2005-02-28 15:45:02.641948322 +1300
+@@ -83,7 +83,15 @@ void K3bDvdRippingProcess::checkRippingM
+     m_title = QString::number( (*m_dvd).getTitleNumber() );
+     if( (*m_dvd).getMaxAngle() == 1 ) {
+         kdDebug() << "K3bDvdRippingProcess) Rip Title" << endl;
+-        m_ripMode = "-P " + m_title;
++	K3bVersion tccatVersion = k3bcore->externalBinManager()->binObject("tccat")->version;
++	kdDebug() << "(K3bDvdRippingProcess) Tccat Version: " << tccatVersion.majorVersion() << "." << tccatVersion.minorVersion() << "." << tccatVersion.patchLevel() << endl;
++	if( tccatVersion.majorVersion() == 0 && tccatVersion.minorVersion() == 6 && tccatVersion.patchLevel() < 12){
++		//transcode <= 0.6.11
++        	m_ripMode = "-P " + m_title;
++	} else {
++		//transcode >= 0.6.12
++		m_ripMode = "-T " + m_title + ",-1 -L";
++	}
+     } else {
+         kdDebug() << "K3bDvdRippingProcess) Rip Angle" << endl;
+         // workaround due to buggy transcode, angle selection doesn't work with -1 (all chapters)
diff --git a/app-cdr/k3b/k3b-0.11.23-r1.ebuild b/app-cdr/k3b/k3b-0.11.23-r1.ebuild
new file mode 100644
index 000000000000..ade509120a0a
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.11.23-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.23-r1.ebuild,v 1.1 2005/04/14 15:24:04 carlo Exp $
+
+inherit kde eutils
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="arts dvdr encode flac kde mad oggvorbis"
+
+DEPEND="arts? ( kde-base/arts )
+	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
+	media-libs/libsamplerate
+	>=media-sound/cdparanoia-3.9.8
+	>=media-libs/id3lib-3.8.0_pre2
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libmad )
+	oggvorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	dvdr? ( app-cdr/dvd+rw-tools )
+	encode? ( media-sound/lame
+		  media-sound/sox
+		  media-video/transcode
+		  media-video/vcdimager )"
+
+need-kde 3.1
+
+I18N="${PN}-i18n-${PV%.*}"
+
+# These are the languages and translated documentation supported by k3b for 
+# version 0.11.x. If you are using this ebuild as a model for another ebuild 
+# for another version of K3b, DO check whether these values are different.
+# Check the {po,doc}/Makefile.am files in k3b-i18n package.
+LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
+LANGS_DOC="da de es et fr pt ru sv"
+
+MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
+MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
+
+for X in $LANGS; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+done
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/k3b-0.11.17-noarts.patch"
+	epatch "${FILESDIR}/k3b-dvdrip-transcode.patch"
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local _S=${S}
+	local myconf="--enable-libsuffix= $(use_with kde k3bsetup)
+		      --with-external-libsamplerate --without-resmgr
+		      $(use_with oggvorbis) $(use_with mad libmad)
+		      $(use_with flac)"
+
+
+	# Build process of K3B
+	kde_src_compile
+
+	# Build process of K3B-i18n, select LINGUAS elements
+	S=${WORKDIR}/${I18N}
+	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
+		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
+		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
+		kde_src_compile
+	fi
+	S=${_S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog FAQ README TODO
+
+	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
+		cd ${WORKDIR}/${I18N}
+		make DESTDIR=${D} install || die
+	fi
+
+	# install menu entry
+	dodir /usr/share/applications
+	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
+	if use kde; then
+		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
+	fi
+	rm -fR ${D}/usr/share/applnk/
+}
+
+pkg_postinst() {
+	echo
+	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
+	einfo "Usually, it is sufficient to be in the cdrom or cdrw group."
+	echo
+}