4 files changed, 30 insertions, 8 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/Manifest b/media-video/gnome-mplayer/Manifest
index 250c394eaaec..0b90762e1cb5 100644
--- a/media-video/gnome-mplayer/Manifest
+++ b/media-video/gnome-mplayer/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX gnome-mplayer-1.0.0-libnotify-0.7.patch 1091 RMD160 701b3bc3e5e103ba2e32f3185a4ce4a4b5e8ef0d SHA1 b42a416fa332ab144081fafeb12c003a43805745 SHA256 e18662cb267fdb12c30af59be49e83ef7b0b1bbdbc6b9a990a2369dfa363ee86
+AUX gnome-mplayer-1.0.4-noalsa.patch 548 RMD160 74ae3582c87d52fe2ae04a02e6625ed71edc0678 SHA1 1f030882a5a53fda07567c0a91fb0c9c0a3f4f6d SHA256 5ff4bcbd2af09c2c80dbf15d48da13fa80ebec411238ef2490fbf5ec22ac0ba9
 DIST gnome-mplayer-1.0.0.tar.gz 903789 RMD160 1d64094c2e72369d06cc97686fbc433dfee87638 SHA1 ef94c3170cc4d425403c8de67efb8f64dc7f762f SHA256 4694a4f8409039cef7206eb072952721262dbec372669373b732e617dd5ee530
 DIST gnome-mplayer-1.0.3.tar.gz 1016907 RMD160 f8bd3a0c35f7362dcf1052612b49726e506af28a SHA1 99e78a10a9801b7da5f4dc59b0266f18953a9d22 SHA256 7e24cdd515264520c30949577db6149c448c2d8feb9207c7f81c9619538fc172
 DIST gnome-mplayer-1.0.4.tar.gz 1069389 RMD160 d2c42caa22b66b94e98d72b8c53074aa61e8485c SHA1 15c329573692e97bb550063854ddc6404309b265 SHA256 e2f6e20e983f520512d2f13f343566f2afb8cd7296c0a27e3f95b5b635bdbecc
 EBUILD gnome-mplayer-1.0.0.ebuild 1771 RMD160 8c6d2c8900008492ddb1f760eb2bb3526ca88b7f SHA1 a93345c185fde28e1c876b198797df2f0553f57c SHA256 b542174a84d7f6518518ca4ee0a65babc04d55bfc24fd0ff52b8a79d97894ec8
 EBUILD gnome-mplayer-1.0.3-r2.ebuild 2032 RMD160 fe081b2c7e62321e8d97a7b46e2fe2bc809f62dd SHA1 dcfd4fe565924fa6b24e4f5c64af6be738df8a84 SHA256 14d78f0a4e6fc9d0597d07d8808b7bcc4928305611e8789686a047bc95f19732
-EBUILD gnome-mplayer-1.0.4.ebuild 2054 RMD160 96e629c32edf24400fa1b5054eb6d2b95717707e SHA1 e7f49eef52adb8c01ceb5c3d8744a30bb175b902 SHA256 06fbea38ab65ed5fe08edcc62afe750e306338f3428b2c4e0e59ccf7272e998e
-MISC ChangeLog 8570 RMD160 bc79e194e48f56631584de2b233a2c188d47f51b SHA1 ad3c891f7a452eec893f4a005a44dd8538dc1b88 SHA256 dbe41540bef7983e0008e3745455d52a8da7d936dc6d44ca8e480c8771290516
+EBUILD gnome-mplayer-1.0.4.ebuild 2120 RMD160 da750fde0f5ccca703fb67b58c642ab8bf1658cf SHA1 d6b27ab7faf36eab481c182dd92d6fb7f94b2b33 SHA256 bf73b96b007022cdd6c3cac570b19b7816f536d01198b08ebef8221f19525afd
+MISC ChangeLog 8743 RMD160 2822828d0d4bfd6ad2fb79abe27491aeb0671a21 SHA1 8605ec970ad824446eed6e21f8b08b87d891691d SHA256 d03f026d095f32cd57fe9111b9723de46036296f8cee92d85656349bd5283b91
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4RydoACgkQXkR9YqOcLPECWQD/U4whO4kVtpTjx5NN3HnV+9gT
-rs70OPCSLHQpbUuzHUEBAJdib9OxQAuXMhDvvpsDqLRxRPeUyzV2MclOZZgUHnJe
-=2Us8
+iF4EAREIAAYFAk4XYVIACgkQXkR9YqOcLPExnAD9Fz+CXEptMrIstJEML3wsMibA
+TBTJdRLbc24QNZ8x38MA/AjHruhsoUIQwpBWfH1GWwMfz7H/48vEDqcnx0O793LO
+=o+TA
 -----END PGP SIGNATURE-----
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 \