add xbmc-9.11 with internal Python and libdca support

10 files changed, 1712 insertions, 0 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
new file mode 100644
index 0000000..71cd7d9
--- /dev/null
+++ b/media-tv/xbmc/ChangeLog
@@ -0,0 +1,284 @@
+# ChangeLog for media-tv/xbmc
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.64 2010/08/14 17:56:24 vapier Exp $
+
+*xbmc-9.11-r5 (23 Aug 2010)
+
+  23 Aug 2010; Domen Kožar <domen@dev.si> +xbmc-9.11-r5.ebuild,
+  +files/xbmc-9.11-TexturePacker-parallel-build.patch,
+  +files/xbmc-9.11-jpeg-speedup.patch, +files/xbmc-9.11-libpng14.patch,
+  +files/xbmc-9.11-shader-upscalers.patch,
+  +files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch,
+  +files/xbmc-9.11-wavpack.patch, +metadata.xml:
+  Patch xbmc-9.11 to support libcda instead of libdts
+  Use internal Python 2.4
+
+  14 Aug 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  metadata.xml:
+  Add support for USE=webserver #305229 by Jan Vansteenkiste.
+
+  12 Aug 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  metadata.xml:
+  Update paths to run autotools in #330473 by hal. Add support for USE=rtmp
+  #331983 by Daniel Marmander.
+
+  11 Jul 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Update lsb_release sed to match latest svn #326949 by BT.
+
+  11 Jul 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild,
+  xbmc-9999.ebuild:
+  Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727
+  by Džen.
+
+  21 Jun 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild:
+  Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> xbmc-9999.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Run autotools in more subdirs, update docdir install, and convert to
+  emake+DESTDIR for installing.
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Make hal support optional via USE=hal now that upstream supports it
+  #319193 by hal.
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild,
+  xbmc-9999.ebuild:
+  Sync recent updates between the release/live ebuilds.
+
+*xbmc-9.11-r4 (23 May 2010)
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11-r4.ebuild,
+  +files/xbmc-9.11-TexturePacker-parallel-build.patch,
+  +files/xbmc-9.11-shader-upscalers.patch:
+  Force python-2.4 usage #304521 by Domen Kožar. Apply upshader patch from
+  upstream #306661 by zehner. Install the xbmc-send helper python script
+  #309885 by James Broadhead.
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  metadata.xml:
+  Stop installing web styles since they no longer exist #305969 by Thomas
+  Andersson. Require opengl support in libsdl #311891 by Stijn Tintel, and
+  require -minimal support in libcdio #311893 by Stijn Tintel. Update dodoc
+  line #316081 by Diego E. Pettenò. Add USE=vaapi support #319701 by hal.
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r3.ebuild:
+  Update dodoc line #316081 by Diego E. Pettenò.
+
+  14 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild:
+  Don't apply -libpng14.patch with libpng12 wrt #319721 by Martin von
+  Gagern.
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild,
+  +files/xbmc-9.11-libpng14.patch:
+  Fix building with libpng14 wrt #319113 by Manuel Nickschas.
+
+  07 Apr 2010; Patrick Lauer <patrick@gentoo.org> xbmc-9.11.ebuild,
+  xbmc-9.11-r3.ebuild, xbmc-9999.ebuild:
+  Fixing samba deps
+
+  07 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> xbmc-9.11.ebuild,
+  xbmc-9.11-r3.ebuild, xbmc-9999.ebuild:
+  Drop unrar-gpl dependencies. Unrar-gpl cant open most rars that are
+  around.
+
+*xbmc-9.11-r3 (18 Mar 2010)
+
+  18 Mar 2010; Fabio Erculiani <lxnay@gentoo.org> -xbmc-9.11-r2.ebuild,
+  +xbmc-9.11-r3.ebuild,
+  +files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch:
+  backport libcdio patch from trunk, makes DVD playback working, close
+  #303030, upstream reference #8026
+
+*xbmc-9.11-r2 (18 Mar 2010)
+
+  18 Mar 2010; Fabio Erculiani <lxnay@gentoo.org> -xbmc-9.11-r1.ebuild,
+  +xbmc-9.11-r2.ebuild:
+  temp. workaround inability to play DVDs, see bug #303030
+
+  07 Mar 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Pull in libmodplug #305911 by Michael Lange. Disable the webserver for now
+  #305229 by Jan Vansteenkiste.
+
+  25 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r1.ebuild,
+  xbmc-9999.ebuild:
+  Require SLOT="0" of media-libs/jpeg for headers.
+
+  18 Jan 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r1.ebuild,
+  xbmc-9999.ebuild:
+  Disable support for USE=-opengl #298529 by Diego E. Pettenò.
+
+*xbmc-9.11-r1 (17 Jan 2010)
+
+  17 Jan 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11-r1.ebuild,
+  +files/xbmc-9.11-jpeg-speedup.patch:
+  Add fix from upstream for high cpu usage with jpeg images #300909 by
+  mikopp.
+
+  17 Jan 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11.ebuild,
+  xbmc-9999.ebuild:
+  Require USE=smbclient with newer versions of samba #301233 by Darren
+  Smith.
+
+  05 Jan 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11.ebuild,
+  xbmc-9999.ebuild:
+  Update vdpau dependency #299398 by Fabio Erculiani.
+
+*xbmc-9.11 (26 Dec 2009)
+
+  26 Dec 2009; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11.ebuild,
+  +files/xbmc-9.11-wavpack.patch:
+  Version bump #298226 by hal.
+
+*xbmc-9.11_rc1 (19 Dec 2009)
+
+  19 Dec 2009; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11_rc1.ebuild,
+  +files/xbmc-9.11_rc1-wavpack.patch, xbmc-9999.ebuild:
+  Version bump #297520.
+
+  18 Dec 2009; Mike Frysinger <vapier@gentoo.org> -xbmc-9.04.ebuild,
+  -xbmc-9.04.1.ebuild, -files/xbmc-9.04-gcc.patch:
+  Punt older versions with random build problems.
+
+  15 Dec 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Regen libbdnav autotools when needed #296792 by Martin Berkemeier.
+
+  04 Dec 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Install all webui styles #293093 by hal.
+
+  04 Dec 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Enable epatch_user #293109 by hal.
+
+  22 Nov 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Drop pmount depend now #293108 by hal. Switch back to external faad2
+  #294059 by Michael Lawrence. Add USE="avahi css aac midi xrandr" and add
+  missing deps for USE="pulseaudio vdpau" #293968 by Craig Andrews.
+
+  08 Nov 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Control squish altivec/sse support via USE #290564 by Francisco González.
+
+  08 Nov 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Pull in jbigkit/tiff #289621 by Michael Lange.
+
+  17 Oct 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Force libass-0.9.7+ #285328#10.
+
+  17 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> xbmc-9999.ebuild:
+  Remove libmpcdec (SV7) support.
+
+  01 Oct 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  -files/xbmc-9999-libass.patch:
+  Drop libass patch as upstream has fixed things.
+
+  26 Sep 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  +files/xbmc-9999-libass.patch:
+  Fix by Jan Vansteenkiste for building with newer versions of libass
+  #285328 by Dirk Best.
+
+  26 Sep 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9.04.ebuild,
+  xbmc-9.04.1.ebuild, xbmc-9999.ebuild:
+  Update SVN paths as upstream has moved stuff around.
+
+  05 Sep 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Generate autotools since upstream no longer includes them in svn #283722
+  by Kevin.
+
+*xbmc-9.04.1 (05 Sep 2009)
+
+  05 Sep 2009; Mike Frysinger <vapier@gentoo.org> +xbmc-9.04.1.ebuild:
+  Version bump #283608 by zehner.
+
+  27 Aug 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Force internal faad2 for now #278400. Pull in more deps #279062 #281078.
+
+  27 Aug 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Drop unzip step since upstream has integrated it #282739 by Jan
+  Vansteenkiste.
+
+  27 Jul 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  xbmc-9.04.ebuild, xbmc-9999.ebuild:
+  Use http instead of https for source download (thanks to Xake, bug #279174)
+
+  20 Jul 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Add more libraries to DEPEND #278294 by BT and move to external libraries
+  #275844 by candrews.
+
+  20 Jul 2009; Mike Frysinger <vapier@gentoo.org> files/xbmc-9.04-gcc.patch:
+  Update gcc-4.4 patch #277562 by Diego E. Pettenò.
+
+  29 May 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9.04.ebuild,
+  xbmc-9999.ebuild:
+  Allow unrar-gpl for unrar needs #270728 by Mathy Vanvoorden.
+
+*xbmc-9.04 (16 May 2009)
+
+  16 May 2009; Mike Frysinger <vapier@gentoo.org> +xbmc-9.04.ebuild,
+  +files/xbmc-9.04-gcc.patch:
+  Version bump #269400 by Tim Bastiaenssens.
+
+  16 May 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Add libsamplerate to DEPEND #269673 by Jan Vansteenkiste.
+
+  29 Apr 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999:
+  Dont install session anymore since upstream does it #267631 by BT and Jan
+  Vansteenkiste, and stop bothering with the xbmc.sh wrapper since it has
+  been updated as well.
+
+  27 Apr 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999:
+  Pull in zip as the build process likes to make zips #266414 by Robert
+  Kerr.
+
+  26 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Fix readline detection in python subdir #262822 by Scott.
+
+  26 Mar 2009; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  xbmc-9999.ebuild:
+  Add USE=vdpau #263435 by Michael Lange.
+
+  23 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Require libcdio #263430 by BT.
+
+  23 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Require audio/video USE flags in libsdl #263349.
+
+  07 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Pull in xdpyinfo #261556 by Michael Lange.
+
+  07 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Drop tre from DEPEND #261501 by BT.
+
+  05 Mar 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Add mesa-progs to the depend list #261226 by Michalis Adamidis.
+
+  24 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/xbmc-fribidi.patch,
+  -files/xbmc-readsector.patch, xbmc-9999.ebuild:
+  And now the fribidi/readsector patches have been merged upstream.
+
+  23 Feb 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Upstream now allows SVN_REV to override svnversion.
+
+  22 Feb 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  MACDll build flags have been merged upstream.
+
+  22 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/xbmc-alsa-params.patch, xbmc-9999.ebuild:
+  Upstream has fixed the ALSA bug, so drop our workaround.
+
+  21 Feb 2009; Mike Frysinger <vapier@gentoo.org> -files/xbmc-noexec.patch,
+  xbmc-9999.ebuild:
+  The noexec patch has been merged upstream.
+
+  21 Feb 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Generate an Xsession so people can log in with xbmc in full screen.
+
+*xbmc-9999 (21 Feb 2009)
+
+  21 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/xbmc-alsa-params.patch, +files/xbmc-fribidi.patch,
+  +files/xbmc-noexec.patch, +files/xbmc-readsector.patch, +metadata.xml,
+  +xbmc-9999.ebuild:
+  Initial ebuild by many people at #198849 (Peter Fern, Rick Harris, etc...)
+  cleaned up by me.
+
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
new file mode 100644
index 0000000..4a1756f
--- /dev/null
+++ b/media-tv/xbmc/Manifest
@@ -0,0 +1,11 @@
+AUX xbmc-9.11-TexturePacker-parallel-build.patch 357 RMD160 37802ec3ce31d10d58802acf267aaf568d3ef8d0 SHA1 5909a4a61e1dbac3f51c6a8c393f1d4cfd7a38ca SHA256 a9b990cdd5473e72cc83cda36cc9faaf67e97649cec45af9c529455464b12d43
+AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
+AUX xbmc-9.11-libpng14.patch 4263 RMD160 90a82d1783f2237416c0932c968347394f303bf9 SHA1 69407df931476df7fd20b30ddc42142d11602d8f SHA256 0516a466f2646867478781251d665e87f6f0697fcd9ce29b91c87194fafc7da6
+AUX xbmc-9.11-shader-upscalers.patch 29024 RMD160 d100a35684cad2a6dea0c6eeb9bfbc00e4151bbb SHA1 130fa8bccb6dfab723daf2ebafd88b6e22c109b3 SHA256 965099c217920d5db259944adc4250ed73e4b08ddcd7b0d88d843c9a9a41d396
+AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
+AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
+DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
+EBUILD xbmc-9.11-r5.ebuild 5824 RMD160 36c46814ddc15ed664517433cd6e87e222242f3d SHA1 ef4bfd04a2e8dd148d911aff25eb91a8afc8fbc3 SHA256 30440e4d97b31df01bb739aad196f9a8e35d8a3292235f5c6144a8489961f928
+EBUILD xbmc-9999.ebuild 5117 RMD160 2de9c00726fe01abe0d21896835400f3bbd403b2 SHA1 ae6544ff539015c71ddd10ea53bfa522ab54a759 SHA256 a499756f56543ea75399bde9063ff1cb0442aa81361704c903178409c4e200f5
+MISC ChangeLog 10670 RMD160 46edecf407171a570f0d74c57813472f9d5817fe SHA1 217f7ee6438be7476862edd25eb8e1fc3e910b69 SHA256 832ba1ce7562e43d748bc0f9c7451dde6b3f9718866fe37da17f78dc5086ebd3
+MISC metadata.xml 579 RMD160 cf1a05346b2c33147e752be840dfb562726b42dd SHA1 0fabb20c84367962605b88b9030fabf6acf3045d SHA256 f61dd5617b99b9fa5505269e6633d317f90a2c6903108bdcc84370cfb8858afb
diff --git a/media-tv/xbmc/files/xbmc-9.11-TexturePacker-parallel-build.patch b/media-tv/xbmc/files/xbmc-9.11-TexturePacker-parallel-build.patch
new file mode 100644
index 0000000..f6bc030
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-TexturePacker-parallel-build.patch
@@ -0,0 +1,13 @@
+http://trac.xbmc.org/ticket/9275
+
+--- xbmc/Makefile.in
++++ xbmc/Makefile.in
+@@ -501,7 +501,7 @@ else
+ 	$(MAKE) -C tools/XBMCTex/
+ endif
+ 
+-tools/TexturePacker/TexturePacker:
++tools/TexturePacker/TexturePacker: guilib/guilib.a xbmc/lib/libsquish/libsquish-@ARCH@.a
+ 	$(MAKE) -C tools/TexturePacker/
+ 
+ install-bin: xbmc.bin # developement convenience target
diff --git a/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch b/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch
new file mode 100644
index 0000000..63cadbf
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-jpeg-speedup.patch
@@ -0,0 +1,18 @@
+fix from upstream
+http://bugs.gentoo.org/300909
+
+r26689 | jmarshallnz | 2010-01-11 14:30:08 -0500 (Mon, 11 Jan 2010) | 2 lines                                                                                               
+fixed: Ticket #7810 - high cpu load during loading of images with libjpeg7, thanks to akawaka.
+
+Index: xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp
+===================================================================
+--- xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp	(revision 26688)
++++ xbmc/lib/cximage-6.0/CxImage/ximajpg.cpp	(revision 26689)
+@@ -220,6 +220,7 @@ bool CxImageJPG::Decode(CxFile * hFile)

+ 

+ 	// Set the scale <ignacio>

+ 	cinfo.scale_denom = GetJpegScale();

++	cinfo.scale_num = 1;
+ 

+ 	// Borrowed the idea from GIF implementation <ignacio>

+ 	if (info.nEscape == -1) {

diff --git a/media-tv/xbmc/files/xbmc-9.11-libpng14.patch b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch
new file mode 100644
index 0000000..b5af087
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-libpng14.patch
@@ -0,0 +1,92 @@
+http://bugs.gentoo.org/319113
+http://repos.archlinux.org/wsvn/community/xbmc/trunk/libpng14.patch
+
+diff -Nur xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
+--- xbmc-9.11.orig/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2008-07-18 23:40:53.000000000 +0300
++++ xbmc-9.11/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp	2010-01-20 21:55:11.000000000 +0200
+@@ -142,9 +142,9 @@
+ 	if (info_ptr->num_trans!=0){ //palette transparency

+ 		if (info_ptr->num_trans==1){

+ 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){

+-				info.nBkgndIndex = info_ptr->trans_values.index;

++				info.nBkgndIndex = info_ptr->trans_color.index;

+ 			} else{

+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;

++				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;

+ 			}

+ 		}

+ 		if (info_ptr->num_trans>1){

+@@ -152,7 +152,7 @@
+ 			if (pal){

+ 				DWORD ip;

+ 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)

+-					pal[ip].rgbReserved=info_ptr->trans[ip];

++					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];

+ 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){

+ 					pal[ip].rgbReserved=255;

+ 				}

+@@ -166,9 +166,9 @@
+ 		int num_trans;

+ 		png_color_16 *image_background;

+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){

+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);

+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);

+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);

++			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);

++			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);

++			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);

+ 			info.nBkgndColor.rgbReserved = 0;

+ 			info.nBkgndIndex = 0;

+ 		}

+@@ -417,12 +417,12 @@
+ 	if (info.nBkgndIndex >= 0){

+ 		info_ptr->num_trans = 1;

+ 		info_ptr->valid |= PNG_INFO_tRNS;

+-		info_ptr->trans = trans;

+-		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;

+-		info_ptr->trans_values.red   = tc.rgbRed;

+-		info_ptr->trans_values.green = tc.rgbGreen;

+-		info_ptr->trans_values.blue  = tc.rgbBlue;

+-		info_ptr->trans_values.gray  = info_ptr->trans_values.index;

++		info_ptr->trans_alpha = trans;

++		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;

++		info_ptr->trans_color.red   = tc.rgbRed;

++		info_ptr->trans_color.green = tc.rgbGreen;

++		info_ptr->trans_color.blue  = tc.rgbBlue;

++		info_ptr->trans_color.gray  = info_ptr->trans_color.index;

+ 

+ 		// the transparency indexes start from 0 for non grayscale palette

+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)

+@@ -443,7 +443,7 @@
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;

+ 			info_ptr->num_trans = (WORD)nc;

+ 			info_ptr->valid |= PNG_INFO_tRNS;

+-			info_ptr->trans = trans;

++			info_ptr->trans_alpha = trans;

+ 		}

+ 

+ 		// copy the palette colors

+diff -Nur xbmc-9.11.orig/xbmc/screensavers/rsxs-0.9/src/pngimage.cc xbmc-9.11/xbmc/screensavers/rsxs-0.9/src/pngimage.cc
+--- xbmc-9.11.orig/xbmc/screensavers/rsxs-0.9/src/pngimage.cc	2008-07-30 23:35:38.000000000 +0300
++++ xbmc-9.11/xbmc/screensavers/rsxs-0.9/src/pngimage.cc	2010-01-20 22:21:01.000000000 +0200
+@@ -65,7 +65,7 @@
+ 			(png_get_color_type(png, pngInfo) == PNG_COLOR_TYPE_GRAY) &&
+ 			png_get_bit_depth(png, pngInfo) < 8
+ 		)
+-			png_set_gray_1_2_4_to_8(png);
++			png_set_expand_gray_1_2_4_to_8(png);
+ 		if (png_get_valid(png, pngInfo, PNG_INFO_tRNS))
+ 			png_set_tRNS_to_alpha(png);
+ 		if (fullColor)
+diff -Nur xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c
+--- xbmc-9.11.orig/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c	2008-08-04 05:05:51.000000000 +0300
++++ xbmc-9.11/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c	2010-01-20 22:16:23.000000000 +0200
+@@ -94,7 +94,7 @@
+ 		png_set_palette_to_rgb (png_ptr);
+ 
+ 	if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+-		png_set_gray_1_2_4_to_8 (png_ptr);
++		png_set_expand_gray_1_2_4_to_8 (png_ptr);
+ 	else if (color_type == PNG_COLOR_TYPE_GRAY ||
+ 					 color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ 			png_set_gray_to_rgb (png_ptr);
diff --git a/media-tv/xbmc/files/xbmc-9.11-shader-upscalers.patch b/media-tv/xbmc/files/xbmc-9.11-shader-upscalers.patch
new file mode 100644
index 0000000..d4feaa4
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-shader-upscalers.patch
@@ -0,0 +1,887 @@
+http://bugs.gentoo.org/306661
+
+backport shader based upscalers from svn trunk
+
+--- language/English/strings.xml
++++ language/English/strings.xml
+@@ -1554,16 +1554,17 @@
+   <string id="16304">Lanczos2</string>
+   <string id="16305">Lanczos3</string>
+   <string id="16306">Sinc8</string>
+-
+   <string id="16307">Bicubic (software)</string>
+   <string id="16308">Lanczos (software)</string>
+   <string id="16309">Sinc (software)</string>
+-
+   <string id="16310">(VDPAU)Temporal</string>
+   <string id="16311">(VDPAU)Temporal/Spatial</string>
+   <string id="16312">(VDPAU)Noise Reduction</string>
+   <string id="16313">(VDPAU)Sharpness</string>
+   <string id="16314">Inverse Telecine</string>
++  <string id="16315">Lanczos3 optimized</string>
++  <string id="16316">Auto</string>
++
+   <string id="17500">Display sleep timeout</string>
+ 
+   <string id="19000">Switch to channel</string>
+--- system/shaders/convolution-6x6.glsl
++++ system/shaders/convolution-6x6.glsl
+@@ -0,0 +1,69 @@
++uniform sampler2D img;
++uniform float     stepx;
++uniform float     stepy;
++
++#if (HAS_FLOAT_TEXTURE)
++uniform sampler1D kernelTex;
++
++vec3 weight(float pos)
++{
++  return texture1D(kernelTex, pos).rgb;
++}
++#else
++uniform sampler2D kernelTex;
++
++vec3 weight(float pos)
++{
++  //row 0 contains the high byte, row 1 contains the low byte
++  return ((texture2D(kernelTex, vec2(pos, 0.0)) * 256.0 + texture2D(kernelTex, vec2(pos, 1.0)))).rgb / 128.5 - 1.0;
++}
++#endif
++
++vec3 pixel(float xpos, float ypos)
++{
++  return texture2D(img, vec2(xpos, ypos)).rgb;
++}
++
++vec3 line (float ypos, vec3 xpos1, vec3 xpos2, vec3 linetaps1, vec3 linetaps2)
++{
++  vec3  pixels;
++
++  pixels  = pixel(xpos1.r, ypos) * linetaps1.r;
++  pixels += pixel(xpos1.g, ypos) * linetaps2.r;
++  pixels += pixel(xpos1.b, ypos) * linetaps1.g;
++  pixels += pixel(xpos2.r, ypos) * linetaps2.g;
++  pixels += pixel(xpos2.g, ypos) * linetaps1.b;
++  pixels += pixel(xpos2.b, ypos) * linetaps2.b;
++
++  return pixels;
++}
++
++void main()
++{
++  float xf = fract(gl_TexCoord[0].x / stepx);
++  float yf = fract(gl_TexCoord[0].y / stepy);
++
++  vec3 linetaps1   = weight((1.0 - xf) / 2.0);
++  vec3 linetaps2   = weight((1.0 - xf) / 2.0 + 0.5);
++  vec3 columntaps1 = weight((1.0 - yf) / 2.0);
++  vec3 columntaps2 = weight((1.0 - yf) / 2.0 + 0.5);
++
++  vec3 xpos1 = vec3(
++      (-1.5 - xf) * stepx + gl_TexCoord[0].x,
++      (-0.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 0.5 - xf) * stepx + gl_TexCoord[0].x);
++  vec3 xpos2 = vec3(
++      ( 1.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 2.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 3.5 - xf) * stepx + gl_TexCoord[0].x);
++
++  gl_FragColor.rgb  = line((-1.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.r;
++  gl_FragColor.rgb += line((-0.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.r;
++  gl_FragColor.rgb += line(( 0.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.g;
++  gl_FragColor.rgb += line(( 1.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.g;
++  gl_FragColor.rgb += line(( 2.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.b;
++  gl_FragColor.rgb += line(( 3.5 - yf) * stepy + gl_TexCoord[0].y, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.b;
++
++  gl_FragColor.a = gl_Color.a;
++}
++
+--- system/shaders/bicubic.glsl
++++ system/shaders/bicubic.glsl
+@@ -0,0 +1,47 @@
++uniform sampler2D img;
++uniform float stepx;
++uniform float stepy;
++uniform sampler2D kernelTex;
++
++vec4 cubicFilter(float xValue, vec4 c0, vec4 c1, vec4 c2, vec4 c3)
++{
++  vec4 h = texture2D(kernelTex, vec2(xValue, 0.5));
++  vec4 r = c0 * h.r;
++  r += c1 * h.g;
++  r += c2 * h.b;
++  r += c3 * h.a;
++  return r;
++}
++
++void main()
++{
++  vec2 f = vec2(gl_TexCoord[0].x / stepx , gl_TexCoord[0].y / stepy);
++  f = fract(f);
++  vec4 t0 = cubicFilter(f.x,
++  texture2D(img, gl_TexCoord[0].xy + vec2(-stepx,    -stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(0.0,       -stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(stepx,     -stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, -stepy)));
++
++  vec4 t1 = cubicFilter(f.x,
++  texture2D(img, gl_TexCoord[0].xy + vec2(-stepx,    0.0)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(0.0,       0.0)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(stepx,     0.0)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, 0.0)));
++
++  vec4 t2 = cubicFilter(f.x,
++  texture2D(img, gl_TexCoord[0].xy + vec2(-stepx,    stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(0.0,       stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(stepx,     stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, stepy)));
++
++  vec4 t3 = cubicFilter(f.x,
++  texture2D(img, gl_TexCoord[0].xy + vec2(-stepx,    2.0*stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(0,         2.0*stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(stepx,     2.0*stepy)),
++  texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, 2.0*stepy)));
++
++  gl_FragColor = cubicFilter(f.y, t0, t1, t2, t3);   
++  gl_FragColor.a = gl_Color.a;
++}
++
+--- system/shaders/convolution-4x4.glsl
++++ system/shaders/convolution-4x4.glsl
+@@ -0,0 +1,60 @@
++uniform sampler2D img;
++uniform float     stepx;
++uniform float     stepy;
++
++#if (HAS_FLOAT_TEXTURE)
++uniform sampler1D kernelTex;
++
++vec4 weight(float pos)
++{
++  return texture1D(kernelTex, pos);
++}
++#else
++uniform sampler2D kernelTex;
++
++vec4 weight(float pos)
++{
++  //row 0 contains the high byte, row 1 contains the low byte
++  return (texture2D(kernelTex, vec2(pos, 0.0)) * 256.0 + texture2D(kernelTex, vec2(pos, 1.0))) / 128.5 - 1.0;
++}
++#endif
++
++vec3 pixel(float xpos, float ypos)
++{
++  return texture2D(img, vec2(xpos, ypos)).rgb;
++}
++
++vec3 line (float ypos, vec4 xpos, vec4 linetaps)
++{
++  vec3  pixels;
++
++  pixels  = pixel(xpos.r, ypos) * linetaps.r;
++  pixels += pixel(xpos.g, ypos) * linetaps.g;
++  pixels += pixel(xpos.b, ypos) * linetaps.b;
++  pixels += pixel(xpos.a, ypos) * linetaps.a;
++
++  return pixels;
++}
++
++void main()
++{
++  float xf = fract(gl_TexCoord[0].x / stepx);
++  float yf = fract(gl_TexCoord[0].y / stepy);
++
++  vec4 linetaps   = weight(1.0 - xf);
++  vec4 columntaps = weight(1.0 - yf);
++
++  vec4 xpos = vec4(
++      (-0.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 0.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 1.5 - xf) * stepx + gl_TexCoord[0].x,
++      ( 2.5 - xf) * stepx + gl_TexCoord[0].x);
++
++  gl_FragColor.rgb  = line((-0.5 - yf) * stepy + gl_TexCoord[0].y, xpos, linetaps) * columntaps.r;
++  gl_FragColor.rgb += line(( 0.5 - yf) * stepy + gl_TexCoord[0].y, xpos, linetaps) * columntaps.g;
++  gl_FragColor.rgb += line(( 1.5 - yf) * stepy + gl_TexCoord[0].y, xpos, linetaps) * columntaps.b;
++  gl_FragColor.rgb += line(( 2.5 - yf) * stepy + gl_TexCoord[0].y, xpos, linetaps) * columntaps.a;
++
++  gl_FragColor.a = gl_Color.a;
++}
++
+--- xbmc/settings/VideoSettings.h
++++ xbmc/settings/VideoSettings.h
+@@ -51,9 +51,10 @@
+ {
+   VS_SCALINGMETHOD_NEAREST=0,
+   VS_SCALINGMETHOD_LINEAR,
+-  
++
+   VS_SCALINGMETHOD_CUBIC,
+   VS_SCALINGMETHOD_LANCZOS2,
++  VS_SCALINGMETHOD_LANCZOS3_FAST,
+   VS_SCALINGMETHOD_LANCZOS3,
+   VS_SCALINGMETHOD_SINC8,
+   VS_SCALINGMETHOD_NEDI,
+@@ -61,7 +62,9 @@
+   VS_SCALINGMETHOD_BICUBIC_SOFTWARE,
+   VS_SCALINGMETHOD_LANCZOS_SOFTWARE,
+   VS_SCALINGMETHOD_SINC_SOFTWARE,
+-  VS_SCALINGMETHOD_VDPAU_HARDWARE
++  VS_SCALINGMETHOD_VDPAU_HARDWARE,
++
++  VS_SCALINGMETHOD_AUTO
+ };
+ 
+ class CVideoSettings
+--- xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
++++ xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp
+@@ -21,6 +21,7 @@
+ #include "system.h"
+ #include "VideoFilterShader.h"
+ #include "utils/log.h"
++#include "ConvolutionKernels.h"
+ 
+ #include <string>
+ #include <math.h>
+@@ -63,60 +64,13 @@
+ 
+ BicubicFilterShader::BicubicFilterShader(float B, float C)
+ {
+-  string shaderf = 
+-    "uniform sampler2D img;"
+-    "uniform float stepx;"
+-    "uniform float stepy;"
+-    "uniform sampler2D kernelTex;"
+-    
+-    "vec4 cubicFilter(float xValue, vec4 c0, vec4 c1, vec4 c2, vec4 c3)"
+-    "{"
+-    " vec4 h = texture2D(kernelTex, vec2(xValue, 0.5));"
+-    " vec4 r = c0 * h.r;"
+-    " r += c1 * h.g;"
+-    " r += c2 * h.b;"
+-    " r += c3 * h.a;"
+-    " return r;"
+-    "}"
+-    ""
+-    "void main()"
+-    "{"
+-    "vec2 f = vec2(gl_TexCoord[0].x / stepx , gl_TexCoord[0].y / stepy);"
+-    "f = fract(f);"
+-    "vec4 t0 = cubicFilter(f.x,"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(-stepx, -stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(0.0, -stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(stepx, -stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, -stepy)));"
+-    ""
+-    "vec4 t1 = cubicFilter(f.x,"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(-stepx, 0.0)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(0.0, 0.0)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(stepx, 0.0)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, 0.0)));"
+-    ""
+-    "vec4 t2 = cubicFilter(f.x,"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(-stepx, stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(0.0, stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(stepx, stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, stepy)));"
+-    ""
+-    "vec4 t3 = cubicFilter(f.x,"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(-stepx, 2.0*stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(0, 2.0*stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(stepx, 2.0*stepy)),"
+-    "texture2D(img, gl_TexCoord[0].xy + vec2(2.0*stepx, 2.0*stepy)));"
+-    
+-    "gl_FragColor = cubicFilter(f.y, t0, t1, t2, t3) ;"    
+-    "gl_FragColor.a = gl_Color.a;"
+-    "}";
+-  PixelShader()->SetSource(shaderf);
++  PixelShader()->LoadSource("bicubic.glsl");
+   m_kernelTex1 = 0;
+   m_B = B;
+   m_C = C;
+-  if (B<=0)
++  if (B<0)
+     m_B=1.0f/3.0f;
+-  if (C<=0)
++  if (C<0)
+     m_C=1.0f/3.0f;
+ }
+ 
+@@ -209,8 +163,8 @@
+   glBindTexture(GL_TEXTURE_2D, m_kernelTex1);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
++  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
++  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, size, 1, 0, GL_RGBA, GL_FLOAT, img);
+ 
+   glActiveTexture(GL_TEXTURE0);
+@@ -254,4 +208,110 @@
+   return val;
+ }
+ 
++ConvolutionFilterShader::ConvolutionFilterShader(ESCALINGMETHOD method)
++{
++  m_method = method;
++  m_kernelTex1 = 0;
++
++  string shadername;
++  string defines;
++
++  if (m_method == VS_SCALINGMETHOD_CUBIC ||
++      m_method == VS_SCALINGMETHOD_LANCZOS2 ||
++      m_method == VS_SCALINGMETHOD_LANCZOS3_FAST)
++    shadername = "convolution-4x4.glsl";
++  else if (m_method == VS_SCALINGMETHOD_LANCZOS3)
++    shadername = "convolution-6x6.glsl";
++
++  m_floattex = glewIsSupported("GL_ARB_texture_float");
++
++  if (m_floattex)
++    defines = "#define HAS_FLOAT_TEXTURE 1\n";
++  else
++    defines = "#define HAS_FLOAT_TEXTURE 0\n";
++
++  CLog::Log(LOGDEBUG, "GL: ConvolutionFilterShader: using %s defines: %s", shadername.c_str(), defines.c_str());
++  PixelShader()->LoadSource(shadername, defines);
++}
++
++void ConvolutionFilterShader::OnCompiledAndLinked()
++{
++  // obtain shader attribute handles on successfull compilation
++  m_hSourceTex = glGetUniformLocation(ProgramHandle(), "img");
++  m_hStepX     = glGetUniformLocation(ProgramHandle(), "stepx");
++  m_hStepY     = glGetUniformLocation(ProgramHandle(), "stepy");
++  m_hKernTex   = glGetUniformLocation(ProgramHandle(), "kernelTex");
++
++  CConvolutionKernel kernel(m_method, 256);
++
++  if (m_kernelTex1)
++  {
++    glDeleteTextures(1, &m_kernelTex1);
++    m_kernelTex1 = 0;
++  }
++
++  glGenTextures(1, &m_kernelTex1);
++
++  if ((m_kernelTex1<=0))
++  {
++    CLog::Log(LOGERROR, "GL: ConvolutionFilterShader: Error creating kernel texture");
++    return;
++  }
++
++  glActiveTexture(GL_TEXTURE2);
++
++  //if float textures are supported, we can load the kernel as a 1d float texture
++  //if not, we load it as a 2d texture with 2 rows, where row 0 contains the high byte
++  //and row 1 contains the low byte, which can be converted in the shader
++  if (m_floattex)
++  {
++    glBindTexture(GL_TEXTURE_1D, m_kernelTex1);
++    glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++    glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++    glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++    glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++    glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA16F_ARB, kernel.GetSize(), 0, GL_RGBA, GL_FLOAT, kernel.GetFloatPixels());
++  }
++  else
++  {
++    glBindTexture(GL_TEXTURE_2D, m_kernelTex1);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kernel.GetSize(), 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, kernel.GetIntFractPixels());
++  }
++
++  glActiveTexture(GL_TEXTURE0);
++
++  VerifyGLState();
++}
++
++bool ConvolutionFilterShader::OnEnabled()
++{
++  // set shader attributes once enabled
++  glActiveTexture(GL_TEXTURE2);
++
++  if (m_floattex)
++    glBindTexture(GL_TEXTURE_1D, m_kernelTex1);
++  else
++    glBindTexture(GL_TEXTURE_2D, m_kernelTex1);
++
++  glActiveTexture(GL_TEXTURE0);
++  glUniform1i(m_hSourceTex, m_sourceTexUnit);
++  glUniform1i(m_hKernTex, 2);
++  glUniform1f(m_hStepX, m_stepX);
++  glUniform1f(m_hStepY, m_stepY);
++  VerifyGLState();
++  return true;
++}
++
++void ConvolutionFilterShader::Free()
++{
++  if (m_kernelTex1)
++    glDeleteTextures(1, &m_kernelTex1);
++  m_kernelTex1 = 0;
++  BaseVideoFilterShader::Free();
++}
++
+ #endif
+--- xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
++++ xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp
+@@ -0,0 +1,226 @@
++/*
++ *      Copyright (C) 2005-2008 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with XBMC; see the file COPYING.  If not, write to
++ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ *  http://www.gnu.org/copyleft/gpl.html
++ *
++ */
++#ifdef _WIN32
++  #define _USE_MATH_DEFINES
++#endif
++
++#include "ConvolutionKernels.h"
++#include "MathUtils.h"
++
++#define SINC(x) (sin(M_PI * (x)) / (M_PI * (x)))
++
++CConvolutionKernel::CConvolutionKernel(ESCALINGMETHOD method, int size)
++{
++  m_size = size;
++  m_floatpixels = new float[m_size * 4];
++
++  if (method == VS_SCALINGMETHOD_LANCZOS2)
++    Lanczos2();
++  else if (method == VS_SCALINGMETHOD_LANCZOS3_FAST)
++    Lanczos3Fast();
++  else if (method == VS_SCALINGMETHOD_LANCZOS3)
++    Lanczos3();
++  else if (method == VS_SCALINGMETHOD_CUBIC) 
++    Bicubic(1.0 / 3.0, 1.0 / 3.0);
++
++  ToIntFract();
++}
++
++CConvolutionKernel::~CConvolutionKernel()
++{
++  delete [] m_floatpixels;
++  delete [] m_intfractpixels;
++}
++
++//generate a lanczos2 kernel which can be loaded with RGBA format
++//each value of RGBA has one tap, so a shader can load 4 taps with a single pixel lookup
++void CConvolutionKernel::Lanczos2()
++{
++  for (int i = 0; i < m_size; i++)
++  {
++    double x = (double)i / (double)m_size;
++
++    //generate taps
++    for (int j = 0; j < 4; j++)
++      m_floatpixels[i * 4 + j] = (float)LanczosWeight(x + (double)(j - 2), 2.0);
++
++    //any collection of 4 taps added together needs to be exactly 1.0
++    //for lanczos this is not always the case, so we take each collection of 4 taps
++    //and divide those taps by the sum of the taps
++    float weight = 0.0;
++    for (int j = 0; j < 4; j++)
++      weight += m_floatpixels[i * 4 + j];
++
++    for (int j = 0; j < 4; j++)
++      m_floatpixels[i * 4 + j] /= weight;
++  }
++}
++
++//generate a lanczos3 kernel which can be loaded with RGBA format
++//each value of RGBA has one tap, so a shader can load 4 taps with a single pixel lookup
++//the two outer lobes of the lanczos3 kernel are added to the two lobes one step to the middle
++//this basically looks the same as lanczos3, but the kernel only has 4 taps,
++//so it can use the 4x4 convolution shader which is twice as fast as the 6x6 one
++void CConvolutionKernel::Lanczos3Fast()
++{
++  for (int i = 0; i < m_size; i++)
++  {
++    double a = 3.0;
++    double x = (double)i / (double)m_size;
++
++    //generate taps
++    m_floatpixels[i * 4 + 0] = (float)(LanczosWeight(x - 2.0, a) + LanczosWeight(x - 3.0, a));
++    m_floatpixels[i * 4 + 1] = (float) LanczosWeight(x - 1.0, a);
++    m_floatpixels[i * 4 + 2] = (float) LanczosWeight(x      , a);
++    m_floatpixels[i * 4 + 3] = (float)(LanczosWeight(x + 1.0, a) + LanczosWeight(x + 2.0, a));
++
++    //any collection of 4 taps added together needs to be exactly 1.0
++    //for lanczos this is not always the case, so we take each collection of 4 taps
++    //and divide those taps by the sum of the taps
++    float weight = 0.0;
++    for (int j = 0; j < 4; j++)
++      weight += m_floatpixels[i * 4 + j];
++
++    for (int j = 0; j < 4; j++)
++      m_floatpixels[i * 4 + j] /= weight;
++  }
++}
++
++//generate a lanczos3 kernel which can be loaded with RGBA format
++//each value of RGB has one tap, so a shader can load 3 taps with a single pixel lookup
++void CConvolutionKernel::Lanczos3()
++{
++  for (int i = 0; i < m_size; i++)
++  {
++    double x = (double)i / (double)m_size;
++
++    //generate taps
++    for (int j = 0; j < 3; j++)
++      m_floatpixels[i * 4 + j] = (float)LanczosWeight(x * 2.0 + (double)(j * 2 - 3), 3.0);
++
++    m_floatpixels[i * 4 + 3] = 0.0;
++  }
++
++  //any collection of 6 taps added together needs to be exactly 1.0
++  //for lanczos this is not always the case, so we take each collection of 6 taps
++  //and divide those taps by the sum of the taps
++  for (int i = 0; i < m_size / 2; i++)
++  {
++    float weight = 0.0;
++    for (int j = 0; j < 3; j++)
++    {
++      weight += m_floatpixels[i * 4 + j];
++      weight += m_floatpixels[(i + m_size / 2) * 4 + j];
++    }
++    for (int j = 0; j < 3; j++)
++    {
++      m_floatpixels[i * 4 + j] /= weight;
++      m_floatpixels[(i + m_size / 2) * 4 + j] /= weight;
++    }
++  }
++}
++
++//generate a bicubic kernel which can be loaded with RGBA format
++//each value of RGBA has one tap, so a shader can load 4 taps with a single pixel lookup
++void CConvolutionKernel::Bicubic(double B, double C)
++{
++  for (int i = 0; i < m_size; i++)
++  {
++    double x = (double)i / (double)m_size;
++
++    //generate taps
++    for (int j = 0; j < 4; j++)
++      m_floatpixels[i * 4 + j] = (float)BicubicWeight(x + (double)(j - 2), B, C);
++  }
++}
++
++double CConvolutionKernel::LanczosWeight(double x, double radius)
++{
++  double ax = fabs(x);
++
++  if (ax == 0.0)
++    return 1.0;
++  else if (ax < radius)
++    return SINC(ax) * SINC(ax / radius);
++  else
++    return 0.0;
++}
++
++double CConvolutionKernel::BicubicWeight(double x, double B, double C)
++{
++  double ax = fabs(x);
++
++  if (ax<1.0)
++  {
++    return ((12 - 9*B - 6*C) * ax * ax * ax +
++            (-18 + 12*B + 6*C) * ax * ax +
++            (6 - 2*B))/6;
++  }
++  else if (ax<2.0)
++  {
++    return ((-B - 6*C) * ax * ax * ax + 
++            (6*B + 30*C) * ax * ax + (-12*B - 48*C) * 
++             ax + (8*B + 24*C)) / 6;
++  }
++  else
++  {
++    return 0.0;
++  }
++}
++
++
++//convert float to high byte/low byte, so the kernel can be loaded into an 8 bit texture
++//with height 2 and converted back to real float in the shader
++//it only works when the kernel texture uses nearest neighbour, but there's almost no difference
++//between that and linear interpolation
++void CConvolutionKernel::ToIntFract()
++{
++  m_intfractpixels = new uint8_t[m_size * 8];
++
++  for (int i = 0; i < m_size * 4; i++)
++  {
++    int value = MathUtils::round_int((m_floatpixels[i] + 1.0) / 2.0 * 65535.0);
++    if (value < 0)
++      value = 0;
++    else if (value > 65535)
++      value = 65535;
++    
++    int integer = value / 256;
++    int fract   = value % 256;
++
++    m_intfractpixels[i] = (uint8_t)integer;
++    m_intfractpixels[i + m_size * 4] = (uint8_t)fract;
++  }
++
++#if 0
++  for (int i = 0; i < 4; i++)
++  {
++    for (int j = 0; j < m_size; j++)
++    {
++      printf("%i %f %f\n",
++          i * m_size + j,
++          ((double)m_intfractpixels[j * 4 + i] + (double)m_intfractpixels[j * 4 + i + m_size * 4] / 255.0) / 255.0 * 2.0 - 1.0,
++          m_floatpixels[j * 4 + i]);
++    }
++  }
++#endif
++}
++
+--- xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h
++++ xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h
+@@ -4,6 +4,7 @@
+ #ifdef HAS_GL
+ 
+ #include "../../../../guilib/Shader.h"
++#include "../../../settings/VideoSettings.h"
+ 
+ using namespace Shaders;
+ 
+@@ -35,7 +36,7 @@
+   class BicubicFilterShader : public BaseVideoFilterShader
+   {
+   public:
+-    BicubicFilterShader(float B=0.0f, float C=0.0f);
++    BicubicFilterShader(float B=-1.0f, float C=-1.0f);
+     void OnCompiledAndLinked();
+     bool OnEnabled();
+     void Free();
+@@ -55,6 +56,25 @@
+     float m_C;
+   };
+ 
++  class ConvolutionFilterShader : public BaseVideoFilterShader
++  {
++  public:
++    ConvolutionFilterShader(ESCALINGMETHOD method);
++    void OnCompiledAndLinked();
++    bool OnEnabled();
++    void Free();
++
++  protected:
++    // kernel textures
++    GLuint m_kernelTex1;
++
++    // shader handles to kernel textures
++    GLint m_hKernTex;
++
++    ESCALINGMETHOD m_method;
++    bool           m_floattex; //if float textures are supported
++  };
++
+ } // end namespace
+ 
+ #endif
+--- xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h
++++ xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h
+@@ -0,0 +1,55 @@
++/*
++ *      Copyright (C) 2005-2008 Team XBMC
++ *      http://www.xbmc.org
++ *
++ *  This Program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2, or (at your option)
++ *  any later version.
++ *
++ *  This Program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with XBMC; see the file COPYING.  If not, write to
++ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
++ *  http://www.gnu.org/copyleft/gpl.html
++ *
++ */
++
++#ifndef CONVOLUTIONKERNELS
++#define CONVOLUTIONKERNELS
++
++#include "system.h"
++#include "../../../settings/VideoSettings.h"
++
++class CConvolutionKernel
++{
++  public:
++    CConvolutionKernel(ESCALINGMETHOD method, int size);
++    ~CConvolutionKernel();
++
++    int      GetSize()           { return m_size; }
++    float*   GetFloatPixels()    { return m_floatpixels; }
++    uint8_t* GetIntFractPixels() { return m_intfractpixels; }
++
++  private:
++
++    void Lanczos2();
++    void Lanczos3Fast();
++    void Lanczos3();
++    void Bicubic(double B, double C);
++
++    double LanczosWeight(double x, double radius);
++    double BicubicWeight(double x, double B, double C);
++
++    void ToIntFract();
++
++    int      m_size;
++    float*   m_floatpixels;
++    uint8_t* m_intfractpixels;
++};
++
++#endif //CONVOLUTIONKERNELS
+--- xbmc/cores/VideoRenderers/VideoShaders/Makefile
++++ xbmc/cores/VideoRenderers/VideoShaders/Makefile
+@@ -1,5 +1,5 @@
+ INCLUDES=-I. -I.. -I../../ -I../../../ -I../../../linux -I../../../../guilib
+-SRCS=YUV2RGBShader.cpp VideoFilterShader.cpp
++SRCS=YUV2RGBShader.cpp VideoFilterShader.cpp ConvolutionKernels.cpp
+ 
+ LIB=VideoShaders.a
+ 
+--- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -886,6 +886,19 @@
+ 
+   VerifyGLState();
+ 
++  if (m_scalingMethod == VS_SCALINGMETHOD_AUTO)
++  {
++    bool scaleSD = (int)m_sourceWidth < m_upscalingWidth && (int)m_sourceHeight < m_upscalingHeight &&
++                   m_sourceHeight < 720 && m_sourceWidth < 1280;
++
++    if (Supports(VS_SCALINGMETHOD_VDPAU_HARDWARE))
++      m_scalingMethod = VS_SCALINGMETHOD_VDPAU_HARDWARE;
++    else if (Supports(VS_SCALINGMETHOD_LANCZOS3_FAST) && scaleSD)
++      m_scalingMethod = VS_SCALINGMETHOD_LANCZOS3_FAST;
++    else
++      m_scalingMethod = VS_SCALINGMETHOD_LINEAR;
++  }
++
+   switch (m_scalingMethod)
+   {
+   case VS_SCALINGMETHOD_NEAREST:
+@@ -898,13 +911,10 @@
+     m_renderQuality = RQ_SINGLEPASS;
+     return;
+ 
++  case VS_SCALINGMETHOD_LANCZOS2:
++  case VS_SCALINGMETHOD_LANCZOS3_FAST:
++  case VS_SCALINGMETHOD_LANCZOS3:
+   case VS_SCALINGMETHOD_CUBIC:
+-    if(!glewIsSupported("GL_ARB_texture_float"))
+-    {
+-      CLog::Log(LOGERROR, "GL: hardware doesn't support GL_ARB_texture_float");
+-      break;
+-    }
+-
+     if (!m_fbo.Initialize())
+     {
+       CLog::Log(LOGERROR, "GL: Error initializing FBO");
+@@ -917,7 +927,7 @@
+       break;
+     }
+ 
+-    m_pVideoFilterShader = new BicubicFilterShader(0.3f, 0.3f);
++    m_pVideoFilterShader = new ConvolutionFilterShader(m_scalingMethod);
+     if (!m_pVideoFilterShader->CompileAndLink())
+     {
+       CLog::Log(LOGERROR, "GL: Error compiling and linking video filter shader");
+@@ -928,8 +938,6 @@
+     m_renderQuality = RQ_MULTIPASS;
+     return;
+ 
+-  case VS_SCALINGMETHOD_LANCZOS2:
+-  case VS_SCALINGMETHOD_LANCZOS3:
+   case VS_SCALINGMETHOD_SINC8:
+   case VS_SCALINGMETHOD_NEDI:
+     CLog::Log(LOGERROR, "GL: TODO: This scaler has not yet been implemented");
+@@ -1895,16 +1903,19 @@
+ bool CLinuxRendererGL::Supports(ESCALINGMETHOD method)
+ {
+   if(method == VS_SCALINGMETHOD_NEAREST
+-  || method == VS_SCALINGMETHOD_LINEAR)
++  || method == VS_SCALINGMETHOD_LINEAR
++  || method == VS_SCALINGMETHOD_AUTO)
+     return true;
+ 
+-
+-  if(method == VS_SCALINGMETHOD_CUBIC 
+-  && glewIsSupported("GL_ARB_texture_float")
+-  && glewIsSupported("GL_EXT_framebuffer_object")
+-  && m_renderMethod == RENDER_GLSL)
+-    return true;
+-
++  if(method == VS_SCALINGMETHOD_CUBIC
++  || method == VS_SCALINGMETHOD_LANCZOS2
++  || method == VS_SCALINGMETHOD_LANCZOS3_FAST
++  || method == VS_SCALINGMETHOD_LANCZOS3)
++  {
++    if (glewIsSupported("GL_EXT_framebuffer_object") && (m_renderMethod & RENDER_GLSL))
++      return true;
++  }
++ 
+   if (g_advancedSettings.m_videoHighQualityScaling != SOFTWARE_UPSCALING_DISABLED)
+   {
+     if(method == VS_SCALINGMETHOD_BICUBIC_SOFTWARE
+--- xbmc/GUIDialogVideoSettings.cpp
++++ xbmc/GUIDialogVideoSettings.cpp
+@@ -103,6 +103,7 @@
+     entries.push_back(make_pair(VS_SCALINGMETHOD_LINEAR           , 16302));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_CUBIC            , 16303));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_LANCZOS2         , 16304));
++    entries.push_back(make_pair(VS_SCALINGMETHOD_LANCZOS3_FAST    , 16315));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_LANCZOS3         , 16305));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_SINC8            , 16306));
+ //    entries.push_back(make_pair(VS_SCALINGMETHOD_NEDI             , ?????));
+@@ -110,6 +111,7 @@
+     entries.push_back(make_pair(VS_SCALINGMETHOD_LANCZOS_SOFTWARE , 16308));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_SINC_SOFTWARE    , 16309));
+     entries.push_back(make_pair(VS_SCALINGMETHOD_VDPAU_HARDWARE   , 13120));
++    entries.push_back(make_pair(VS_SCALINGMETHOD_AUTO             , 16316));
+ 
+     /* remove unsupported methods */
+     for(vector<pair<int, int> >::iterator it = entries.begin(); it != entries.end();)
+--- xbmc/Settings.cpp
++++ xbmc/Settings.cpp
+@@ -772,7 +772,7 @@
+     GetInteger(pElement, "interlacemethod", interlaceMethod, VS_INTERLACEMETHOD_NONE, VS_INTERLACEMETHOD_NONE, VS_INTERLACEMETHOD_INVERSE_TELECINE);
+     m_stSettings.m_defaultVideoSettings.m_InterlaceMethod = (EINTERLACEMETHOD)interlaceMethod;
+     int scalingMethod;
+-    GetInteger(pElement, "scalingmethod", scalingMethod, VS_SCALINGMETHOD_LINEAR, VS_SCALINGMETHOD_NEAREST, VS_SCALINGMETHOD_CUBIC);
++    GetInteger(pElement, "scalingmethod", scalingMethod, VS_SCALINGMETHOD_LINEAR, VS_SCALINGMETHOD_NEAREST, VS_SCALINGMETHOD_AUTO);
+     m_stSettings.m_defaultVideoSettings.m_ScalingMethod = (ESCALINGMETHOD)scalingMethod;
+ 
+     GetInteger(pElement, "viewmode", m_stSettings.m_defaultVideoSettings.m_ViewMode, VIEW_MODE_NORMAL, VIEW_MODE_NORMAL, VIEW_MODE_CUSTOM);
diff --git a/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch b/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch
new file mode 100644
index 0000000..345d911
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch
@@ -0,0 +1,129 @@
+diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
+index 9097519..9b6418d 100644
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -236,7 +236,11 @@
+ #endif
+ 
+ #ifdef HAS_DVD_DRIVE
++#ifdef _WIN32
+ #include "lib/libcdio/logging.h"
++#else
++#include <cdio/logging.h>
++#endif
+ #endif
+ 
+ #ifdef HAS_HAL
+diff --git a/xbmc/FileSystem/Makefile b/xbmc/FileSystem/Makefile
+index 782d57a..1e524ed 100644
+--- a/xbmc/FileSystem/Makefile
++++ b/xbmc/FileSystem/Makefile
+@@ -1,5 +1,4 @@
+ INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+-INCLUDES+=-I../lib/libcdio/libcdio/include
+ 
+ CXXFLAGS+=-D__STDC_FORMAT_MACROS \
+ 
+diff --git a/xbmc/FileSystem/cdioSupport.cpp b/xbmc/FileSystem/cdioSupport.cpp
+index 00e5fdd..21a0b67 100644
+--- a/xbmc/FileSystem/cdioSupport.cpp
++++ b/xbmc/FileSystem/cdioSupport.cpp
+@@ -26,7 +26,7 @@
+ #include "cdioSupport.h"
+ #include "utils/SingleLock.h"
+ #include "utils/log.h"
+-#ifndef _LINUX
++#ifdef _WIN32
+ #include "lib/libcdio/logging.h"
+ #include "lib/libcdio/util.h"
+ #include "lib/libcdio/mmc.h"
+diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
+index 6e1633f..58fbc50 100644
+--- a/xbmc/FileSystem/iso9660.cpp
++++ b/xbmc/FileSystem/iso9660.cpp
+@@ -44,7 +44,7 @@ ISO9660
+ #include "utils/CharsetConverter.h"
+ 
+ #include "DetectDVDType.h"  // for MODE2_DATA_SIZE etc.
+-#ifdef _LINUX
++#ifndef _WIN32
+ #include <cdio/bytesex.h>
+ #else
+ #include "lib/libcdio/bytesex.h" // for from_723 & from_733
+diff --git a/xbmc/Makefile b/xbmc/Makefile
+index abfbdcb..f55381a 100644
+--- a/xbmc/Makefile
++++ b/xbmc/Makefile
+@@ -8,8 +8,6 @@ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
+           -Ilib/libUPnP/Neptune/Source/System/Posix \
+           -Ilib/libUPnP/Neptune/Source/Core
+ 
+-INCLUDES+=-Ilib/libcdio/libcdio/include
+-
+ SRCS=Application.cpp \
+      CueDocument.cpp \
+      GUISettings.cpp \
+diff --git a/xbmc/cdrip/CDDAReader.cpp b/xbmc/cdrip/CDDAReader.cpp
+index c8b37b2..e3e9c0b 100644
+--- a/xbmc/cdrip/CDDAReader.cpp
++++ b/xbmc/cdrip/CDDAReader.cpp
+@@ -24,7 +24,11 @@
+ #ifdef HAS_CDDA_RIPPER
+ 
+ #include "CDDAReader.h"
++#ifdef _WIN32
+ #include "lib/libcdio/cdio.h"
++#else
++#include <cdio/cdio.h>
++#endif
+ #include "utils/log.h"
+ 
+ #define SECTOR_COUNT 52
+diff --git a/xbmc/cores/paplayer/AC3CDDACodec.cpp b/xbmc/cores/paplayer/AC3CDDACodec.cpp
+index 20cded7..f2a077a 100644
+--- a/xbmc/cores/paplayer/AC3CDDACodec.cpp
++++ b/xbmc/cores/paplayer/AC3CDDACodec.cpp
+@@ -22,7 +22,11 @@
+ #include "system.h"
+ #include "AC3CDDACodec.h"
+ #ifdef HAS_AC3_CDDA_CODEC
++#ifdef _WIN32
+ #include "lib/libcdio/sector.h"
++#else
++#include <cdio/sector.h>
++#endif
+ 
+ AC3CDDACodec::AC3CDDACodec() : AC3Codec()
+ {
+diff --git a/xbmc/cores/paplayer/CDDAcodec.cpp b/xbmc/cores/paplayer/CDDAcodec.cpp
+index ca8f1be..42460dc 100644
+--- a/xbmc/cores/paplayer/CDDAcodec.cpp
++++ b/xbmc/cores/paplayer/CDDAcodec.cpp
+@@ -20,7 +20,11 @@
+  */
+ 
+ #include "CDDAcodec.h"
++#ifdef _WIN32
+ #include "lib/libcdio/sector.h"
++#else
++#include <cdio/sector.h>
++#endif
+ 
+ #define SECTOR_COUNT 55 // max. sectors that can be read at once
+ #define MAX_BUFFER_SIZE 2*SECTOR_COUNT*CDIO_CD_FRAMESIZE_RAW
+diff --git a/xbmc/cores/paplayer/DTSCDDACodec.cpp b/xbmc/cores/paplayer/DTSCDDACodec.cpp
+index e64cc2e..9bc46c6 100644
+--- a/xbmc/cores/paplayer/DTSCDDACodec.cpp
++++ b/xbmc/cores/paplayer/DTSCDDACodec.cpp
+@@ -22,7 +22,11 @@
+ #include "system.h"
+ #include "DTSCDDACodec.h"
+ #ifdef HAS_DTS_CODEC
++#ifdef _WIN32
+ #include "lib/libcdio/sector.h"
++#else
++#include <cdio/sector.h>
++#endif
+ 
+ DTSCDDACodec::DTSCDDACodec() : DTSCodec()
+ {
diff --git a/media-tv/xbmc/files/xbmc-9.11-wavpack.patch b/media-tv/xbmc/files/xbmc-9.11-wavpack.patch
new file mode 100644
index 0000000..4ef0d14
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9.11-wavpack.patch
@@ -0,0 +1,44 @@
+fix from upstream trunk
+
+http://xbmc.org/trac/ticket/8185
+
+Index: trunk/xbmc/cores/paplayer/DllWAVPack.h
+===================================================================
+--- trunk/xbmc/cores/paplayer/DllWAVPack.h	(revision 22927)
++++ trunk/xbmc/cores/paplayer/DllWAVPack.h	(revision 25321)
+@@ -58,7 +58,7 @@
+     virtual int WavpackGetReducedChannels (WavpackContext *wpc)=0;
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)=0;
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)=0;
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)=0;
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)=0;
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)=0;
+     virtual void WavpackSeekTrailingWrapper (WavpackContext *wpc)=0;
+@@ -77,5 +77,5 @@
+     virtual int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples)=0;
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)=0;
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual int WavpackPackInit (WavpackContext *wpc)=0;
+     virtual int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count)=0;
+@@ -133,9 +133,9 @@
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)
+         { return ::WavpackGetFloatNormExp (wpc); }
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackGetMD5Sum (wpc, data); }
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)
+         { return ::WavpackGetWrapperBytes (wpc); }
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)
+         { return ::WavpackGetWrapperData (wpc); }
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)
+@@ -171,5 +171,5 @@
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)
+         { return ::WavpackAddWrapper (wpc, data, bcount); }
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackStoreMD5Sum (wpc, data); }
+     virtual int WavpackPackInit (WavpackContext *wpc)
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
new file mode 100644
index 0000000..0b70769
--- /dev/null
+++ b/media-tv/xbmc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>xbox</herd>
+<use>
+ <flag name='midi'>Support MIDI files</flag>
+ <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+ <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
+ <flag name='vdpau'>enable support for Video Decode and Presentation API for Unix</flag>
+ <flag name='webserver'>Enable internal webserver</flag>
+ <flag name='xrandr'>Support X randr extension</flag>
+</use>
+</pkgmetadata>
diff --git a/media-tv/xbmc/xbmc-9.11-r5.ebuild b/media-tv/xbmc/xbmc-9.11-r5.ebuild
new file mode 100644
index 0000000..4da4733
--- /dev/null
+++ b/media-tv/xbmc/xbmc-9.11-r5.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.4 2010/07/11 19:35:11 vapier Exp $
+
+EAPI="2"
+
+inherit eutils python flag-o-matic
+
+# Use XBMC_ESVN_REPO_URI to track a different branch
+ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk}
+ESVN_PROJECT=${ESVN_REPO_URI##*/svnroot/}
+ESVN_PROJECT=${ESVN_PROJECT%/*}
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion autotools
+	KEYWORDS=""
+else
+	inherit autotools
+	MY_P=${P/_/-}
+	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa altivec avahi css debug joystick midi profile pulseaudio sse sse2 vdpau xrandr"
+
+RDEPEND="virtual/opengl
+	app-arch/bzip2
+	app-arch/unrar
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	dev-lang/python:2.4
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	dev-libs/libpcre
+	dev-libs/lzo
+	>=dev-python/pysqlite-2
+	media-libs/a52dec
+	media-libs/alsa-lib
+	aac? ( media-libs/faac )
+	media-libs/faad2
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glew
+	media-libs/jasper
+	media-libs/jbigkit
+	media-libs/jpeg:0
+	>=media-libs/libass-0.9.7
+	media-libs/libdca
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmms
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libsamplerate
+	media-libs/libsdl[audio,opengl,video,X]
+	alsa? ( media-libs/libsdl[alsa] )
+	media-libs/libvorbis
+	media-libs/sdl-gfx
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	media-video/ffmpeg
+	avahi? ( net-dns/avahi )
+	net-misc/curl
+	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
+	sys-apps/dbus
+	sys-apps/hal
+	sys-libs/zlib
+	virtual/mysql
+	x11-apps/xdpyinfo
+	x11-apps/mesa-progs
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	x11-libs/libXinerama
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	dev-util/cmake
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+		cd "${S}"
+		rm -f configure
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
+
+	# Fix case sensitivity
+	mv media/Fonts/{a,A}rial.ttf || die
+	mv media/{S,s}plash.png || die
+}
+
+src_prepare() {
+	has_version ">=media-libs/libpng-1.4" && \
+		epatch "${FILESDIR}"/${P}-libpng14.patch #319113
+
+	epatch "${FILESDIR}"/${P}-TexturePacker-parallel-build.patch
+	epatch "${FILESDIR}"/${P}-shader-upscalers.patch #306661
+	epatch "${FILESDIR}"/${P}-wavpack.patch
+	epatch "${FILESDIR}"/${P}-jpeg-speedup.patch #300909
+	epatch "${FILESDIR}"/${P}-use-cdio-system-headers-on-non-win32.patch #303030, upstream: #8026
+	# http://xbmc.org/trac/ticket/8218
+	sed -i \
+		-e 's: ftell64: dll_ftell64:' \
+		xbmc/cores/DllLoader/exports/wrapper.c || die
+
+	# 330201
+	sed -i -e 's:AC_CHECK_LIB(\[dts\]:AC_CHECK_LIB(\[dca\]:' configure.in || die
+
+	sed -i \
+		-e '1i#include <stdlib.h>\n#include <string.h>\n' \
+		xbmc/lib/libid3tag/libid3tag/metadata.c || die
+
+	# some dirs ship generated autotools, some dont
+	local d
+	for d in . xbmc/cores/dvdplayer/Codecs/libbdnav ; do
+		[[ -d ${d} ]] || continue
+		[[ -e ${d}/configure ]] && continue
+		pushd ${d} >/dev/null
+		einfo "Generating autotools in ${d}"
+		eautoreconf
+		popd >/dev/null
+	done
+
+	# fix building with ffmpeg-0.6+ #324293
+	# latest svn solves this in a more specific way, but we'll just
+	# kludge the whole system for the last release
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
+	local squish #290564
+	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+	sed -i \
+		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+		-e "1iCXXFLAGS += ${squish}" \
+		xbmc/lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export SVN_REV=${ESVN_WC_REVISION:-exported}
+
+	# Avoid lsb-release dependency
+	sed -i \
+		-e 's:/usr/bin/lsb_release -d:cat /etc/gentoo-release:' \
+		xbmc/utils/SystemInfo.cpp
+
+	# Do not use termcap #262822
+	sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure
+
+	epatch_user #293109
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# Force python-2.4 for now #304521
+	export ac_cv_lib_python2_{5,6}_main=no
+
+	econf \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--disable-external-python \
+		--enable-goom \
+		--enable-gl \
+		$(use_enable avahi) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable aac faac) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable profile profiling) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vdpau) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	einstall || die "Install failed!"
+
+	insinto /usr/share/xbmc/web/styles/
+	doins -r "${S}"/web/*/styles/*/ || die
+
+	insinto /usr/share/applications
+	doins tools/Linux/xbmc.desktop
+	doicon tools/Linux/xbmc.png
+
+	dodoc README.linux
+	rm "${D}"/usr/share/xbmc/{README.linux,LICENSE.GPL,*.txt}
+
+	insinto "$(python_get_sitedir)" #309885
+	doins tools/EventClients/lib/python/xbmcclient.py || die
+	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
+}
+
+pkg_postinst() {
+	elog "Visit http://xbmc.org/wiki/?title=XBMC_Online_Manual"
+}