From: Tony Vroon Date: Sun, 19 Dec 2004 15:05:02 +0000 (+0000) Subject: Upstream patch closes #73297, mp3-support now USE-flag, took maintainership. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23806ddbdd520c7d0bbf1194a0f990dafcb6f0fa;p=gentoo.git Upstream patch closes #73297, mp3-support now USE-flag, took maintainership. --- diff --git a/media-sound/beep-media-player/ChangeLog b/media-sound/beep-media-player/ChangeLog index f06d0348ecc8..4317ebcaa680 100644 --- a/media-sound/beep-media-player/ChangeLog +++ b/media-sound/beep-media-player/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/beep-media-player # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.30 2004/12/17 17:29:43 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/ChangeLog,v 1.31 2004/12/19 15:05:02 chainsaw Exp $ + +*beep-media-player-0.9.7-r1 (19 Dec 2004) + + 19 Dec 2004; Tony Vroon metadata.xml, + +files/0.9.7-noclick-resize.patch, +beep-media-player-0.9.7-r1.ebuild: + Added upstream patch for playlist doubleclick segfault, closes bug #73297. + MP3 support now a USE-flag. Took maintainership. 17 Dec 2004; Tony Vroon beep-media-player-0.9.7.ebuild: diff --git a/media-sound/beep-media-player/Manifest b/media-sound/beep-media-player/Manifest index 8a6e8cb09361..749259812bcf 100644 --- a/media-sound/beep-media-player/Manifest +++ b/media-sound/beep-media-player/Manifest @@ -1,9 +1,12 @@ +MD5 01164922058b1e31b18fe78e859af766 beep-media-player-0.9.7-r1.ebuild 2116 MD5 15863538ed0624548b6982c3cbb726b4 beep-media-player-0.9.7_rc2-r3.ebuild 2527 MD5 1d166a8365ae392c30b1abbf86db5e75 beep-media-player-0.9.7.ebuild 2059 -MD5 52d4752340473b2af9fd70d5bcd3af63 ChangeLog 5714 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +MD5 b21179ec9ad83fc7901995a1ffa2f423 ChangeLog 6021 +MD5 319fe8f45b51a2d31f8d4e9a4071ca10 metadata.xml 248 MD5 3e05152668a0fcdce073aa47702bd463 files/beep-media-player-0.9.7_rc2-includefix.patch 329 +MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7-r1 62 MD5 27cf6516ed075a139579b1c439e9bd90 files/beep-media-player-0.9.7_rc2-mime.patch 587 MD5 b7d99875975dc75e79760f82bbeaf790 files/digest-beep-media-player-0.9.7_rc2-r3 65 MD5 e0224d7dcc5a2cb1af6ea6b18a6daea8 files/beep-config 3347 +MD5 533bcd69c3357e3b6dd5b3a49afbb6bf files/0.9.7-noclick-resize.patch 974 MD5 8b9a3f5a01668b72272dc2f8b2969659 files/digest-beep-media-player-0.9.7 62 diff --git a/media-sound/beep-media-player/beep-media-player-0.9.7-r1.ebuild b/media-sound/beep-media-player/beep-media-player-0.9.7-r1.ebuild new file mode 100644 index 000000000000..d675f5a06992 --- /dev/null +++ b/media-sound/beep-media-player/beep-media-player-0.9.7-r1.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/beep-media-player/beep-media-player-0.9.7-r1.ebuild,v 1.1 2004/12/19 15:05:02 chainsaw Exp $ + +IUSE="nls gnome mp3 oggvorbis alsa oss esd mmx old-eq" + +inherit flag-o-matic eutils + +MY_PN="bmp" +MY_P=bmp-${PV/_/} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="Beep Media Player" +HOMEPAGE="http://beepmp.sourceforge.net/" +SRC_URI="mirror://sourceforge/beepmp/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa" + +RDEPEND="app-arch/unzip + >=x11-libs/gtk+-2.4 + >=x11-libs/pango-1.2 + >=dev-libs/libxml-1.8.15 + >=gnome-base/libglade-2.3.1 + esd? ( >=media-sound/esound-0.2.30 ) + oggvorbis? ( >=media-libs/libvorbis-1.0 ) + alsa? ( >=media-libs/alsa-lib-1.0 ) + gnome? ( >=gnome-base/gnome-vfs-2.6.0 + >=gnome-base/gconf-2.6.0 )" + +DEPEND="${RDEPEND} + nls? ( dev-util/intltool )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PV}-noclick-resize.patch +} + +src_compile() { + # Bug #42893 + replace-flags "-Os" "-O2" + + econf \ + --with-dev-dsp=/dev/sound/dsp \ + --with-dev-mixer=/dev/sound/mixer \ + --includedir=/usr/include/beep-media-player \ + `use_with old-eq xmms-eq` \ + `use_enable mmx simd` \ + `use_enable gnome gconf` \ + `use_enable oggvorbis vorbis` \ + `use_enable esd` \ + `use_enable mp3` \ + `use_enable nls` \ + `use_enable oss` \ + `use_enable alsa` \ + || die + + emake || die "make failed" +} + +src_install() { + make DESTDIR="${D}" install || die + + insinto /usr/share/pixmaps + doins icons/bmp.svg + doins beep/beep_logo.xpm + + dosym /usr/include/beep-media-player/bmp /usr/include/beep-media-player/xmms + + # XMMS skin symlinking; bug 70697 + for SKIN in /usr/share/xmms/Skins/* ; do + dosym "$SKIN" /usr/share/bmp/Skins/ + done + + # Plugins want beep-config, this wasn't included + # Note that this one has a special gentoo modification + # to work with xmms-plugin.eclass + dobin ${FILESDIR}/beep-config + + dodoc AUTHORS FAQ NEWS README TODO +} + +pkg_postinst() { + echo + einfo "Your XMMS skins, if any, have been symlinked." + echo +} diff --git a/media-sound/beep-media-player/files/0.9.7-noclick-resize.patch b/media-sound/beep-media-player/files/0.9.7-noclick-resize.patch new file mode 100644 index 000000000000..276ab73fbe06 --- /dev/null +++ b/media-sound/beep-media-player/files/0.9.7-noclick-resize.patch @@ -0,0 +1,22 @@ +--- beep/playlistwin.c.bak Sat Dec 18 22:32:23 2004 ++++ beep/playlistwin.c Sun Dec 19 13:31:39 2004 +@@ -1039,13 +1039,16 @@ + (cfg.playlist_shaded && + event->x >= playlistwin_get_width() - 31 && + event->x < playlistwin_get_width() - 22))) { +- /* resize area */ +- playlistwin_resizing = TRUE; +- gtk_window_begin_resize_drag(GTK_WINDOW(widget), ++ ++ if (event->type != GDK_2BUTTON_PRESS && event->type != GDK_3BUTTON_PRESS) { ++ /* resize area */ ++ playlistwin_resizing = TRUE; ++ gtk_window_begin_resize_drag(GTK_WINDOW(widget), + GDK_WINDOW_EDGE_SOUTH_EAST, + event->button, + event->x + xpos, event->y + ypos, + event->time); ++ } + grab = FALSE; + } + else if (event->button == 1 && REGION_L(12, 37, 29, 11)) { diff --git a/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r1 b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r1 new file mode 100644 index 000000000000..c8dccff861f8 --- /dev/null +++ b/media-sound/beep-media-player/files/digest-beep-media-player-0.9.7-r1 @@ -0,0 +1 @@ +MD5 5d74113f5de3d11a400d1d6c118d41c0 bmp-0.9.7.tar.gz 1974397 diff --git a/media-sound/beep-media-player/metadata.xml b/media-sound/beep-media-player/metadata.xml index e1774e3d9ad7..a025c77c7636 100644 --- a/media-sound/beep-media-player/metadata.xml +++ b/media-sound/beep-media-player/metadata.xml @@ -2,4 +2,8 @@ sound + + chainsaw@gentoo.org + Tony Vroon +