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

Package-Manager: portage-2.2.0_alpha88/cvs/Linux x86_64

4 files changed, 131 insertions, 9 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/Manifest b/media-sound/quodlibet/Manifest
index a7df2ef2d598..56a49b4d2e8e 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX quodlibet-2.3.92-xine-lib-1.2.0.patch 1634 RMD160 d13744bb1cfc68514e7bea0d73a6bcd6dc13d63f SHA1 8178e07793df8e4c3190ab55076dfd2ac6b8a4de SHA256 5d2865ba09a4bb31788ad6635a625630fef3f50d00a319e73927fa1c43dcbad1
 DIST quodlibet-2.2.1.tar.gz 929946 RMD160 bc24798632767b06288f020acc4043be5223f4ec SHA1 f6ae9a000f98a0a0d5928aa63b71244161255551 SHA256 e7dc3e22f88ebf588e46f1ef9ac7aa5de833acac7fbe2d96233d31d1a98951b9
 DIST quodlibet-2.3.92.tar.gz 1086791 RMD160 f6a4899ba7517abe4c83c1c913b43f1c1ed81d04 SHA1 f19a9bdc6cef647ac17bf26383f59d1a51df9ce7 SHA256 0c64fb32eeafa73bb38cba3e111f8f27bb13c5bad4b031ab3df6b0422474645d
 DIST quodlibet-2.3.tar.gz 1002730 RMD160 c5d7a8da620921d0b62b5540b77fe349fe05d965 SHA1 dae756e8224139989f6b253ef2afe18eca55ef9f SHA256 e23c67e3b3daf01e577c92e82fcfab78b137d9a195ef6dc24ec06733729cf4ad
 EBUILD quodlibet-2.2.1.ebuild 1382 RMD160 80552a4d2a8b03ea8316f6735f72419f2c190673 SHA1 36c51ea079fc01ce54c494ec41129a4844abd742 SHA256 ecbbdc3f085cabf2bda635bbbc2c4d6f533ef74f8d57e90fd2335f98c9e14e76
+EBUILD quodlibet-2.3.92-r1.ebuild 1490 RMD160 5e1476cadab3e3f1ac3508be420d0dca27667df4 SHA1 3668baf3ed47c85e78a6dc334e042235d159016a SHA256 88bcc62c985476007f019bc820232f5f655dc7673c4486ef53527c87ce4c6860
 EBUILD quodlibet-2.3.92.ebuild 1251 RMD160 7c654540cc42b0b51574714f11730f4fff1bbeea SHA1 d52884c293755ba85a2793f68624af2514801640 SHA256 aea0dd92600a48621c4cef19058b86fc4bad24bf15e65d3c781830a84f3a3316
 EBUILD quodlibet-2.3.ebuild 1328 RMD160 5e57598c26e49bdafd72ae8b76296cb2ea7be4d2 SHA1 f45aa564086c25552755b53b8b7f1979082e80bf SHA256 ddc4d1957f0f228486190c2daafb26a03d0884755d71a1173326c7b943da81d2
-MISC ChangeLog 13907 RMD160 fcea5c087e3f6d461a257575fc775c5b900471d4 SHA1 79987e151d74f0de3648f8e4b9f275e571c6e747 SHA256 c83e65a95aa39d7094b9c84776ddaf03909f02d1e175da99f0eea2d5d5b6bed5
+MISC ChangeLog 14170 RMD160 d9100e92d7727f6fccf53103c248917de3e4d856 SHA1 b49da3c8a8042f390c7527b4060142a1baf27990 SHA256 a0055cad8779797bedc840a807f4cc9517de5a456f2b058c53c9db7d2cd06462
 MISC metadata.xml 648 RMD160 7c4d2399f594eccfda8725b708c2135d3a3ee1c8 SHA1 0d807278abf5b84b284c314e18d7712145fc871f SHA256 33033fb868c2e5ec14c9d6396e4c8badcf8a1c7d2c923a7878e34f35fa00323d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPFq6cAAoJEEdUh39IaPFN6o0H/1DYK85732vhIAK47BqvhHzL
-23j1HHqbBnHxMp0IDTyH7hHtha+9lUQHLtFc39oPHQ4yXne0ZLFACKUBQCIe4pQS
-AvYXbqHOJ10hU3/AH9K8aCZIBGhh0/1K39KcmKSB/PidQl4i0WYbIPBhIJNDW+Nc
-ANXMzEh8lSzlBjniZM0Twg62DvnpG61rqh2DZtVcW2gcHldkYP4S68Gna4GAmeRC
-OA94Es2I/n1PZ+A/jXEurFC1kOA8aNlIihjgiD4SHgAF6LT6If6V0k6824x6Nbmv
-LRya5pbVxYioscN0WDhGH51CIdizIr5cHYJm8NN/0sEPYSaewxYD5PLMQ2bFBnA=
-=bc8Q
+iQEcBAEBAgAGBQJPQsbLAAoJEEdUh39IaPFNvEkH/jtBSLhXnm8lFpOE2KelBuul
+Vl2z0SU/FrxVgc5kAwOwSb6xaoLaPCCuDg98Prq0X2isxhCOl8YA4wvlN1pb+n8l
+W2tCpXTTAcW2/9Ie6mfPx3RJnlCiRLyZe68FEFeYBKKRFwZLho1tJWHf92ztgEju
+N3Zkgr1hwwayrgcWB+jYxeOUvfNGn47Majw/WHZ36o4EuvWNisNWPlGAgTErcdYb
+SJxO9dAJS4A23UkqJBo11Eu9PpZln8uF0w7MYoNaDouZJEyviveTdOx5WuhJVl9J
+0J1vAvCNQ1k7oLUuLppCAxrR9mfZITpaQuwLTXrt892Ifqub48ygaRA6DT8j0EA=
+=FmaP
 -----END PGP SIGNATURE-----
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
+}