Add fedora patch to fix libao crashes, see bug #116290.

Package-Manager: portage-2.1_pre1

5 files changed, 143 insertions, 17 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 74dcaf4ab559..1b090e2d4428 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.198 2005/12/10 18:03:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.199 2005/12/21 18:24:49 flameeyes Exp $
+
+*arts-3.5.0-r1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/arts-1.5.0-check_tmp_dir.patch, +arts-3.5.0-r1.ebuild:
+  Add fedora patch to fix libao crashes, see bug #116290.
 
   10 Dec 2005; Bryan Østergaard <kloeri@gentoo.org arts-3.4.3.ebuild:
   Stable on alpha, bug 112842.
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index d319819dddae..7194170c8a7f 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,31 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1c06e765ae17279e2ef899fcc49a345f ChangeLog 25408
-MD5 ad7ec1a9b9085bf4d82fe297852418f8 arts-3.5.0.ebuild 3019
-MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
+MD5 f363a0b323669ea70cd9535c98016c12 ChangeLog 25617
 MD5 b36369fdd08721cbc99d9fd94fc36f8b arts-1.3.2-r1.ebuild 2639
+MD5 2a34bacb418d79b24ba8824d8b5ead47 arts-1.3.2.ebuild 2764
 MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
 MD5 07cea7ec7b7786f9bbb715938635727a arts-3.4.3.ebuild 2935
-MD5 2a34bacb418d79b24ba8824d8b5ead47 arts-1.3.2.ebuild 2764
-MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r2 63
-MD5 aee14037bb0dcd09b7dfcb784e7ad12c files/digest-arts-3.4.2 63
-MD5 075bf36b46babf9e79102028402d85a4 files/arts-1.5.0-bindnow.patch 795
-MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418
-MD5 5fa50e6520e137f4731eea03a5a644ea files/arts-3.4.1-cpu-overload.patch 1371
-MD5 0a8674e9c6e95640520c60bbae2156b7 files/digest-arts-3.5.0 63
+MD5 107c864aa12ad528dc1776cf3ac50c60 arts-3.5.0-r1.ebuild 3136
+MD5 ad7ec1a9b9085bf4d82fe297852418f8 arts-3.5.0.ebuild 3019
 MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
-MD5 61d9c5cbe910f57e3dbf0c9ee58d8a38 files/digest-arts-3.4.3 63
 MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
+MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418
+MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
+MD5 075bf36b46babf9e79102028402d85a4 files/arts-1.5.0-bindnow.patch 795
+MD5 c360f7144a248f6a74a69de51173ffc1 files/arts-1.5.0-check_tmp_dir.patch 537
 MD5 c0838be4fcac1f2a9f9efd922b4b6d8d files/arts-3.4.1-configure.patch 4429
+MD5 5fa50e6520e137f4731eea03a5a644ea files/arts-3.4.1-cpu-overload.patch 1371
 MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63
-MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
 MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2-r1 63
+MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r2 63
+MD5 aee14037bb0dcd09b7dfcb784e7ad12c files/digest-arts-3.4.2 63
+MD5 61d9c5cbe910f57e3dbf0c9ee58d8a38 files/digest-arts-3.4.3 63
+MD5 0a8674e9c6e95640520c60bbae2156b7 files/digest-arts-3.5.0 63
+MD5 0a8674e9c6e95640520c60bbae2156b7 files/digest-arts-3.5.0-r1 63
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDmybIugEuf3OQ0akRArFrAJ9Z11KBY6UEVPfAJd4rGhucz9l1MwCfSgum
-ZeEJVQKcZc+kwWWSjM9mM5s=
-=ozLd
+iD8DBQFDqZ4JAiZjviIA2XgRAtjVAJ4tCS/QrW0Sz62gDSuKZAE+FGj9mQCfU4qb
+7Ez5UAt1gYxZRO/WPoYWAa4=
+=i6Uc
 -----END PGP SIGNATURE-----
diff --git a/kde-base/arts/arts-3.5.0-r1.ebuild b/kde-base/arts/arts-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..8041d2a5fdf7
--- /dev/null
+++ b/kde-base/arts/arts-3.5.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0-r1.ebuild,v 1.1 2005/12/21 18:24:49 flameeyes Exp $
+
+inherit kde flag-o-matic eutils
+set-kdedir 3.5
+
+MY_PV=1.5.0
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
+HOMEPAGE="http://multimedia.kde.org/"
+#SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="mirror://kde/stable/3.5/src/${PN}-${MY_PV}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa esd artswrappersuid jack mp3 nas vorbis"
+
+RDEPEND="$(qt_min_version 3.3)
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libogg
+	          media-libs/libvorbis )
+	esd? ( media-sound/esound )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	mp3? ( media-libs/libmad )
+	nas? ( media-libs/nas )
+	media-libs/audiofile"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.5.0-bindnow.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+	local nosspflags
+
+	nosspflags="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+		${S}/mcopidl/Makefile.am
+	
+	# Fix libao/gaim problems with aRTs. See bug #116290.
+	epatch "${FILESDIR}/${PN}-${MY_PV}-check_tmp_dir.patch"
+}
+
+src_compile() {
+	myconf="$(use_enable alsa) $(use_enable vorbis)
+	        $(use_enable mp3 libmad) $(use_with jack)
+	        $(use_with esd) $(use_with nas)
+		--with-audiofile --without-mas"
+
+	#fix bug 13453
+	filter-flags -foptimize-sibling-calls
+
+	#fix bug 41980
+	use sparc && filter-flags -fomit-frame-pointer
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# moved here from kdelibs so that when arts is installed
+	# without kdelibs it's still in the path.
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	dodir /etc/env.d
+echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/45kdepaths-3.5 # number goes down with version upgrade
+
+	# used for realtime priority, but off by default as it is a security hazard
+	use artswrappersuid && chmod u+s ${D}/${PREFIX}/bin/artswrapper
+}
+
+pkg_postinst() {
+	if ! use artswrappersuid ; then
+		einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
+		einfo "and so avoid possible skips in sound. However, on untrusted systems this"
+		einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
+		einfo "priority, and so is off by default. See bug #7883."
+		einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
+	fi
+}
diff --git a/kde-base/arts/files/arts-1.5.0-check_tmp_dir.patch b/kde-base/arts/files/arts-1.5.0-check_tmp_dir.patch
new file mode 100644
index 000000000000..a18f0ea09a91
--- /dev/null
+++ b/kde-base/arts/files/arts-1.5.0-check_tmp_dir.patch
@@ -0,0 +1,17 @@
+--- arts-1.5.0/mcop/mcoputils.cc.orig	2005-12-19 20:19:50.000000000 +0100
++++ arts-1.5.0/mcop/mcoputils.cc	2005-12-19 20:18:18.000000000 +0100
+@@ -46,7 +46,13 @@
+   result = lstat(tmp_dir, &stat_buf);
+   if ((result == -1) && (errno == ENOENT))
+   {
+-    return 1;
++    result = mkdir(tmp_dir, 0700);
++    if (result == -1)
++    {
++       arts_warning("Error: Can not create directory \"%s\".\n", tmp_dir);
++       return 1;
++    }
++    result = stat(tmp_dir, &stat_buf);
+   }
+   if ((result == -1) || (!S_ISDIR(stat_buf.st_mode)))
+   {
diff --git a/kde-base/arts/files/digest-arts-3.5.0-r1 b/kde-base/arts/files/digest-arts-3.5.0-r1
new file mode 100644
index 000000000000..340c8b7ef28f
--- /dev/null
+++ b/kde-base/arts/files/digest-arts-3.5.0-r1
@@ -0,0 +1 @@
+MD5 e90a32ee47d5cdc51fe1b7f6f6c0df63 arts-1.5.0.tar.bz2 949415