Version bump, with a patch to fix compilation on 64bit platforms.

(Portage version: 2.1_rc4-r2)

4 files changed, 135 insertions, 1 deletions

diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index 2c17acee58c1..debe9e828213 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/bmpx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.33 2006/06/10 01:26:57 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.34 2006/06/19 19:56:11 chutzpah Exp $
+
+*bmpx-0.20_pre1 (19 Jun 2006)
+
+  19 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/bmpx-0.20_pre1-64bit.patch, +bmpx-0.20_pre1.ebuild:
+  Version bump, with a patch to fix compilation on 64bit platforms.
 
   10 Jun 2006; Patrick McLean <chutzpah@gentoo.org>
   -files/bmpx-0.12.9-dbus-fix.patch,
diff --git a/media-sound/bmpx/bmpx-0.20_pre1.ebuild b/media-sound/bmpx/bmpx-0.20_pre1.ebuild
new file mode 100644
index 000000000000..8db4509cc848
--- /dev/null
+++ b/media-sound/bmpx/bmpx-0.20_pre1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.20_pre1.ebuild,v 1.1 2006/06/19 19:56:11 chutzpah Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Next generation Beep Media Player"
+HOMEPAGE="http://www.beep-media-player.org"
+SRC_URI="mirror://sourceforge/beepmp/${PN}-0.20pre1.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa amazon cdparanoia debug flac ffmpeg hal mad nls ogg oss theora vorbis"
+
+DOCS="AUTHORS ChangeLog README NEWS TODO"
+
+S="${WORKDIR}/${PN}-0.20pre1"
+
+DEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.8.8
+	>=x11-libs/pango-1.10.0
+	>=dev-libs/libxml2-2.6.1
+	>=x11-libs/cairo-1.0.2
+	>=x11-libs/startup-notification-0.8
+	>=gnome-base/libglade-2.5.1
+	>=media-libs/taglib-1.4
+	>=media-libs/gstreamer-0.10.8
+	>=media-libs/gst-plugins-base-0.10.8
+	>=media-libs/gst-plugins-good-0.10.3
+	>=media-libs/musicbrainz-2.1.1
+	virtual/fam
+	>=net-misc/neon-0.25.5
+	>=sys-apps/dbus-0.60
+	hal? ( >=sys-apps/hal-0.5.5.1 )
+	dev-libs/boost
+	>=dev-db/sqlite-3.3
+	>=dev-cpp/glibmm-2.8.3
+	>=dev-cpp/gtkmm-2.8.3
+	>=dev-cpp/libglademm-2.6"
+
+RDEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.17
+	nls? ( >=sys-devel/gettext-0.14.1
+		>=dev-util/intltool-0.31.2 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.10.2 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.8 )
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.10.8 )
+	ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10.1 )
+	alsa? ( >=media-plugins/gst-plugins-alsa-0.10.8 )
+	oss? ( >=media-plugins/gst-plugins-oss-0.10.3 )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10.3 )
+	theora? ( >=media-plugins/gst-plugins-theora-0.10.8 )
+	cdparanoia? ( >=media-plugins/gst-plugins-cdparanoia-0.10.8 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+		$(use_enable hal) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable amazon)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-64bit.patch"
+}
+
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc AUTHORS ChangeLog README NEWS TODO
+	insinto /usr/share/bmpx/skins/gentoo_ice
+	doins ${WORKDIR}/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc ${WORKDIR}/README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	einfo "As of 0.20 ${PN} stores it's configs in \$HOME/.config and local"
+	einfo "data to \$HOME/.local/share as per the freedesktop.org basedir"
+	einfo "spec. This means that your configs will be lost after you upgrade."
+}
diff --git a/media-sound/bmpx/files/bmpx-0.20_pre1-64bit.patch b/media-sound/bmpx/files/bmpx-0.20_pre1-64bit.patch
new file mode 100644
index 000000000000..85b21d9eff80
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.20_pre1-64bit.patch
@@ -0,0 +1,32 @@
+--- src/shell.cpp.orig	2006-06-19 15:33:54.000000000 -0400
++++ src/shell.cpp	2006-06-19 15:37:16.000000000 -0400
+@@ -643,10 +643,10 @@
+       }
+     else
+       {
+-        int x = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "x"));
+-        int y = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "y"));
+-        int w = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "w"));
+-        int h = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "h"));
++        int x = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "x"));
++        int y = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "y"));
++        int w = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "w"));
++        int h = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "h"));
+ 
+ 	gtk_window_resize (GTK_WINDOW (Bmp::w_playlist->window), w, h);
+ 
+@@ -1286,10 +1286,10 @@
+       }
+     else 
+       {
+-        x = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "x"));
+-        y = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "y"));
+-        w = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "w"));
+-        h = int (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "h"));
++        x = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "x"));
++        y = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "y"));
++        w = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "w"));
++        h = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (Bmp::w_playlist->window), "h"));
+       }
+ 
+     mcs->key_set<int>("playlist-window", "width",  w);
diff --git a/media-sound/bmpx/files/digest-bmpx-0.20_pre1 b/media-sound/bmpx/files/digest-bmpx-0.20_pre1
new file mode 100644
index 000000000000..2ad9d1e35825
--- /dev/null
+++ b/media-sound/bmpx/files/digest-bmpx-0.20_pre1
@@ -0,0 +1,6 @@
+MD5 c97d067fc28928c45bac1d8816070296 bmpx-0.20pre1.tar.bz2 1362912
+RMD160 c6772899dfc8036c9e7d6264733974d37b53b151 bmpx-0.20pre1.tar.bz2 1362912
+SHA256 437e8402a2cfd779c8ecd73b2a6060b36242eee36419b1d1107a6094c73bf16c bmpx-0.20pre1.tar.bz2 1362912
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 gentoo_ice-xmms-0.2.tar.bz2 51839
+SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 gentoo_ice-xmms-0.2.tar.bz2 51839