From c9962dbeec2e907e8c328b086357d58b88400279 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Mon, 19 Jun 2006 19:56:11 +0000 Subject: [PATCH] Version bump, with a patch to fix compilation on 64bit platforms. Package-Manager: portage-2.1_rc4-r2 --- media-sound/bmpx/ChangeLog | 8 +- media-sound/bmpx/Manifest | 20 ++++- media-sound/bmpx/bmpx-0.20_pre1.ebuild | 90 +++++++++++++++++++ .../bmpx/files/bmpx-0.20_pre1-64bit.patch | 32 +++++++ media-sound/bmpx/files/digest-bmpx-0.20_pre1 | 6 ++ 5 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 media-sound/bmpx/bmpx-0.20_pre1.ebuild create mode 100644 media-sound/bmpx/files/bmpx-0.20_pre1-64bit.patch create mode 100644 media-sound/bmpx/files/digest-bmpx-0.20_pre1 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 + +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 -files/bmpx-0.12.9-dbus-fix.patch, diff --git a/media-sound/bmpx/Manifest b/media-sound/bmpx/Manifest index d6ff244b807d..61c6869ffc4c 100644 --- a/media-sound/bmpx/Manifest +++ b/media-sound/bmpx/Manifest @@ -1,13 +1,22 @@ +AUX bmpx-0.20_pre1-64bit.patch 1761 RMD160 58a4b05c58135a73ebcdb21d2d07adbdf165dfd6 SHA1 c5b3920499df49e1f82e62242de7c271658e1946 SHA256 35bcedee584fc40784ad3357d1b9787231f38e5789f7eb2f99f412fc2a6a2547 +MD5 6b882792769140e1bb935f7e4a5d23d5 files/bmpx-0.20_pre1-64bit.patch 1761 +RMD160 58a4b05c58135a73ebcdb21d2d07adbdf165dfd6 files/bmpx-0.20_pre1-64bit.patch 1761 +SHA256 35bcedee584fc40784ad3357d1b9787231f38e5789f7eb2f99f412fc2a6a2547 files/bmpx-0.20_pre1-64bit.patch 1761 DIST bmpx-0.14.4.tar.bz2 1960833 RMD160 016d790ada78899b131bf8ed16886504a8f36cac SHA1 2ceb4d3c6f935d94a16584bba3ee560ae7653c1e SHA256 8fa68c0059c769b565c00fb7c7a637129f1d3dfbeaad35e0c418730728399551 +DIST bmpx-0.20pre1.tar.bz2 1362912 RMD160 c6772899dfc8036c9e7d6264733974d37b53b151 SHA1 da4bd7eea235f9d6beacb5eca38b8991513f52ae SHA256 437e8402a2cfd779c8ecd73b2a6060b36242eee36419b1d1107a6094c73bf16c DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 EBUILD bmpx-0.14.4.ebuild 2144 RMD160 a75c79f221d3b71af58ef4982338427238ef864c SHA1 fb5cdc10477bf933e18710088c17565ee2a4f217 SHA256 9c5dec564d0935b6f2fe98c56d1e40a024f61dcd4da4dc25858d6e77a361703d MD5 5aec3a2525fc227db7b4e227f27c6563 bmpx-0.14.4.ebuild 2144 RMD160 a75c79f221d3b71af58ef4982338427238ef864c bmpx-0.14.4.ebuild 2144 SHA256 9c5dec564d0935b6f2fe98c56d1e40a024f61dcd4da4dc25858d6e77a361703d bmpx-0.14.4.ebuild 2144 -MISC ChangeLog 5293 RMD160 f11d4782e7348110c1fea8eaae9535cf384e2425 SHA1 0538c39c5a7a0e367c357f71066938dc01827e47 SHA256 769e8b923ceede1eef0e32f1103ec5f3b3e135e8cfdc4726a34acb9db545ba99 -MD5 9b48f8dc8df54af5db9bb494b8ecd35a ChangeLog 5293 -RMD160 f11d4782e7348110c1fea8eaae9535cf384e2425 ChangeLog 5293 -SHA256 769e8b923ceede1eef0e32f1103ec5f3b3e135e8cfdc4726a34acb9db545ba99 ChangeLog 5293 +EBUILD bmpx-0.20_pre1.ebuild 2566 RMD160 17daa6a3b691176fc882d0d6968939aaa8fca526 SHA1 fc6c304addcb07d729c343fe4c05fec003fb6a60 SHA256 57e81005bc1ddb6a04d8ea92425523008ef8ed6f8c3ad054097d695c6e6b3775 +MD5 8ef80920f342777bb2e9a1cd68a487e2 bmpx-0.20_pre1.ebuild 2566 +RMD160 17daa6a3b691176fc882d0d6968939aaa8fca526 bmpx-0.20_pre1.ebuild 2566 +SHA256 57e81005bc1ddb6a04d8ea92425523008ef8ed6f8c3ad054097d695c6e6b3775 bmpx-0.20_pre1.ebuild 2566 +MISC ChangeLog 5506 RMD160 7074f32d21c4c21a051a531d8551d771070565a2 SHA1 914cd5c1d0e9ae49e7f16484e1213c41958e4c86 SHA256 32a972ce5ec07ffda4b6ed60bd91e09f902c26f39da61c9b924b008502b1a6cc +MD5 1b6af4882132ff7abe8aad3f4762ceec ChangeLog 5506 +RMD160 7074f32d21c4c21a051a531d8551d771070565a2 ChangeLog 5506 +SHA256 32a972ce5ec07ffda4b6ed60bd91e09f902c26f39da61c9b924b008502b1a6cc ChangeLog 5506 MISC metadata.xml 256 RMD160 490bbea4751daa854e980c0b893961554e00f4c2 SHA1 b61dde99da5a1bd8e1df9547598a5f81f59c2c49 SHA256 63d4743ef1b39d533fc8f2c45f50f76179afabd00a0a58e0ba9d8f3a17c55c59 MD5 c809357984e7e234e30c1a6ea7d10f8a metadata.xml 256 RMD160 490bbea4751daa854e980c0b893961554e00f4c2 metadata.xml 256 @@ -15,3 +24,6 @@ SHA256 63d4743ef1b39d533fc8f2c45f50f76179afabd00a0a58e0ba9d8f3a17c55c59 metadata MD5 e19050594fe41200d83926db0926199e files/digest-bmpx-0.14.4 500 RMD160 6374fa7233d07d61c7672a4c0ac8aff6400c6940 files/digest-bmpx-0.14.4 500 SHA256 6ed64a4ac86d135bb2ee70de797a36274da36e02d9e64fab9e7c204723786df8 files/digest-bmpx-0.14.4 500 +MD5 af3607d2e2d6f9343ff6c4e10f9edf2a files/digest-bmpx-0.20_pre1 506 +RMD160 d5404d65de866e8571e2c49f81f04c528811fffc files/digest-bmpx-0.20_pre1 506 +SHA256 a2c1ea56810a5897652ba1d733ed418cb9716264e377e35ec8804bf644deaf01 files/digest-bmpx-0.20_pre1 506 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("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 -- 2.26.2