summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2007-06-17 18:02:22 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2007-06-17 18:02:22 +0000
commit054a744fabca6f48bd9ab5b16af30dbe32521b53 (patch)
treeed25deb97365e0c88cc439db26f29d3ef9c86eb5 /gnome-extra
parentFix manifest - cvs is retarded. (diff)
downloadgentoo-2-054a744fabca6f48bd9ab5b16af30dbe32521b53.tar.gz
gentoo-2-054a744fabca6f48bd9ab5b16af30dbe32521b53.tar.bz2
gentoo-2-054a744fabca6f48bd9ab5b16af30dbe32521b53.zip
add patch to use correct gst-launch and dep on 0.10
(Portage version: 2.1.3_rc3)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gnome-power-manager/ChangeLog7
-rw-r--r--gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch11
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild9
3 files changed, 23 insertions, 4 deletions
diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 3a9b8f8c2bf5..3f8890460949 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/gnome-power-manager
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.50 2007/06/17 07:25:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.51 2007/06/17 18:02:22 compnerd Exp $
+
+ 17 Jun 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+ +files/gpm-2.18.3-slotted-gstreamer.patch,
+ gnome-power-manager-2.18.3.ebuild:
+ Add a patch to use the correct gst-launch command on Gentoo
*gnome-power-manager-2.18.3 (17 Jun 2007)
diff --git a/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch b/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch
new file mode 100644
index 000000000000..8bad8e9e69b0
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/files/gpm-2.18.3-slotted-gstreamer.patch
@@ -0,0 +1,11 @@
+--- src/gpm-sound.c.orig 2007-06-17 12:55:53.000000000 -0500
++++ src/gpm-sound.c 2007-06-17 12:56:39.000000000 -0500
+@@ -78,7 +78,7 @@
+ g_error ("enum %i not known", action);
+ }
+
+- command = g_strdup_printf ("gst-launch filesrc location=%s%s ! "
++ command = g_strdup_printf ("gst-launch-0.10 filesrc location=%s%s ! "
+ "decodebin ! audioconvert ! gconfaudiosink",
+ GPM_DATA, filename);
+
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
index dec4745c1082..d5173babb235 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild,v 1.1 2007/06/17 07:25:51 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.18.3.ebuild,v 1.2 2007/06/17 18:02:22 compnerd Exp $
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="Gnome Power Manager"
HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.6.0
>=x11-libs/cairo-1.0.0
>=gnome-base/gnome-panel-2
>=gnome-base/gconf-2
- media-libs/gstreamer
+ =media-libs/gstreamer-0.10*
x11-libs/libX11
x11-libs/libXext"
DEPEND="${RDEPEND}
@@ -59,6 +59,9 @@ pkg_setup() {
src_unpack() {
gnome2_src_unpack
+ # Use gst-launch-0.10 rather than gst-launch
+ epatch ${FILESDIR}/gpm-2.18.3-slotted-gstreamer.patch
+
if use doc; then
# Actually install all html files, not just the index
sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \