diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-06-07 12:57:47 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-06-07 12:57:47 +0000 |
commit | 67fd840e970945ae33dcb9a407f36bc772c223cc (patch) | |
tree | 92f7d8b1acda59fe6e6d0bf8fab080ba683b180a /kde-base/arts | |
parent | Better support for amd64 multilib (#94872). (diff) | |
download | historical-67fd840e970945ae33dcb9a407f36bc772c223cc.tar.gz historical-67fd840e970945ae33dcb9a407f36bc772c223cc.tar.bz2 historical-67fd840e970945ae33dcb9a407f36bc772c223cc.zip |
Add patch to properly respect USE flags (#81966, #74121). Better support for amd64 multilib (#94872).
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'kde-base/arts')
-rw-r--r-- | kde-base/arts/ChangeLog | 9 | ||||
-rw-r--r-- | kde-base/arts/Manifest | 27 | ||||
-rw-r--r-- | kde-base/arts/arts-3.4.1-r1.ebuild | 90 | ||||
-rw-r--r-- | kde-base/arts/files/arts-3.4.1-configure.patch | 148 | ||||
-rw-r--r-- | kde-base/arts/files/digest-arts-3.4.1-r1 | 1 |
5 files changed, 262 insertions, 13 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog index ab5265ef555f..d2ab1e4b189f 100644 --- a/kde-base/arts/ChangeLog +++ b/kde-base/arts/ChangeLog @@ -1,6 +1,13 @@ # 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.161 2005/05/26 08:25:23 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.162 2005/06/07 12:57:47 greg_g Exp $ + +*arts-3.4.1-r1 (07 Jun 2005) + + 07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> + +files/arts-3.4.1-configure.patch, +arts-3.4.1-r1.ebuild: + Add patch to properly respect USE flags (#81966, #74121). Better support for + amd64 multilib (#94872). 26 May 2005; Gregorio Guidi <greg_g@gentoo.org> arts-3.4.1.ebuild: Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into 'mp3' (#94045). diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest index 6ce8439fce80..c741d9f305b3 100644 --- a/kde-base/arts/Manifest +++ b/kde-base/arts/Manifest @@ -1,18 +1,21 @@ -MD5 bce6432bffc972dcb98de5ebbadf9855 arts-3.4.1.ebuild 2539 -MD5 07cd89a1f6dc0185f2be1e585b4a7f02 arts-1.3.2.ebuild 3184 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 MD5 1d102ee708f560ad086a3e162fd71876 arts-1.3.2-r1.ebuild 3059 MD5 28e7317bf4a62118bb703e001698fc43 arts-3.4.0.ebuild 2542 +MD5 73c057ac45bc73cb2527340e97ba9539 ChangeLog 20887 +MD5 f0db69f7e0bced7371fead1a2cb97d33 arts-3.4.1-r1.ebuild 2766 +MD5 bce6432bffc972dcb98de5ebbadf9855 arts-3.4.1.ebuild 2539 MD5 75e0ac21d8f15a07268c3236aad6bba9 arts-1.2.3.ebuild 2821 -MD5 efe2e55b9a4764892466d83b1f65f5c1 ChangeLog 20640 -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448 -MD5 185a4720c0e94a1546ee383016fc3e3c files/arts-vorbis-fix.dif 1136 -MD5 ac0526184e3193af65a2a8aa7fd5feab files/digest-arts-1.2.3 63 -MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63 -MD5 2e274d4c1c743a9783cb4ed64910ee64 files/digest-arts-3.4.0 64 -MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1 63 -MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571 +MD5 07cd89a1f6dc0185f2be1e585b4a7f02 arts-1.3.2.ebuild 3184 MD5 e78db892e7b447f86fab2ea9503a3a3d files/arts-1.2.3-buffer.patch 745 -MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694 +MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1 63 MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2-r1 63 +MD5 ac0526184e3193af65a2a8aa7fd5feab files/digest-arts-1.2.3 63 +MD5 c0838be4fcac1f2a9f9efd922b4b6d8d files/arts-3.4.1-configure.patch 4429 +MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694 +MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63 MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418 +MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571 +MD5 185a4720c0e94a1546ee383016fc3e3c files/arts-vorbis-fix.dif 1136 +MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448 +MD5 2e274d4c1c743a9783cb4ed64910ee64 files/digest-arts-3.4.0 64 +MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r1 63 diff --git a/kde-base/arts/arts-3.4.1-r1.ebuild b/kde-base/arts/arts-3.4.1-r1.ebuild new file mode 100644 index 000000000000..fa95af5944e2 --- /dev/null +++ b/kde-base/arts/arts-3.4.1-r1.ebuild @@ -0,0 +1,90 @@ +# 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.4.1-r1.ebuild,v 1.1 2005/06/07 12:57:47 greg_g Exp $ + +inherit kde flag-o-matic eutils +set-qtdir 3 +set-kdedir 3.4 + +MY_PV=${PV/#3/1} +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" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.4" +KEYWORDS="~x86 ~amd64 ~ia64 ~ppc64 ~ppc ~sparc ~sparc ~ppc ~ppc64 ~ia64" +IUSE="alsa esd artswrappersuid jack mp3 hardened vorbis" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + vorbis? ( media-libs/libvorbis media-libs/libogg ) + esd? ( media-sound/esound ) + jack? ( media-sound/jack-audio-connection-kit ) + mp3? ( media-libs/libmad ) + media-libs/audiofile + >=dev-libs/glib-2 + >=x11-libs/qt-3.3" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + kde_src_unpack + epatch "${FILESDIR}/${P}-configure.patch" + epatch ${FILESDIR}/arts-1.3.2-alsa-bigendian.patch + + if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then + epatch ${FILESDIR}/arts-1.4-mcopidl.patch + fi + + # for the configure patch + make -f admin/Makefile.common || die +} + +src_compile() { + myconf="$(use_enable alsa) $(use_enable vorbis) + $(use_enable mp3 libmad) $(use_with jack) + $(use_with esd) --with-audiofile + --without-nas --without-mas" + + #fix bug 13453 + filter-flags -foptimize-sibling-calls + + #fix bug 41980 + use sparc && filter-flags -fomit-frame-pointer + + 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/46kdepaths-3.4 # 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-3.4.1-configure.patch b/kde-base/arts/files/arts-3.4.1-configure.patch new file mode 100644 index 000000000000..1b424c947055 --- /dev/null +++ b/kde-base/arts/files/arts-3.4.1-configure.patch @@ -0,0 +1,148 @@ +diff -Nur arts-1.4.1.orig/configure.in.in arts-1.4.1/configure.in.in +--- arts-1.4.1.orig/configure.in.in 2005-05-23 13:28:37.000000000 +0200 ++++ arts-1.4.1/configure.in.in 2005-06-05 21:54:05.000000000 +0200 +@@ -242,7 +242,6 @@ + arts_audiolib_found=yes + ]) + fi +- AM_CONDITIONAL(HAVE_WAVSUPPORT, test "x$arts_audiolib_found" = "xyes") + AC_SUBST(LIBAUDIOFILE) + AC_SUBST(LIBAUDIOFILE_LDFLAGS) + AC_LANG_RESTORE +@@ -491,12 +490,85 @@ + ]) + + dnl call the tests +-AC_CHECK_LIBAUDIOIO +-AC_CHECK_LIBAUDIONAS +-AC_CHECK_LIBESD +-AC_CHECK_LIBAUDIOFILE +-AC_CHECK_SGILIBAUDIO +-AC_CHECK_LIBMAS ++AC_ARG_WITH(libaudioio, ++ [AS_HELP_STRING(--with-libaudioio, ++ [enable support for libaudioio @<:@default=check@:>@])], ++ [], with_libaudioio=check) ++ ++if test "x$with_libaudioio" != xno; then ++ AC_CHECK_LIBAUDIOIO ++ ++ if test "x$with_libaudioio" != xcheck && test -z "$LIBAUDIOIO"; then ++ AC_MSG_FAILURE([--with-libaudioio was given, but test for libaudioio failed]) ++ fi ++fi ++ ++AC_ARG_WITH(nas, ++ [AS_HELP_STRING(--with-nas, ++ [enable support for NAS @<:@default=check@:>@])], ++ [], with_nas=check) ++ ++if test "x$with_nas" != xno; then ++ AC_CHECK_LIBAUDIONAS ++ ++ if test "x$with_nas" != xcheck && test -z "$LIBAUDIONAS"; then ++ AC_MSG_FAILURE([--with-nas was given, but test for NAS failed]) ++ fi ++fi ++ ++AC_ARG_WITH(esd, ++ [AS_HELP_STRING(--with-esd, ++ [enable support for EsounD @<:@default=check@:>@])], ++ [], with_esd=check) ++ ++if test "x$with_esd" != xno; then ++ AC_CHECK_LIBESD ++ ++ if test "x$with_esd" != xcheck && test -z "$LIBESD"; then ++ AC_MSG_FAILURE([--with-esd was given, but test for EsounD failed]) ++ fi ++fi ++ ++AC_ARG_WITH(audiofile, ++ [AS_HELP_STRING(--with-audiofile, ++ [enable support for audiofile @<:@default=check@:>@])], ++ [], with_audiofile=check) ++ ++if test "x$with_audiofile" != xno; then ++ AC_CHECK_LIBAUDIOFILE ++ ++ if test "x$with_audiofile" != xcheck && test -z "$LIBAUDIOFILE"; then ++ AC_MSG_FAILURE([--with-audiofile was given, but test for audiofile failed]) ++ fi ++fi ++AM_CONDITIONAL(HAVE_WAVSUPPORT, test -n "$LIBAUDIOFILE") ++ ++AC_ARG_WITH(sgilibaudio, ++ [AS_HELP_STRING(--with-sgilibaudio, ++ [enable support for SGI libaudio @<:@default=check@:>@])], ++ [], with_sgilibaudio=check) ++ ++if test "x$with_sgilibaudio" != xno; then ++ AC_CHECK_SGILIBAUDIO ++ ++ if test "x$with_sgilibaudio" != xcheck && test -z "$SGILIBAUDIO"; then ++ AC_MSG_FAILURE([--with-sgilibaudio was given, but test for SGI libaudio failed]) ++ fi ++fi ++ ++AC_ARG_WITH(mas, ++ [AS_HELP_STRING(--with-mas, ++ [enable support for MAS @<:@default=check@:>@])], ++ [], with_mas=check) ++ ++if test "x$with_mas" != xno; then ++ AC_CHECK_LIBMAS ++ ++ if test "x$with_mas" != xcheck && test -z "$LIBMAS"; then ++ AC_MSG_FAILURE([--with-mas was given, but test for MAS failed]) ++ fi ++fi ++ + AC_CHECK_REALTIME_SCHED + AC_CHECK_GETDOMAINNAME + AC_CHECK_IOCTL_TYPE +@@ -704,20 +776,31 @@ + AC_SUBST(GLIB_LIBADD) + AC_SUBST(GLIB_LDFLAGS) + +-AC_MSG_CHECKING(for Jack Audio Connection Kit) +-if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then +- JACK_CFLAGS="`$PKG_CONFIG --cflags jack`" +- JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`" +- JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`" +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_LIBJACK, 1, +- [Define if you have libjack (required if you want Jack support)]) +-else +- AC_MSG_RESULT(not installed) ++AC_ARG_WITH(jack, ++ [AS_HELP_STRING(--with-jack, ++ [enable support for Jack @<:@default=check@:>@])], ++ [], with_jack=check) ++ ++if test "x$with_jack" != xno; then ++ AC_MSG_CHECKING(for Jack Audio Connection Kit) ++ if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then ++ JACK_CFLAGS="`$PKG_CONFIG --cflags jack`" ++ JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`" ++ JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`" ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_LIBJACK, 1, ++ [Define if you have libjack (required if you want Jack support)]) ++ else ++ AC_MSG_RESULT(not installed) ++ fi ++ AC_SUBST(JACK_CFLAGS) ++ AC_SUBST(JACK_LIBADD) ++ AC_SUBST(JACK_LDFLAGS) ++ ++ if test "x$with_jack" != xcheck && test -z "$JACK_LIBADD"; then ++ AC_MSG_FAILURE([--with-jack was given, but test for Jack failed]) ++ fi + fi +-AC_SUBST(JACK_CFLAGS) +-AC_SUBST(JACK_LIBADD) +-AC_SUBST(JACK_LDFLAGS) + + dnl OpenBSD requires an -lossaudio and soundcard.h to provide OSS audio I/O + AC_CHECK_HEADERS(soundcard.h) diff --git a/kde-base/arts/files/digest-arts-3.4.1-r1 b/kde-base/arts/files/digest-arts-3.4.1-r1 new file mode 100644 index 000000000000..86097731e235 --- /dev/null +++ b/kde-base/arts/files/digest-arts-3.4.1-r1 @@ -0,0 +1 @@ +MD5 f632984ddc976a1e4243718af54559ee arts-1.4.1.tar.bz2 975066 |