make kaffeine compile with >=xine-lib-1.2

	modified:   Manifest
	new file:   files/kaffeine-0.8.8-kxinewidget.patch
	new file:   kaffeine-0.8.8-r1.ebuild

3 files changed, 94 insertions, 0 deletions

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index eab94bd1..b29e771b 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,8 +1,10 @@
 AUX kaffeine-0.8.5-respectcflags.patch 2554 RMD160 1f3d06ee37f2b36f8f79951948221e5159b121b3 SHA1 55dbe435bd6038b00cd39d367060806f5b1a39c6 SHA256 e2ff1f6477a8fc3800d96b1e1240bc6acc7392ded6883b18f667a9a3c233dfcf
 AUX kaffeine-0.8.7-respectcflags.patch 2918 RMD160 6232b1b0f0203eb6f6f404ffa63bde444a6fcbd3 SHA1 99783aa52a1fcd5568c6a850f4fef33cb6fb200f SHA256 1798a5bddb992ab12fbdcaab8d0afc1e8b037ff0ff8f938973c7d7c1d766d0b2
+AUX kaffeine-0.8.8-kxinewidget.patch 397 RMD160 f1b364559ebab7d3b60998029132c72d07e8cfed SHA1 3c0ac496590788a7f3c74217e50b6bedf533ef27 SHA256 5ebff80db712c9a38877d4397c9d7cdcd04e4366a78573ef7c638dd0c900bf6b
 DIST kaffeine-0.8.6.tar.bz2 2923224 RMD160 260da3f329d76fd5e372396e52f32dc175206313 SHA1 508977f591fd31474548dfb92e1073b656cf65fa SHA256 77485636b1a279ed4e3431947eeda096f41e84ace481ffb0b9fd70d09676c0b7
 DIST kaffeine-0.8.8.tar.bz2 2994589 RMD160 29dd310b9b726c136ad76d9aa9a8058e72fea511 SHA1 4bc04a6cca24c9765dacc5d377952583d6a06109 SHA256 d6d1e6cbdba2b60813bcc5889248a7a62b96c1def9740f807e43ecf54f796d9a
 EBUILD kaffeine-0.8.6.ebuild 2154 RMD160 a7cb26c38a8ef330e021e0c387374be63aef9361 SHA1 fc12ac61df1d4945eafbc8c8f244c22e9963ed0a SHA256 05d73975bd497acd60937f965c56c9e4ba61f136cae06360e06e93c5963038f8
+EBUILD kaffeine-0.8.8-r1.ebuild 2038 RMD160 08a4cad9eb88a28c8ece5179bc0ab55cf67aff88 SHA1 f103121247337b50c3fecca795a4dffd4fa78aab SHA256 40a9ed06fcc21cc3a7f65647bd45de329817623621d962b7faaa3da56a84636d
 EBUILD kaffeine-0.8.8.ebuild 1990 RMD160 68bbdd8a087a7c8dcefdbb782e983b5e83a0e3d1 SHA1 63db0b9e7ae919ce08f223fd13860dad11b5f274 SHA256 d026e50115660c38d3fb6922265677ba7c350ed0f2ae0225efac28fd57fdf8a8
 MISC ChangeLog 16004 RMD160 dff05bfa2265da10236fc432a9229642c3e11529 SHA1 9400cd4af5804182daca7798af7e114f3217bf58 SHA256 e39e620c09095f92457ea1f2f3ff47cb687ab23257befad6d2e574c71fc15d1e
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
diff --git a/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch b/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
new file mode 100644
index 00000000..c160bb93
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.8.8-kxinewidget.patch
@@ -0,0 +1,11 @@
+--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp~	2009-05-15 16:16:26.000000000 +0100
++++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp	2012-02-25 23:45:45.000000000 +0000
+@@ -2638,7 +2638,7 @@
+ 	int num;
+ 	int i = 0;
+ 
+-	urls = xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
++	urls = (char**)xine_get_autoplay_mrls(m_xineEngine, plugin.ascii(), &num);
+ 
+ 	if (urls)
+ 	{
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
new file mode 100644
index 00000000..80358dee
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.8.ebuild,v 1.4 2009/06/09 14:16:40 tampakrap Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+USE_KEG_PACKAGING="1"
+
+LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka \
+	km lt mk nb nl nn pa pl pt_BR pt ru se sk sr@Latn sr sv tg tr \
+	uk uz zh_CN zh_TW"
+
+LANGS_DOC=""
+
+inherit eutils kde flag-o-matic
+
+DESCRIPTION="Media player for KDE using xine and gstreamer backends."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+SRC_URI="http://hftom.free.fr/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dvb gstreamer xinerama vorbis encode xcb"
+# kdehiddenvisibility removed due to bug 207002.
+
+RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
+	xcb? ( >=x11-libs/libxcb-1.0 )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+		=media-plugins/gst-plugins-xvideo-0.10* )
+	dev-libs/libcdio
+	encode? ( media-sound/lame )
+	vorbis? ( media-libs/libvorbis )
+	x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+	dvb? ( media-tv/linuxtv-dvb-headers
+		>=sys-kernel/linux-headers-2.6.28 )
+	x11-proto/inputproto"
+
+need-kde 3.5.4
+
+PATCHES=(
+	"${FILESDIR}/kaffeine-0.8.7-respectcflags.patch"
+	"${FILESDIR}/kaffeine-0.8.8-kxinewidget.patch"
+	)
+
+src_configure() {
+	# see bug #143168
+	replace-flags -O3 -O2
+
+	# workaround bug #198973
+	local save_CXXFLAGS="${CXXFLAGS}"
+	append-flags -std=gnu89
+	export CXXFLAGS="${save_CXXFLAGS}"
+
+	local myconf="${myconf}
+		$(use_with xinerama)
+		$(use_with dvb)
+		$(use_with gstreamer)
+		$(use_with vorbis oggvorbis)
+		$(use_with xcb)
+		$(use_with encode lame)"
+
+	kde_src_configure
+}
+
+src_install() {
+	kde_src_install
+
+	# fix localization, bug #199909
+	for mofile in "${D}/${KDEDIR}"/share/locale/*/LC_MESSAGES/${P}.mo ; do
+		mv -f ${mofile} ${mofile/${P}.mo/${PN}.mo} \
+			|| die "fixing mo files failed"
+	done
+
+	# remove this, as kdelibs 3.5.4 provides it
+	rm -f "${D}/${KDEDIR}"/share/mimelnk/application/x-mplayer2.desktop
+}