From 1b3da29b1abb492ea614d373760c256198497b69 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 1 Mar 2004 05:27:35 +0000 Subject: Fixed .desktop menu items. Updated dtd patch to support multiple file selection. --- media-sound/xmms/ChangeLog | 9 +- media-sound/xmms/Manifest | 2 + media-sound/xmms/files/digest-xmms-1.2.10-r1 | 3 + media-sound/xmms/files/xmms.desktop | 21 +++ media-sound/xmms/xmms-1.2.10-r1.ebuild | 196 +++++++++++++++++++++++++++ 5 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 media-sound/xmms/files/digest-xmms-1.2.10-r1 create mode 100644 media-sound/xmms/files/xmms.desktop create mode 100644 media-sound/xmms/xmms-1.2.10-r1.ebuild (limited to 'media-sound') diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog index 15017920b191..c686dff5e024 100644 --- a/media-sound/xmms/ChangeLog +++ b/media-sound/xmms/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/xmms # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.107 2004/02/27 03:08:07 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.108 2004/03/01 05:27:35 eradicator Exp $ + +*xmms-1.2.10-r1 (29 Feb 2004) + + 29 Feb 2004; Jeremy Huddleston + xmms-1.2.10-r1.ebuild, files/xmms.desktop: + Fixed .desktop menu items. Updated dtd patch to support multiple file + selection. 26 Feb 2004; Jeremy Huddleston xmms-1.2.10.ebuild: Fix off-by-one error re-introduced by dtd diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest index 0e17f24c1662..c5ff3aea7e03 100644 --- a/media-sound/xmms/Manifest +++ b/media-sound/xmms/Manifest @@ -4,9 +4,11 @@ MD5 dad3d29a676a8a92a114d7b8a87630a2 xmms-1.2.10.ebuild 5854 MD5 4aa851cff9269f70c7f2384a817a7484 xmms-1.2.7-r25.ebuild 5890 MD5 c49098100b13dff83d4fd2af0272cf46 xmms-1.2.9-r1.ebuild 5532 MD5 a6e5eec3c2924dbd5c93da19ae9b6ed3 xmms-1.2.8-r4.ebuild 5300 +MD5 34b9a300d30d08902dbcce611ce89940 xmms-1.2.10-r1.ebuild 5722 MD5 898b8e32047da1b1ab6fcdd211193187 ChangeLog 21230 MD5 98dd8e955eff0652fc6e0113059e2d12 xmms-1.2.8-r3.ebuild 5020 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257 +MD5 5c7a4199a52efbde90cefb1087dbbb57 files/digest-xmms-1.2.10-r1 219 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r23 211 MD5 20b60b9c94a35974970dafd0bbd050c4 files/digest-xmms-1.2.7-r25 211 MD5 924d785f5c63c99d5c20c0853c1a719b files/digest-xmms-1.2.8-r3 216 diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r1 b/media-sound/xmms/files/digest-xmms-1.2.10-r1 new file mode 100644 index 000000000000..8189bb9723c4 --- /dev/null +++ b/media-sound/xmms/files/digest-xmms-1.2.10-r1 @@ -0,0 +1,3 @@ +MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265 +MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839 +MD5 29f704d7e587f76f6e1faa10042d1320 xmms-1.2.10-gentoo-patches-0.3.tar.bz2 106299 diff --git a/media-sound/xmms/files/xmms.desktop b/media-sound/xmms/files/xmms.desktop new file mode 100644 index 000000000000..7c153aa74631 --- /dev/null +++ b/media-sound/xmms/files/xmms.desktop @@ -0,0 +1,21 @@ +[Desktop Entry] +Name=XMMS +Comment=X Multimedia System +comment[az]=X Multimedya Sistemi +comment[ca]=Sistema Multimèdia per a X +comment[cs]=Multimediální pøehrávaè +comment[es]=Sistema Multimedia para X +comment[gl]=Sistema Multimedia para X +comment[hr]=X Multimedijski Sustav +comment[nn]=X Multimedia-system +comment[pt_BR]=X Multimedia System +comment[ro]=X MultiMedia Sistem +comment[th]=ÃкºÁÑŵÔÁÕà´Õº¹ X +comment[tr]=X Multimedya Sistem +comment[zh_TW]=X ¦h´CÅé¨t²Î +Encoding=Legacy-Mixed +Exec=/usr/bin/xmms +Icon=mini/xmms_mini.xpm +MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg +Terminal=0 +Type=Application;AudioVideo diff --git a/media-sound/xmms/xmms-1.2.10-r1.ebuild b/media-sound/xmms/xmms-1.2.10-r1.ebuild new file mode 100644 index 000000000000..6bf67fb095e8 --- /dev/null +++ b/media-sound/xmms/xmms-1.2.10-r1.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2004 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.10-r1.ebuild,v 1.1 2004/03/01 05:27:35 eradicator Exp $ + +inherit flag-o-matic eutils + +PATCHVER="0.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" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64" +IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 cjk alsa" + +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 ) + !media-plugins/xmms-alsa + oggvorbis? ( >=media-libs/libvorbis-1.0 )" + +RDEPEND="${DEPEND} + directfb? ( dev-libs/DirectFB ) + app-arch/unzip" + +#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 + # Newer dtd code uses a balanced tree... Uncomment llist one to tr older version. Leaving in + # until tested. + # epatch ${PATCHDIR}/${P}-dtd-llist.patch + epatch ${PATCHDIR}/${P}-dtd-baltree.patch + + # Fix ansi C fubar so that it compiles with less-forgiving gcc2 + epatch ${PATCHDIR}/${P}-id3v2edit.patch + + # Patch to allow external programmes to have the "jump to" dialog box + epatch ${PATCHDIR}/${P}-jump.patch + + # Save playlist, etc on SIGTERM and SIGINT, bug #13604. + epatch ${PATCHDIR}/${P}-sigterm.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 + epatch ${PATCHDIR}/${P}-mpg123j.patch + else + # add recode patch http://sourceforge.net/projects/rusxmms/ + epatch ${PATCHDIR}/${P}-recode-csa27.patch + epatch ${PATCHDIR}/${P}-recode-csa27.gcc2.patch + fi + + if [ ! -f ${S}/config.rpath ] ; then + touch ${S}/config.rpath + chmod +x ${S}/config.rpath + 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 + + export WANT_AUTOCONF=2.5 + export WANT_AUTOMAKE=1.7 + for x in . libxmms ; do + cd ${S}/${x} + + ebegin "Running aclocal in ${S}/${x}" + aclocal + eend $? + + ebegin "Running automake in ${S}/${x}" + automake --gnu --add-missing --include-deps + retval=$? + eend $retval + + if [ $retval -ne 0 ]; then + exit 1; + fi + done +} + +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 + use mips && 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` \ + ${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 + + 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 +} + +pkg_postinst() { + echo + einfo "If you have been using the xmms-sid plugin before," + einfo "it would be a good idea to re-emerge it now, to have" + einfo "the additional features introduced by the xmms-songpos patch" + einfo "which let's you select one of several tunes sometimes included" + einfo "in a single .sid file using the song-position slider." + echo + einfo "If you enjoy the dtd (Dynamic Taste Detection) patch, please" + einfo "visit the url below and vote for this patch's inclusion in" + einfo "main-line xmms." + einfo "http://bugs.xmms.org/show_bug.cgi?id=756" +} -- cgit v1.2.3-65-gdbad