Upstream patch for media-libs/xine-lib >= 1.2.0 compability wrt #397919 by Piotr Szymaniak

(Portage version: 2.2.0_alpha88/cvs/Linux x86_64)

3 files changed, 121 insertions, 1 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index 98872cc7f05c..e0585fff3fd6 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.81 2012/01/18 11:37:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.82 2012/02/20 22:22:21 ssuominen Exp $
+
+*quodlibet-2.3.92-r1 (20 Feb 2012)
+
+  20 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +quodlibet-2.3.92-r1.ebuild, +files/quodlibet-2.3.92-xine-lib-1.2.0.patch:
+  Upstream patch for media-libs/xine-lib >= 1.2.0 compability wrt #397919 by
+  Piotr Szymaniak
 
   18 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> quodlibet-2.2.1.ebuild,
   quodlibet-2.3.ebuild:
diff --git a/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch b/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch
new file mode 100644
index 000000000000..14528b1aa3e2
--- /dev/null
+++ b/media-sound/quodlibet/files/quodlibet-2.3.92-xine-lib-1.2.0.patch
@@ -0,0 +1,54 @@
+http://code.google.com/p/quodlibet/issues/detail?id=904
+http://bugs.gentoo.org/show_bug.cgi?id=397919
+
+--- quodlibet/player/_xine.py
++++ quodlibet/player/_xine.py
+@@ -7,18 +7,31 @@
+ import sys
+ import ctypes
+ 
++_version = 2
+ try:
+-    _libxine = ctypes.cdll.LoadLibrary('libxine.so.1')
+-except (ImportError, OSError), e:
+-    raise ImportError, e
++    _libxine = ctypes.cdll.LoadLibrary('libxine.so.2')
++except (ImportError, OSError):
++    _version = 1
++    try:
++        _libxine = ctypes.cdll.LoadLibrary('libxine.so.1')
++    except (ImportError, OSError), e:
++        raise ImportError, e
+ 
+ class xine_event_t(ctypes.Structure):
+-    _fields_ = [
+-        ('type', ctypes.c_int),
+-        ('stream', ctypes.c_void_p),
+-        ('data', ctypes.c_void_p),
+-        ('data_length', ctypes.c_int),
+-    ]
++    if _version == 1:
++        _fields_ = [
++            ('type', ctypes.c_int),
++            ('stream', ctypes.c_void_p),
++            ('data', ctypes.c_void_p),
++            ('data_length', ctypes.c_int),
++        ]
++    elif _version == 2:
++        _fields_ = [
++            ('stream', ctypes.c_void_p),
++            ('data', ctypes.c_void_p),
++            ('data_length', ctypes.c_int),
++            ('type', ctypes.c_int),
++        ]
+ 
+ class xine_ui_message_data_t(ctypes.Structure):
+     _fields_ = [
+@@ -122,6 +135,7 @@
+ XINE_MSG_AUDIO_OUT_UNAVAILABLE = 11 # none
+ XINE_MSG_PERMISSION_ERROR      = 12 # (file name or mrl)
+ XINE_MSG_FILE_EMPTY            = 13 # file is empty
++XINE_MSG_AUTHENTICATION_NEEDED = 14 # (mrl, likely http); added in 1.2
+ 
+ # xine_t *xine_new(void)
+ _libxine.xine_new.restype = ctypes.c_void_p
diff --git a/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild b/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
new file mode 100644
index 000000000000..5fc449502248
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-2.3.92-r1.ebuild,v 1.1 2012/02/20 22:22:21 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+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"
+IUSE="dbus gstreamer ipod"
+
+COMMON_DEPEND=">=dev-python/pygtk-2.12"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/feedparser
+	>=media-libs/mutagen-1.14
+	gstreamer? (
+		>=dev-python/gst-python-0.10.2:0.10
+		media-libs/gst-plugins-good:0.10
+		media-plugins/gst-plugins-meta:0.10
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python
+		)
+	ipod? ( media-libs/libgpod[python] )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	epatch "${FILESDIR}"/${P}-xine-lib-1.2.0.patch
+
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	dodoc HACKING NEWS README
+	doicon ${PN}/images/hicolor/64x64/apps/{exfalso,quodlibet}.png
+}