diff options
author | Mike Frysinger <vapier@gentoo.org> | 2002-11-15 00:39:27 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2002-11-15 00:39:27 +0000 |
commit | 40a418f127faf155d10de0a41bda13617bccf83e (patch) | |
tree | 6714b277c7454a314b3582e16f1e9aa7ebe79202 /media-sound/xmms | |
parent | Fixes #10721. (diff) | |
download | gentoo-2-40a418f127faf155d10de0a41bda13617bccf83e.tar.gz gentoo-2-40a418f127faf155d10de0a41bda13617bccf83e.tar.bz2 gentoo-2-40a418f127faf155d10de0a41bda13617bccf83e.zip |
fix for #10309
Diffstat (limited to 'media-sound/xmms')
-rw-r--r-- | media-sound/xmms/ChangeLog | 15 | ||||
-rw-r--r-- | media-sound/xmms/files/digest-xmms-1.2.7-r15 | 2 | ||||
-rw-r--r-- | media-sound/xmms/xmms-1.2.7-r15.ebuild | 172 |
3 files changed, 184 insertions, 5 deletions
diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 3a91b0319cbf..451e7b92b7a0 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,23 +1,28 @@ # ChangeLog for media-sound/xmms # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.30 2002/10/17 21:08:49 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.31 2002/11/15 00:39:27 vapier Exp $ + +*xmms-1.2.7-r15 (14 Nov 2002) + + 14 Nov 2002; Mike Frysinger <vapier@gentoo.org> : + Made src_install delete ${D}/usr/lib/xmms/Input/libidcin.so. + It causes ppc users to crash and the xmms developers have removed + it from the distribution anyways. *xmms-1.2.7-r14 (17 Oct 2002) 17 Oct 2002; Martin Schlemmer <azarah@gentoo.org> : - Add back the patch to link xmms against libstdc++, as some plugins need it. *xmms-1.2.7-r13 (23 Aug 2002) 12 Oct 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r13.ebuild : - Added directfb to IUSE. XMMS doesn't need it, but will link to it if present, so it needs to be recompiled if DirectFB is updated. - 16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> xmms-1.2.7-r13.ebuild : Added - sparc/sparc64 keywords. Revamped ChangeLog layout. + 16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> xmms-1.2.7-r13.ebuild : + Added sparc/sparc64 keywords. Revamped ChangeLog layout. 23 Aug 2002; Seemant Kulleen <seemant@gentoo.org> xmms-1.2.7-r13.ebuild files/digest-xmms-1.2.7-r13 : Removed all avi stuff from xmms ebuild, diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r15 b/media-sound/xmms/files/digest-xmms-1.2.7-r15 new file mode 100644 index 000000000000..89cc7eba5fd4 --- /dev/null +++ b/media-sound/xmms/files/digest-xmms-1.2.7-r15 @@ -0,0 +1,2 @@ +MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908 +MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990 diff --git a/media-sound/xmms/xmms-1.2.7-r15.ebuild b/media-sound/xmms/xmms-1.2.7-r15.ebuild new file mode 100644 index 000000000000..c6690fb21770 --- /dev/null +++ b/media-sound/xmms/xmms-1.2.7-r15.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r15.ebuild,v 1.1 2002/11/15 00:39:27 vapier Exp $ + +IUSE="xml nls esd gnome opengl mmx oggvorbis 3dnow mikmod directfb" + +inherit libtool flag-o-matic + +filter-flags "-fforce-addr" + +S="${WORKDIR}/${P}" +DESCRIPTION="X MultiMedia System" +SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.gz + mmx? ( http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz )" +HOMEPAGE="http://www.xmms.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 ppc sparc sparc64 alpha" + +DEPEND="app-arch/unzip + =x11-libs/gtk+-1.2* + mikmod? ( >=media-libs/libmikmod-3.1.6 ) + esd? ( >=media-sound/esound-0.2.22 ) + xml? ( >=dev-libs/libxml-1.8.15 ) + gnome? ( <gnome-base/gnome-panel-1.5.0 ) + opengl? ( virtual/opengl ) + oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )" + + +RDEPEND="${DEPEND} + directfb? ( dev-libs/DirectFB ) + nls? ( dev-util/intltool )" + +src_unpack() { + unpack ${P}.tar.gz + + cd ${S} + + # For plugins such as avi4xmms, xmms needs to be linked to libstdcxx. + # + # NOTE: because we change a Makefile.am here, we run auto* at the + # bottom. + # + # WARNING: Do not remove or feel my anger!!! :P + # + patch -p1 <${FILESDIR}/${P}-link-libstdc++.patch || die + + # The following optimisations are ONLY for x86 platform + use x86 && ( \ + # For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations + # + # ( use mmx || use 3dnow ) && \ + # cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die + # + # For you guys who favour this kind of USE flag checking ... this + # is exactly why I do NOT like it, because the actual + # "cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die" + # was not in a subshell, it would ALWAYS fail to build if "mmx" or + # "3dnow" was not in USE, because of the || die at the end. So + # PLEASE, PLEASE test things with all possible USE flags if you use + # this style!!!! Then, if in a subshell, it do not detect if the + # command fails :/ + # + # Azarah - 30 Jun 2002 + # + if use mmx || use 3dnow + then + cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die + fi + ) + + [ ! -f ${S}/config.rpath ] && ( \ + touch ${S}/config.rpath + chmod +x ${S}/config.rpath + ) + + # We run automake and autoconf here else we get a lot of warning/errors. + # I have tested this with gcc-2.95.3 and gcc-3.1. + elibtoolize + echo ">>> Reconfiguring..." + for x in ${S} ${S}/libxmms + do + cd ${x} + aclocal + export WANT_AUTOCONF_2_5=1 + automake --gnu --include-deps Makefile || die + autoconf || die + done +} + +src_compile() { + local myconf="" + + use gnome \ + && myconf="${myconf} --with-gnome" \ + || myconf="${myconf} --without-gnome" + + use 3dnow || use mmx \ + && myconf="${myconf} --enable-simd" \ + || myconf="${myconf} --disable-simd" + + use esd \ + && myconf="${myconf} --enable-esd --enable-esdtest" \ + || myconf="${myconf} --disable-esd --disable-esdtest" + + use mikmod \ + && myconf="${myconf} --enable-mikmod --enable-mikmodtest \ + --with-libmikmod" \ + || myconf="${myconf} --disable-mikmod --disable-mikmodtest \ + --without-libmikmod" + + use opengl \ + && myconf="${myconf} --enable-opengl" \ + || myconf="${myconf} --disable-opengl" + + use oggvorbis \ + && myconf="${myconf} --enable-vorbis --enable-oggtest \ + --enable-vorbistest --with-ogg" \ + || myconf="${myconf} --disable-vorbis --disable-oggtest \ + --disable-vorbistest --without-ogg" + + use xml \ + || myconf="${myconf} --disable-cdindex" + + use nls \ + || myconf="${myconf} --disable-nls" + + econf ${myconf} || die + + emake || die +} + +src_install() { + einstall \ + sysdir=${D}/usr/share/applets/Multimedia \ + GNOME_SYSCONFDIR=${D}/etc || die + + dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO + + dodir /usr/share/xmms/Skins + insinto /usr/share/pixmaps/ + donewins gnomexmms/gnomexmms.xpm xmms.xpm + doins xmms/xmms_logo.xpm + insinto /usr/share/pixmaps/mini + doins xmms/xmms_mini.xpm + + insinto /etc/X11/wmconfig + donewins xmms/xmms.wmconfig xmms + + use gnome && ( \ + insinto /usr/share/gnome/apps/Multimedia + doins xmms/xmms.desktop + dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \ + /usr/share/gnome/apps/Multimedia/xmms.desktop + ) || ( \ + rm ${D}/usr/share/man/man1/gnomexmms* + ) + + # causes segfaults for ppc users #10309 and after talking + # to xmms dev's, they've punted this from the src tree anyways ... + rm -rf ${D}/usr/lib/xmms/Input/libidcin.so +} + +pkg_postrm() { + + if [ -x ${ROOT}/usr/bin/xmms ] && [ ! -d ${ROOT}/usr/share/xmms/Skins ] + then + mkdir -p ${ROOT}/usr/share/xmms/Skins + fi +} + |