Added patch to force compilation against internal libsamplerate (#77607).

5 files changed, 154 insertions, 5 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 667d1d1a8b30..1ae7fd8646a2 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.86 2005/01/11 21:58:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.87 2005/01/13 13:29:32 greg_g Exp $
+
+*k3b-0.11.18-r1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg@gentoo.org>
+  +files/k3b-0.11.18-configure-libsamplerate.patch, +k3b-0.11.18-r1.ebuild:
+  Added patch to force compilation against internal libsamplerate (#77607).
 
   11 Jan 2005; Carsten Lohrke <carlo@gentoo.org> k3b-0.11.18.ebuild:
   corrected dependencies: #77563 and #77555, revoked #75252, stable on x86
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 884a516c8f58..a359fda828e3 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,7 +1,10 @@
-MD5 2a730959e6cc100464d2cd8035dcbb6f k3b-0.11.17.ebuild 3394
-MD5 2b9dfab12f93a3e3fdb5c2f41f083cea k3b-0.11.18.ebuild 3240
-MD5 a68d90a7640d51ca215d9f55e13c7d7c ChangeLog 12231
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
+MD5 d18436792cb5be127c01d61d4d42f578 k3b-0.11.18.ebuild 3422
+MD5 a68d90a7640d51ca215d9f55e13c7d7c ChangeLog 12231
+MD5 2a730959e6cc100464d2cd8035dcbb6f k3b-0.11.17.ebuild 3394
+MD5 aaf5fa9d3dd3a1dfd8cff837402b58f2 k3b-0.11.18-r1.ebuild 3433
 MD5 07a27bd19c22330f89e89f0e3d663a3a files/digest-k3b-0.11.17 132
+MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18-r1 132
 MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132
+MD5 e863d7c5a6bc253125a06ba6b230d561 files/k3b-0.11.18-configure-libsamplerate.patch 830
+MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.18-r1 b/app-cdr/k3b/files/digest-k3b-0.11.18-r1
new file mode 100644
index 000000000000..acca4610f6a0
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.11.18-r1
@@ -0,0 +1,2 @@
+MD5 f5060c384c6830b51bad0451ec265326 k3b-0.11.18.tar.bz2 3189252
+MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/k3b-0.11.18-configure-libsamplerate.patch b/app-cdr/k3b/files/k3b-0.11.18-configure-libsamplerate.patch
new file mode 100644
index 000000000000..29483808ccb7
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-0.11.18-configure-libsamplerate.patch
@@ -0,0 +1,29 @@
+--- configure.in.in.orig	2005-01-13 12:08:37.961432944 +0100
++++ configure.in.in	2005-01-13 12:47:15.386130840 +0100
+@@ -181,15 +181,25 @@
+ ])
+ AC_SUBST(RESMGR_LIB)
+ 
++AC_ARG_WITH(external-libsamplerate,
++	[  --with-external-libsamplerate   use the libsamplerate provided by the system (default=yes)],
++	[external_sampletrate=$withval], [external_sampletrate=yes]
++)
+ 
+-dnl === check for libsamplerate ==========
+ LIBSAMPLERATE=""
++
++if test x$external_sampletrate != xno; then
++
++dnl === check for libsamplerate ==========
+ AC_CHECK_HEADERS(samplerate.h, [
+ 	AC_CHECK_LIB(samplerate, src_new, [
+ 		LIBSAMPLERATE="-lsamplerate"	
+ 		AC_DEFINE(HAVE_LIBSAMPLERATE,1,[defined if you have libsamplerate library and header])
+ 	])
+ ])
++
++fi
++
+ AC_SUBST(LIBSAMPLERATE)
+ AM_CONDITIONAL(compile_libsamplerate, [test -z "$LIBSAMPLERATE"])
+ 
diff --git a/app-cdr/k3b/k3b-0.11.18-r1.ebuild b/app-cdr/k3b/k3b-0.11.18-r1.ebuild
new file mode 100644
index 000000000000..8bcdfce752e7
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.11.18-r1.ebuild
@@ -0,0 +1,109 @@
+# 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.18-r1.ebuild,v 1.1 2005/01/13 13:29:32 greg_g 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 kde oggvorbis mad flac encode"
+
+DEPEND="kde? ( >=kde-base/kdebase-3.1 )
+	>=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 )
+	arts? ( kde-base/arts )"
+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
+		  !amd64? ( <media-video/transcode-0.6.12 )
+		  media-video/vcdimager )"
+
+# for the configure.in.in patch
+DEPEND="${DEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+need-kde 3.1
+
+I18N="${PN}-i18n-${PV%.*}"
+
+# These are the languages and translated documentation supported by k3b as of 
+# version 0.11.13. 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 pt_BR 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}/${P/8/7}-noarts.patch
+	epatch ${FILESDIR}/${P}-configure-libsamplerate.patch
+
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local _S=${S}
+	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) $(use_with arts)"
+	myconf="${myconf} --without-external-libsamplerate"
+
+	# 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 and icon
+	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/
+	dodir /usr/share/pixmaps
+	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
+}
+
+pkg_postinst() {
+	echo ""
+	einfo "Note that k3b will report problems regarding the permissions of cdrecord"
+	einfo "and cdrdao, and will suggest some changes for your system. You are free"
+	einfo "to follow those advices, note nonetheless that on a default Gentoo install"
+	einfo "k3b should run fine when you are in the cdrom and cdrw group."
+	echo ""
+}