diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-12 16:51:07 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-05-12 16:51:07 +0000 |
commit | 15b857225c7f7d9dfdc45283f8abb7d570b04e24 (patch) | |
tree | c02651ec0de7f473044a83d68376fa02da590d10 /media-sound/quodlibet | |
parent | Sparc stable for the correct version, reverting ~sparc on 0.9 --- Bug #269527. (diff) | |
download | gentoo-2-15b857225c7f7d9dfdc45283f8abb7d570b04e24.tar.gz gentoo-2-15b857225c7f7d9dfdc45283f8abb7d570b04e24.tar.bz2 gentoo-2-15b857225c7f7d9dfdc45283f8abb7d570b04e24.zip |
Fix case where Quod Libet doesn't start if it was previously closen with hidden window wrt #262658, patch by Denis V. Lunev.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/quodlibet')
-rw-r--r-- | media-sound/quodlibet/ChangeLog | 9 | ||||
-rw-r--r-- | media-sound/quodlibet/files/quodlibet-2.0-window.patch | 12 | ||||
-rw-r--r-- | media-sound/quodlibet/quodlibet-2.0-r2.ebuild | 146 |
3 files changed, 166 insertions, 1 deletions
diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog index e68e69824a43..e20f69de686e 100644 --- a/media-sound/quodlibet/ChangeLog +++ b/media-sound/quodlibet/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/quodlibet # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.63 2009/05/12 13:27:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.64 2009/05/12 16:51:06 ssuominen Exp $ + +*quodlibet-2.0-r2 (12 May 2009) + + 12 May 2009; Samuli Suominen <ssuominen@gentoo.org> + +quodlibet-2.0-r2.ebuild, +files/quodlibet-2.0-window.patch: + Fix case where Quod Libet doesn't start if it was previously closen with + hidden window wrt #262658, patch by Denis V. Lunev. 12 May 2009; Samuli Suominen <ssuominen@gentoo.org> quodlibet-2.0-r1.ebuild: diff --git a/media-sound/quodlibet/files/quodlibet-2.0-window.patch b/media-sound/quodlibet/files/quodlibet-2.0-window.patch new file mode 100644 index 000000000000..66c25381eb2f --- /dev/null +++ b/media-sound/quodlibet/files/quodlibet-2.0-window.patch @@ -0,0 +1,12 @@ +diff -ur quodlibet-2.0.orig/quodlibet/__init__.py quodlibet-2.0/quodlibet/__init__.py +--- quodlibet-2.0.orig/quodlibet/__init__.py 2008-09-14 03:10:29.000000000 +0300 ++++ quodlibet-2.0/quodlibet/__init__.py 2009-05-12 19:48:18.000000000 +0300 +@@ -195,7 +195,7 @@ + signal.signal(sig, gtk.main_quit) + + window.connect('destroy', gtk.main_quit) +- window.show() ++ window.show(window) + + # This has been known to cause segmentation faults in some Python, + # GTK+, and GStreamer versions. diff --git a/media-sound/quodlibet/quodlibet-2.0-r2.ebuild b/media-sound/quodlibet/quodlibet-2.0-r2.ebuild new file mode 100644 index 000000000000..1c60f5790dc3 --- /dev/null +++ b/media-sound/quodlibet/quodlibet-2.0-r2.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.0-r2.ebuild,v 1.1 2009/05/12 16:51:06 ssuominen Exp $ + +EAPI=2 +NEED_PYTHON=2.4.4 + +inherit distutils python eutils + +DESCRIPTION="Quod Libet is a GTK+-based audio player written in Python." +HOMEPAGE="http://code.google.com/p/quodlibet/" +SRC_URI="http://quodlibet.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +# Enable gstreamer by default, bug 254729 +IUSE="aac alsa dbus esd flac gnome +gstreamer hal ipod mad musepack oss +trayicon tta vorbis wma xine" + +COMMON_DEPEND=">=dev-python/pygtk-2.12" + +RDEPEND="${COMMON_DEPEND} + >=media-libs/mutagen-1.14 + gstreamer? ( + >=media-plugins/gst-plugins-gconf-0.10.3 + >=media-libs/gst-plugins-good-0.10.2 + >=dev-python/gst-python-0.10.2 + mad? ( >=media-plugins/gst-plugins-mad-0.10.2 ) + vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.2 + >=media-plugins/gst-plugins-ogg-0.10.2 ) + flac? ( >=media-plugins/gst-plugins-flac-0.10.2 ) + aac? ( >=media-plugins/gst-plugins-faad-0.10.1 ) + musepack? ( >=media-plugins/gst-plugins-musepack-0.10.3 ) + wma? ( >=media-plugins/gst-plugins-ffmpeg-0.10.1 + >=media-libs/gst-plugins-ugly-0.10.2 ) + tta? ( >=media-libs/gst-plugins-bad-0.10.3 ) + + alsa? ( >=media-plugins/gst-plugins-alsa-0.10.2 ) + oss? ( >=media-plugins/gst-plugins-oss-0.10.2 ) + esd? ( >=media-plugins/gst-plugins-esd-0.10.2 ) + ) + xine? ( >=media-libs/xine-lib-1.1.0 + dev-python/ctypes ) + gnome? ( dev-python/gnome-python-extras + >=media-plugins/gst-plugins-gconf-0.10.3 + >=media-plugins/gst-plugins-gnomevfs-0.10.2 + dev-python/feedparser ) + hal? ( sys-apps/hal ) + dbus? ( >=dev-python/dbus-python-0.71 ) + ipod? ( >=media-libs/libgpod-0.5.2[python] )" + +DEPEND="${COMMON_DEPEND} + dev-util/intltool" + +PDEPEND="trayicon? ( media-plugins/quodlibet-trayicon )" + +pkg_setup() { + if ! use gstreamer && ! use xine; then + eerror "You must have either gstreamer or xine USE flag enabled." + die "No backend USE flags enabled." + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # The backend is configured as gstbe by default. + if use gstreamer && use xine; then + elog "" + elog "You have both backend USE flags (gstreamer and xine) enabled." + elog "Gstreamer is considered to be more stable of the two, so we have" + elog "selected it as your default backend." + elif use gstreamer; then + elog "Gstreamer backend selected." + else + sed -i -e "s,^ \"backend\": \"gstbe\", \"backend\": \"xinebe\"," quodlibet/config.py && \ + elog "Xine backend selected." + fi + elog "You can change the backend by editing the ~/.${PN}/config file." + + # no gst-plugins-gconf, attempt to guess the proper pipeline value. Bug #133043, #146728. + if ! use gnome; then + local sinktype="alsasink" + + use esd && sinktype="esdsink" + use oss && sinktype="osssink" + use alsa && sinktype="alsasink" + + elog "Setting the default pipeline to ${sinktype}" + + sed -i -e "s,^ \"pipeline\": \"\", \"pipeline\": \"${sinktype}\"," quodlibet/config.py + fi + epatch "${FILESDIR}/${P}-python26.patch" #240188 + epatch "${FILESDIR}/${P}-window.patch" #262658 +} + +src_install() { + ${python} setup.py install --prefix="${D}/usr" --no-compile "$@" || die + + DDOCS="CHANGELOG KNOWN_BUGS MAINTAINERS PKG-INFO CONTRIBUTORS TODO NEWS" + DDOCS="${DDOCS} Change* MANIFEST* README* AUTHORS" + + python_version + for ext in png svg; do + for prog in quodlibet exfalso; do + dosym /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/images/${prog}.${ext} /usr/share/pixmaps/${prog}.${ext} + done + done + + for doc in ${DDOCS}; do + [ -s "$doc" ] && dodoc $doc + done +} + +pkg_postinst() { + if ! use mad; then + elog "" + elog "You do not have the 'mad' USE flag enabled." + elog "gst-plugins-mad, which is required for mp3 playback, may" + elog "not be installed. For mp3 support, enable the 'mad'" + elog "USE flag and emerge =media-sound/${P}." + fi + + if ! use gnome; then + elog "" + elog "You do not have the 'gnome' USE flag enabled." + elog "media-plugins/gst-plugins-gnomevfs may not be installed," + elog "so the proper pipeline won't be automatically selected." + elog "We've tried to select the proper pipeline based on your" + elog "USE flags, but if we guessed wrong you may have to set" + elog "'pipeline = ' in your ~/.quodlibet/config file to one" + elog "of the following: alsasink, osssink, esdsink. To enable" + elog "automatic selection of the proper pipeline, enable the" + elog "'gnome' USE flag and emerge =media-sound/${P}." + fi + + elog "" + elog "Installing Quod Libet from an ebuild is not supported" + elog "upstream. If you encounter any problems, file bugs on" + elog "bugs.gentoo.org. DO NOT USE THE UPSTREAM BUG SYSTEM." + elog "" + + distutils_pkg_postinst +} |