From 2b12c5a835670bb1fa594b34ae62496289971e32 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 30 Oct 2004 21:09:40 +0000 Subject: [PATCH] Revision bump and removing from package.mask. Added gcc-4 patch. --- media-sound/xmms/ChangeLog | 8 +- media-sound/xmms/Manifest | 14 +- media-sound/xmms/files/digest-xmms-1.2.10-r7 | 3 - ...t-xmms-1.2.10-r8 => digest-xmms-1.2.10-r9} | 2 +- media-sound/xmms/xmms-1.2.10-r7.ebuild | 225 ------------------ ...1.2.10-r8.ebuild => xmms-1.2.10-r9.ebuild} | 7 +- 6 files changed, 18 insertions(+), 241 deletions(-) delete mode 100644 media-sound/xmms/files/digest-xmms-1.2.10-r7 rename media-sound/xmms/files/{digest-xmms-1.2.10-r8 => digest-xmms-1.2.10-r9} (69%) delete mode 100644 media-sound/xmms/xmms-1.2.10-r7.ebuild rename media-sound/xmms/{xmms-1.2.10-r8.ebuild => xmms-1.2.10-r9.ebuild} (95%) diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 9f1928b8e374..b21420c1d032 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/xmms # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.147 2004/10/24 09:04:15 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.148 2004/10/30 21:09:40 eradicator Exp $ + +*xmms-1.2.10-r9 (30 Oct 2004) + + 30 Oct 2004; Jeremy Huddleston + -xmms-1.2.10-r7.ebuild, -xmms-1.2.10-r8.ebuild, +xmms-1.2.10-r9.ebuild: + Revision bump and removing from package.mask. Added gcc-4 patch. 24 Oct 2004; Jeremy Huddleston xmms-1.2.10-r8.ebuild: diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest index 8af5e5c445d6..57f438fb8b4b 100644 --- a/media-sound/xmms/Manifest +++ b/media-sound/xmms/Manifest @@ -2,20 +2,18 @@ Hash: SHA1 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257 -MD5 0621e2a806f3197dcc45221465e75838 ChangeLog 27087 -MD5 2dfd9ab0c7505ecfe7671a7b6097bf89 xmms-1.2.10-r8.ebuild 3592 +MD5 ffbfb49a533acdbdc53ca8e65a9612a3 ChangeLog 27318 MD5 33180edc5b30f54debff69322fae465a xmms-1.2.8-r4.ebuild 5271 -MD5 2007d20f67e563a3289ef2f5853f84be xmms-1.2.10-r7.ebuild 6560 MD5 e8f74b9f98c9a742f9d9e7559227ef84 xmms-1.2.10-r5.ebuild 5386 -MD5 ca3b76022df666be460464f500138ff8 files/digest-xmms-1.2.10-r7 219 -MD5 f59399824dbee8bc4699eacd5807f3c6 files/digest-xmms-1.2.10-r8 277 +MD5 0b6bfe038d615e5299b7282cc8318639 xmms-1.2.10-r9.ebuild 3638 +MD5 567e6084702a3338a1ddeed984fe7d11 files/digest-xmms-1.2.10-r9 277 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722 MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBfKSLArHZZzCEUG0RAlEsAKCIrWiWxQz3kVwIsW/Wzib3NAB2LgCfWqH2 -e9xnJerKaQajvPXPhGNF3vc= -=nYG4 +iD8DBQFBhAMvArHZZzCEUG0RAj1mAKCHcmKf9lYQ9fV2H1n258h4A8hSewCeLi7k +DrszSuNNCgy+npzfW6G7aCA= +=ht2j -----END PGP SIGNATURE----- diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r7 b/media-sound/xmms/files/digest-xmms-1.2.10-r7 deleted file mode 100644 index a88097175e63..000000000000 --- a/media-sound/xmms/files/digest-xmms-1.2.10-r7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265 -MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839 -MD5 aafd8255d1a03035452039d72a759a09 xmms-1.2.10-gentoo-patches-1.3.tar.bz2 164200 diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r8 b/media-sound/xmms/files/digest-xmms-1.2.10-r9 similarity index 69% rename from media-sound/xmms/files/digest-xmms-1.2.10-r8 rename to media-sound/xmms/files/digest-xmms-1.2.10-r9 index a31c68630385..acbe82684a23 100644 --- a/media-sound/xmms/files/digest-xmms-1.2.10-r8 +++ b/media-sound/xmms/files/digest-xmms-1.2.10-r9 @@ -1,4 +1,4 @@ MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839 -MD5 a65332f18405d9694e0c49404544de0c xmms-1.2.10-gentoo-patches-2.1.3.tar.bz2 349679 +MD5 0de9a0b57d24dbeabd519e529822b6e8 xmms-1.2.10-gentoo-patches-2.1.4.tar.bz2 350727 MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979 diff --git a/media-sound/xmms/xmms-1.2.10-r7.ebuild b/media-sound/xmms/xmms-1.2.10-r7.ebuild deleted file mode 100644 index 00327edd21fc..000000000000 --- a/media-sound/xmms/xmms-1.2.10-r7.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r7.ebuild,v 1.1 2004/10/08 21:55:33 eradicator Exp $ - -IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa oss arts jack sndfile lirc flac" - -inherit flag-o-matic eutils libtool gnuconfig - -PATCHVER="1.3" - -MY_P=${P/_pre/-pre} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="X MultiMedia System" -HOMEPAGE="http://www.xmms.org/" -SRC_URI="http://www.xmms.org/files/1.2.x/${MY_P}.tar.bz2 - mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2 - http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -# Notice to arch maintainers: -# Please test out the plugins listed below in PDEPEND. They should -# work on most of your archs, but haven't been marked yet. -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64" - -DEPEND="=x11-libs/gtk+-1.2* - mikmod? ( >=media-libs/libmikmod-3.1.10 ) - esd? ( >=media-sound/esound-0.2.22 ) - xml? ( >=dev-libs/libxml-1.8.15 ) - opengl? ( virtual/opengl ) - alsa? ( >=media-libs/alsa-lib-0.9.0 ) - oggvorbis? ( >=media-libs/libvorbis-1.0 )" - -RDEPEND="${DEPEND} - directfb? ( dev-libs/DirectFB ) - sys-devel/gettext - app-arch/unzip" - -# USE flags pull in xmms plugins -PDEPEND="!alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( jack? ( media-plugins/xmms-jack ) ) ) ) ) ) - !alpha? ( !ia64? ( !ppc64? ( lirc? ( media-plugins/xmms-lirc ) ) ) ) - !ia64? ( !ppc64? ( arts? ( media-plugins/xmms-arts ) ) ) - !alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( sndfile? ( media-plugins/xmms-sndfile ) ) ) ) ) ) - flac? ( media-libs/flac )" - -#We want these things in DEPEND only -DEPEND="${DEPEND} - nls? ( dev-util/intltool )" -# >=sys-devel/automake-1.7.8 -# >=sys-devel/autoconf-2.58" - -PATCHDIR=${WORKDIR}/patches - -src_unpack() { - unpack ${A} - cd ${S} - - # Add dynamic taste detection patch... - # goto http://bugs.xmms.org/show_bug.cgi?id=756 to vote for its inclusion in mainline xmms - # This patch is no longer included in gentoo xmms due to problems with later versions of glib. - # epatch ${PATCHDIR}/${P}-dtd.patch - - # Fix gcc3.4 C++ problem. See bug #53125 - epatch ${PATCHDIR}/${P}-gcc34.patch - - # Patch to allow external programmes to have the "jump to" dialog box - epatch ${PATCHDIR}/${P}-jump.patch - epatch ${PATCHDIR}/${P}-jumpcl.patch - - # Save playlist, etc on SIGTERM and SIGINT, bug #13604. - epatch ${PATCHDIR}/${P}-sigterm.patch - - # Turn on shoutcast titles by default, bug #62568 - epatch ${PATCHDIR}/${P}-shout-title.patch - - # Patch for mpg123 to convert Japanese character code of MP3 tag info - # the Japanese patch and the Russian one overlap, so its one or the other - if use cjk; then - # id3v2 editing support in mpg123 plugin - epatch ${PATCHDIR}/${P}-id3v2edit.patch - - epatch ${PATCHDIR}/${P}-mpg123j.patch -# elif use unicode; then - else - epatch ${PATCHDIR}/${P}-unicode.patch - epatch ${PATCHDIR}/${P}-unicode-sizefix.patch -# else -# # id3v2 editing support in mpg123 plugin -# epatch ${PATCHDIR}/${P}-id3v2edit.patch -# -# # add recode patch http://sourceforge.net/projects/rusxmms/ -# # epatch ${PATCHDIR}/${P}-recode-csa27.3.dtd.patch -# epatch ${PATCHDIR}/${P}-recode-csa27.3.patch -# epatch ${PATCHDIR}/${P}-recode-csa27.3.regressionFix.patch -# epatch ${PATCHDIR}/${P}-recode-csa27.3.nullTitle.patch -# - fi - - # Add /usr/local/share/xmms/Skins to the search path for skins - epatch ${PATCHDIR}/${P}-fhs-skinsdir.patch - - # This patch passes audio output through the output plugin - # before recording via the diskwriter plugin - # http://forum.xmms.org/viewtopic.php?t=500&sid=c286e1c01fb924a2f81f519969f33764 - epatch ${PATCHDIR}/${P}-diskwriter-audio.patch - - # Patch to enable superior randomised playlists: - epatch ${PATCHDIR}/${P}-random.patch - - # This patch changes the search-bar's behaviour when playing - # sid tunes using xmms-sid plugin. It enables you to select the - # different tunes that are sometimes included in a single .sid file - epatch ${PATCHDIR}/${P}-sid-songpos.patch - - # Bug #45720 ... bugfix when unpausing with alsa - epatch ${PATCHDIR}/${P}-alsa-pause.patch - - # Bug #47761 ... Patch to enable seeking in HTTP streams - epatch ${PATCHDIR}/${P}-stream-seek.patch - - # Bug #55398 ... fix libjoy crash - epatch ${PATCHDIR}/${P}-joycrash.patch - - # Bug #57755 ... don't show in taskbar if status-plugin is enabled - epatch ${PATCHDIR}/${P}-status.patch - - if [ ! -f ${S}/config.rpath ] ; then - touch ${S}/config.rpath - chmod +x ${S}/config.rpath - fi - -# # dtd updates Makefile.am, but not Makefile.in -# export WANT_AUTOCONF=2.5 -# export WANT_AUTOMAKE=1.7 -# for subd in .; do -# cd ${S}/${subd} -# -# ebegin "Running aclocal in ${S}/${subd}" -# aclocal -# eend $? -# -# ebegin "Running automake in ${S}/${subd}" -# automake --gnu --add-missing --include-deps -# retval=$? -# eend $retval -# -# if [ $retval -ne 0 ]; then -# exit 1; -# fi -# done - - elibtoolize -} - -src_compile() { - filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - - local myconf="" - - # Allow configure to detect mipslinux systems - gnuconfig_update - - if use amd64; then - myconf="${myconf} --disable-simd" - else - if use 3dnow || use mmx; then - myconf="${myconf} --enable-simd" - else - myconf="${myconf} --disable-simd" - fi - fi - - use xml || myconf="${myconf} --disable-cdindex" - - econf \ - --with-dev-dsp=/dev/sound/dsp \ - --with-dev-mixer=/dev/sound/mixer \ - `use_enable oggvorbis vorbis` \ - `use_enable oggvorbis oggtest` \ - `use_enable oggvorbis vorbistest` \ - `use_enable esd` \ - `use_enable esd esdtest` \ - `use_enable mikmod` \ - `use_enable mikmod mikmodtest` \ - `use_with mikmod libmikmod` \ - `use_enable opengl` \ - `use_enable nls` \ - `use_enable ipv6` \ - `use_enable oss oss` \ - ${myconf} \ - || die - - emake -j1 || die -} - -src_install() { - make DESTDIR=${D} install || die - - dodoc AUTHORS ChangeLog FAQ NEWS README TODO - - keepdir /usr/share/xmms/Skins - insinto /usr/share/pixmaps/ - donewins xmms/xmms_logo.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 - - # Not installed per bug #47502 - #insinto /usr/share/gnome/apps/Multimedia - #doins ${FILESDIR}/xmms.desktop - insinto /usr/share/applnk/Multimedia - doins ${FILESDIR}/xmms.desktop - insinto /usr/share/applications - doins ${FILESDIR}/xmms.desktop - - # Add the sexy Gentoo Ice skin - insinto /usr/share/xmms/Skins/gentoo_ice - doins ${WORKDIR}/gentoo_ice/* - docinto gentoo_ice - dodoc ${WORKDIR}/README -} diff --git a/media-sound/xmms/xmms-1.2.10-r8.ebuild b/media-sound/xmms/xmms-1.2.10-r9.ebuild similarity index 95% rename from media-sound/xmms/xmms-1.2.10-r8.ebuild rename to media-sound/xmms/xmms-1.2.10-r9.ebuild index 1ee3da02c253..e497064f9cf0 100644 --- a/media-sound/xmms/xmms-1.2.10-r8.ebuild +++ b/media-sound/xmms/xmms-1.2.10-r9.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r8.ebuild,v 1.8 2004/10/25 06:58:08 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r9.ebuild,v 1.1 2004/10/30 21:09:40 eradicator Exp $ IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac mad" inherit flag-o-matic eutils libtool gnuconfig -PATCHVER="2.1.3" +PATCHVER="2.1.4" PATCHDIR="${WORKDIR}/patches" @@ -19,6 +19,7 @@ SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" + # Notice to arch maintainers: # Please test out the plugins listed below in PDEPEND. They should # work on most of your archs, but haven't been marked yet. @@ -46,7 +47,7 @@ PDEPEND="!alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( jack? ( media-plugins/xm !alpha? ( !ia64? ( !ppc64? ( lirc? ( media-plugins/xmms-lirc ) ) ) ) !ia64? ( !ppc64? ( arts? ( media-plugins/xmms-arts ) ) ) !alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( sndfile? ( media-plugins/xmms-sndfile ) ) ) ) ) ) - mad? ( media-plugins/xmms-mad ) + !alpha? ( !hppa? ( !ia64? ( !mips? ( mad? ( media-plugins/xmms-mad ) ) ) ) ) flac? ( media-libs/flac )" src_unpack() { -- 2.26.2