summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-07-08 19:59:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-07-08 19:59:30 +0000
commit2606b1c418ef682529da9d3425288e43efb3a3d1 (patch)
treee59f7fe16aaedcc576b37c65bc6e12a1591a9f45 /media-video/gnome-mplayer
parentAdded ~mips, bug 201744 (diff)
downloadgentoo-2-2606b1c418ef682529da9d3425288e43efb3a3d1.tar.gz
gentoo-2-2606b1c418ef682529da9d3425288e43efb3a3d1.tar.bz2
gentoo-2-2606b1c418ef682529da9d3425288e43efb3a3d1.zip
Upstream patch to fix building without alsa.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'media-video/gnome-mplayer')
-rw-r--r--media-video/gnome-mplayer/ChangeLog6
-rw-r--r--media-video/gnome-mplayer/files/gnome-mplayer-1.0.4-noalsa.patch13
-rw-r--r--media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild8
3 files changed, 24 insertions, 3 deletions
diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog
index 9918a13e765a..23dbed580b69 100644
--- a/media-video/gnome-mplayer/ChangeLog
+++ b/media-video/gnome-mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/gnome-mplayer
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.59 2011/07/04 14:11:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.60 2011/07/08 19:59:30 ssuominen Exp $
+
+ 08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+ gnome-mplayer-1.0.4.ebuild, +files/gnome-mplayer-1.0.4-noalsa.patch:
+ Upstream patch to fix building without alsa.
*gnome-mplayer-1.0.4 (04 Jul 2011)
diff --git a/media-video/gnome-mplayer/files/gnome-mplayer-1.0.4-noalsa.patch b/media-video/gnome-mplayer/files/gnome-mplayer-1.0.4-noalsa.patch
new file mode 100644
index 000000000000..94bac851ca10
--- /dev/null
+++ b/media-video/gnome-mplayer/files/gnome-mplayer-1.0.4-noalsa.patch
@@ -0,0 +1,13 @@
+http://code.google.com/p/gnome-mplayer/issues/detail?id=535
+
+--- src/gui.c
++++ src/gui.c
+@@ -5073,7 +5073,7 @@
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(config_volume), gm_pref_store_get_int(gm_store, VOLUME));
+ gm_pref_store_free(gm_store);
+ gtk_entry_set_width_chars(GTK_ENTRY(config_volume), 6);
+- gtk_entry_set_editable(GTK_ENTRY(config_volume), FALSE);
++ gtk_editable_set_editable(GTK_EDITABLE(config_volume), FALSE);
+ gtk_entry_set_alignment(GTK_ENTRY(config_volume), 1);
+ gtk_widget_show(config_volume);
+ i++;
diff --git a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
index 9c6647715a17..cb1bdc22c895 100644
--- a/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
+++ b/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.1 2011/07/04 14:11:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-1.0.4.ebuild,v 1.2 2011/07/08 19:59:30 ssuominen Exp $
EAPI=4
-inherit fdo-mime gnome2-utils
+inherit eutils fdo-mime gnome2-utils
DESCRIPTION="A GTK+ interface to MPlayer"
HOMEPAGE="http://code.google.com/p/gnome-mplayer/"
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
DOCS="ChangeLog README DOCS/keyboard_shortcuts.txt DOCS/tech/dbus.txt DOCS/tech/plugin-interaction.txt"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-noalsa.patch
+}
+
src_configure() {
# FIXME: The only reason why --without-gpm-new-method is passed is lack of testing.
econf \