rm xbmc - in the tree

author: James Broadhead <jamesbroadhead@gmail.com> 2012-08-04 13:35:12 +0100
committer: James Broadhead <jamesbroadhead@gmail.com> 2012-08-04 13:35:12 +0100
commit: 7db20ddb208358281be542fc0bc1b020fd00cf35 (patch)
tree: 9e78d624c3088c280e06831f3faf0c30e2da1055
parent: rm selenium - in sunrise (diff)
download: jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.tar.gz
jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.tar.bz2
jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.zip
13 files changed, 0 insertions, 3956 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
deleted file mode 100644
index 3352ca8..0000000
--- a/media-tv/xbmc/ChangeLog
+++ /dev/null
@@ -1,429 +0,0 @@
-# ChangeLog for media-tv/xbmc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.105 2011/12/21 03:42:04 vapier Exp $
-
-  21 Dec 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Require simplejson for the weather plugin #395365 by Pertti Kosunen.
-
-  12 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  xbmc-9999.ebuild:
-  Now that gettext itself takes care of the internal vcs dep, drop the cvs
-  workaround #386635 by BT.
-
-  09 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
-  metadata.xml:
-  Add USE=goom to control GOOM support #385447 by BT. Run autotools in new goom
-  subdir #386471 by BT.
-
-  09 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
-  metadata.xml:
-  Add USE=projectm to control visualization plugin #385449 by BT.
-
-  01 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
-  metadata.xml:
-  Make plist depend into USE=airplay #384571 by BT.
-
-  29 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Make samba support optional now that upstream allows it to be disabled
-  #383759 by BT.
-
-  29 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
-  metadata.xml:
-  Make slick screensavers optional #383785 by BT.
-
-  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Migrate to git-2 eclass.
-
-  18 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  +files/xbmc-10.1-headers.patch, +files/xbmc-10.1-libpng-1.5.patch:
-  Fix building with libpng-1.5+ #380127#4 by Ian Stakenvicius.
-
-  28 Aug 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Upstream xbmc now needs libplist #380785 by Michael Kirkland.
-
-  11 Aug 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  xbmc-9999.ebuild:
-  Pull in libpng #378231 by Diego Elio Pettenò.
-
-  09 Jun 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Add yajl to depend since upstream now needs it #370229 by BT.
-
-  18 May 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  +files/xbmc-10.1-gcc-4.6.patch:
-  Add fix from upstream for building with gcc-4.6 #367261 by Nils Larsson.
-
-  18 May 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Update autoconf list #367835 by Alexandre B.
-
-  11 Apr 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Drop python sed now that upstream isnt bundling it #363057 by BT.
-
-  06 Apr 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  xbmc-9999.ebuild:
-  Force more recent versions of random packages #352571 by Frossie.
-
-  06 Apr 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild,
-  xbmc-9999.ebuild:
-  Use new virtual/ffmpeg #362117 by Tomáš Chvátal.
-
-  06 Apr 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Drop libdts autoconf since the dir no longer exists #359103 by BT.
-
-  12 Mar 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.1.ebuild:
-  Drop hal support in release too #349523 by Samuli Suominen.
-
-*xbmc-10.1 (12 Mar 2011)
-
-  12 Mar 2011; Mike Frysinger <vapier@gentoo.org> +xbmc-10.1.ebuild:
-  Version bump #358473 by BT.
-
-  01 Mar 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Dont force a52/dts disabling since the pkg no longer offers the options at
-  all #356157 by BT.
-
-  26 Feb 2011; Kevin McCarthy <signals@gentoo.org> xbmc-9.11-r5.ebuild,
-  xbmc-10.0.ebuild, xbmc-9999.ebuild:
-  Updated depends from media-libs/jpeg to virtual/jpeg
-
-  26 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild:
-  Use internal python for release.
-
-  26 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
-  xbmc-9999.ebuild:
-  Enable xrandr by default per upstream.
-
-  19 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Drop faad2 dep since xbmc no longer uses it #355371 by BT.
-
-  10 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Drop libmms dep since xbmc now uses ffmpeg #353919 by BT.
-
-  06 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Update paths after filesystem shuffle in git repo #352806 by hal.
-
-  06 Feb 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
-  xbmc-9999.ebuild:
-  Drop unrar depend since xbmc itself includes an unrar lib #353314 by Marco
-  Clocchiatti.
-
-  18 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Convert to git #346381 by Mathieu Rochette.
-
-  03 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
-  metadata.xml:
-  Add USE=bluray support #350362 by hal.
-
-  02 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
-  xbmc-9999.ebuild:
-  Punt deprecated liba52/libdts usage #350360 by hal.
-
-  01 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
-  +files/xbmc-10.0-python-2.7.patch:
-  Add support from upstream for python-2.7 #350098 by Tom Flair.
-
-  31 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Patch by Samuli Suominen to drop hal support in favor of upstream
-  replacements #349523.
-
-  23 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
-  xbmc-9999.ebuild:
-  Require USE=cxx in libpcre #349533 by Oliver Schinagl.
-
-*xbmc-10.0 (22 Dec 2010)
-
-  22 Dec 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-10.0.ebuild:
-  Version bump.
-
-  22 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Only delay for 3 seconds when dbus services are missing #348580 by James
-  Bowlin.
-
-  19 Nov 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Drop USE=aac like upstream has #345939 by BT.
-
-*xbmc-9.11-r5 (18 Sep 2010)
-
-  18 Sep 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-9.11-r5.ebuild,
-  +files/xbmc-9.11-external-python.patch, +files/xbmc-9.11-libdca.patch:
-  Force internal python usage #304521 by Domen Kožar. Build against libdca
-  rather than libdts #330201 by Füves Zoltán.
-
-  18 Sep 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild,
-  xbmc-9999.ebuild:
-  Update postinst URL #337762 by Ewoud Kohl van Wijngaarden.
-
-  28 Aug 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Add gperf to DEPEND #334845 by Cyril.
-
-  24 Aug 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
-  Force recent ffmpeg #334059 by Domen Kožar.
-
-  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
deleted file mode 100644
index f6c9861..0000000
--- a/media-tv/xbmc/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085
-AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
-AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002
-AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
-AUX xbmc-11.0_beta2-libpng1.5-zenkibou-github.patch 19397 RMD160 9713ef4f233a7790fe143157e1cb08f05a186433 SHA1 a82050f8bab6bcd2dc8ab9f44f39a0507dbf00d9 SHA256 ec14123fe568746b4b16f8d7dde4b4c4b4db3a07ea20273e1fea64604fd6d23c
-AUX xbmc-11.0_beta2-nomysql.patch 5115 RMD160 495d073a700d655990ca04376566ec4342f50892 SHA1 a2bc28817f63fde18a8dfc06c434bf109969d26a SHA256 703ddaec184c5abcc3a7c47111a3ae91955be351c2087bdca85de6fb19833b0b
-AUX xbmc-11.0_beta3-libpng1.5-zenkibou-github.patch 19397 RMD160 9713ef4f233a7790fe143157e1cb08f05a186433 SHA1 a82050f8bab6bcd2dc8ab9f44f39a0507dbf00d9 SHA256 ec14123fe568746b4b16f8d7dde4b4c4b4db3a07ea20273e1fea64604fd6d23c
-AUX xbmc-11.0_beta3-nomysql.patch 5115 RMD160 495d073a700d655990ca04376566ec4342f50892 SHA1 a2bc28817f63fde18a8dfc06c434bf109969d26a SHA256 703ddaec184c5abcc3a7c47111a3ae91955be351c2087bdca85de6fb19833b0b
-DIST xbmc-11.0-Eden_beta2.tar.gz 56577092 RMD160 4970a097a5a939bcc5d2d120b0d01ed4b95cb828 SHA1 1da6a2e1194bd4ed7e1e04ffccd0b5f92c40e734 SHA256 1f87e04b0444bb3587f055ae1b9d86e3f2fbf4284caeab8bc393e36e0e4c2ec6
-DIST xbmc-11.0-Eden_beta3.tar.gz 56614229 RMD160 9c689b32479a7f8c53de2df51d1cf2bb7e1a1158 SHA1 c619d785bcc995363e637c0cf0f3cd4e63efef60 SHA256 30ce58a2f4a2c08b125ce0965675a0dd94ed16c945f4861a3198552f76875024
-EBUILD xbmc-11.0_beta2.ebuild 5450 RMD160 1ba7532c92ceaa2d7ecce1a287ade6632cea545e SHA1 99ef43afe710d5b0b4799b5666e5fcba4ed1ec19 SHA256 7ab35569a661e7974dc2021f6a90c23b23087205663d3c206a23c463e891839e
-EBUILD xbmc-11.0_beta3.ebuild 5630 RMD160 dab1e8587dbf42568ab78184bade06e4f4e1d221 SHA1 737ffac9627f1d266731d16ffe7fd62f7322a96c SHA256 070837218145946c79b5871c4909a0d3f106beb8751fc74cd2615b9d4252c3fd
-MISC ChangeLog 16667 RMD160 3b640cf19348af77f56e84b58c93ed39ee1720f2 SHA1 14f559e02386b8f2813143660a459bce3e4e7ef5 SHA256 9e508644e3a058e58f171207024340115fc8c0028a083281318df9376a9ea217
-MISC metadata.xml 885 RMD160 67687f56afd352af492d990c0d1f0b35e08c16bc SHA1 6e4782708b211b5b45d039c633e14b324f0d3805 SHA256 8a5abffe9692e42653163891290a3f48c1ae68d73597b56e3fcc8ee60ee22c2b
diff --git a/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch b/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch
deleted file mode 100644
index e3d17a5..0000000
--- a/media-tv/xbmc/files/xbmc-10.0-python-2.7.patch
+++ /dev/null
@@ -1,768 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/350098
-
-From ab0f816c6307f38d7248d0469379c981f94b816d Mon Sep 17 00:00:00 2001
-From: ceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
-Date: Mon, 30 Aug 2010 16:46:50 +0000
-Subject: [PATCH] Support external python2.7.
-
-git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/python2.7@33342 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
----
- configure.in                                       |   10 ++++++-
- xbmc/lib/libPython/XBPyThread.cpp                  |    5 +++-
- xbmc/lib/libPython/XBPyThread.h                    |    4 ++-
- xbmc/lib/libPython/XBPython.cpp                    |   24 +++++++++++++++-----
- xbmc/lib/libPython/XBPythonDll.cpp                 |    4 ++-
- xbmc/lib/libPython/XBPythonDllFuncs.S              |    4 ++-
- xbmc/lib/libPython/linux/Makefile.in               |    5 +++-
- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/PythonAddon.h        |    4 ++-
- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/action.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/control.h            |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlimage.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controllabel.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controllist.cpp      |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp  |    4 ++-
- .../libPython/xbmcmodule/controlradiobutton.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlslider.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlspin.cpp      |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp   |    4 ++-
- xbmc/lib/libPython/xbmcmodule/dialog.cpp           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/dialog.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/infotagmusic.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/infotagvideo.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/keyboard.h           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/listitem.cpp         |    4 ++-
- xbmc/lib/libPython/xbmcmodule/listitem.h           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/player.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyplaylist.h         |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyutil.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/window.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxml.cpp           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxml.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp  |    4 ++-
- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp    |    5 +++-
- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp       |    4 ++-
- 42 files changed, 149 insertions(+), 48 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 4c0b1b7..cd3429e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -901,7 +901,11 @@ fi
- 
- # External Python
- if test "$use_external_python" = "yes"; then
--  AC_CHECK_LIB([python2.6], [main],
-+  AC_CHECK_LIB([python2.7], [main],
-+    [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
-+    [Define to 1 if you have the 'python2.7' library.])
-+    USE_PYTHON2_7=1],
-+  [AC_CHECK_LIB([python2.6], [main],
-     [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
-     [Define to 1 if you have the 'python2.6' library.])
-     USE_PYTHON2_6=1],
-@@ -913,9 +917,10 @@ if test "$use_external_python" = "yes"; then
-     [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
-     [Define to 1 if you have the 'python2.4' library.])
-     USE_PYTHON2_4=1],
--  [AC_MSG_ERROR($missing_library)] )] )] )
-+  [AC_MSG_ERROR($missing_library)] )] )] )] )
- 
-   AC_MSG_NOTICE($external_python_enabled)
-+  test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
-   test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
-   test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
-   test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
-@@ -1471,6 +1476,7 @@ AC_SUBST(USE_INTERNAL_LIBDTS)
- AC_SUBST(USE_EXTERNAL_LIBMPEG2)
- AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
- AC_SUBST(USE_EXTERNAL_PYTHON)
-+AC_SUBST(USE_PYTHON2_7)
- AC_SUBST(USE_PYTHON2_6)
- AC_SUBST(USE_PYTHON2_5)
- AC_SUBST(USE_PYTHON2_4)
-diff --git a/xbmc/lib/libPython/XBPyThread.cpp b/xbmc/lib/libPython/XBPyThread.cpp
-index 3a6f34e..71b4b9a 100644
---- a/xbmc/lib/libPython/XBPyThread.cpp
-+++ b/xbmc/lib/libPython/XBPyThread.cpp
-@@ -24,7 +24,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/osdefs.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/osdefs.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff --git a/xbmc/lib/libPython/XBPyThread.h b/xbmc/lib/libPython/XBPyThread.h
-index c3da337..eea7fea 100644
---- a/xbmc/lib/libPython/XBPyThread.h
-+++ b/xbmc/lib/libPython/XBPyThread.h
-@@ -26,7 +26,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/XBPython.cpp b/xbmc/lib/libPython/XBPython.cpp
-index e52cdfb..defcf14 100644
---- a/xbmc/lib/libPython/XBPython.cpp
-+++ b/xbmc/lib/libPython/XBPython.cpp
-@@ -24,7 +24,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-@@ -61,7 +63,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
-@@ -69,7 +73,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
- #endif
- #elif defined(_POWERPC)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
-@@ -77,7 +83,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
- #endif
- #elif defined(_POWERPC64)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
-@@ -85,7 +93,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
- #endif
- #elif defined(_ARMEL)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
-@@ -93,7 +103,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
- #endif
- #else /* !__x86_64__ && !__powerpc__ */
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
-diff --git a/xbmc/lib/libPython/XBPythonDll.cpp b/xbmc/lib/libPython/XBPythonDll.cpp
-index bc9d827..87ac7d7 100644
---- a/xbmc/lib/libPython/XBPythonDll.cpp
-+++ b/xbmc/lib/libPython/XBPythonDll.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff --git a/xbmc/lib/libPython/XBPythonDllFuncs.S b/xbmc/lib/libPython/XBPythonDllFuncs.S
-index 6b7a6c3..f59b192 100644
---- a/xbmc/lib/libPython/XBPythonDllFuncs.S
-+++ b/xbmc/lib/libPython/XBPythonDllFuncs.S
-@@ -2,7 +2,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff --git a/xbmc/lib/libPython/linux/Makefile.in b/xbmc/lib/libPython/linux/Makefile.in
-index 7011434..0786937 100644
---- a/xbmc/lib/libPython/linux/Makefile.in
-+++ b/xbmc/lib/libPython/linux/Makefile.in
-@@ -5,7 +5,10 @@ LDFLAGS=@LDFLAGS@
- SHELL=/bin/bash
- SYSDIR=../../../../system/python
- 
--ifeq (@USE_PYTHON2_6@,1)
-+ifeq (@USE_PYTHON2_7@,1)
-+    PYVERSION=python2.7
-+    SO=python27-$(ARCH).so
-+else ifeq (@USE_PYTHON2_6@,1)
-     PYVERSION=python2.6
-     SO=python26-$(ARCH).so
- else ifeq (@USE_PYTHON2_5@,1)
-diff --git a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-index 620d9bd..06fa146 100644
---- a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-+++ b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-@@ -26,7 +26,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-index ec7ed28..41eb8ea 100644
---- a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-+++ b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-index ecee993..24a1c87 100644
---- a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-+++ b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/action.h b/xbmc/lib/libPython/xbmcmodule/action.h
-index 0e20000..7f8b1bc 100644
---- a/xbmc/lib/libPython/xbmcmodule/action.h
-+++ b/xbmc/lib/libPython/xbmcmodule/action.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/control.h b/xbmc/lib/libPython/xbmcmodule/control.h
-index c76b37c..a9ec63d 100644
---- a/xbmc/lib/libPython/xbmcmodule/control.h
-+++ b/xbmc/lib/libPython/xbmcmodule/control.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-index b24ccce..7455ca7 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-index 96e4743..86a7d8b 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-index 68442d8..c6eb052 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-index aadfc17..8275324 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-index 79835d6..f106e90 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-index aca22e4..38a9c07 100644
---- a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controllist.cpp b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-index 0c67b5c..bb57776 100644
---- a/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-index a21e462..b460a2a 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-index ec54efd..b966a17 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-index 21ea5e7..c5f65b3 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-index 4e24e14..feead3c 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-index b4c44d5..4a7c688 100644
---- a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.cpp b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-index caa8986..cffe485 100644
---- a/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "dialog.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.h b/xbmc/lib/libPython/xbmcmodule/dialog.h
-index edcae41..a61c4b1 100644
---- a/xbmc/lib/libPython/xbmcmodule/dialog.h
-+++ b/xbmc/lib/libPython/xbmcmodule/dialog.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-index d202e48..590b858 100644
---- a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-+++ b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-index f2bb300..e808573 100644
---- a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-+++ b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/keyboard.h b/xbmc/lib/libPython/xbmcmodule/keyboard.h
-index e5c817f..0f069e3 100644
---- a/xbmc/lib/libPython/xbmcmodule/keyboard.h
-+++ b/xbmc/lib/libPython/xbmcmodule/keyboard.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.cpp b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-index 137436e..20105ef 100644
---- a/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.h b/xbmc/lib/libPython/xbmcmodule/listitem.h
-index 7ebcd6c..3d4a6c8 100644
---- a/xbmc/lib/libPython/xbmcmodule/listitem.h
-+++ b/xbmc/lib/libPython/xbmcmodule/listitem.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/player.h b/xbmc/lib/libPython/xbmcmodule/player.h
-index 48dc9c7..34a102d 100644
---- a/xbmc/lib/libPython/xbmcmodule/player.h
-+++ b/xbmc/lib/libPython/xbmcmodule/player.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-index c7e7f62..6df8548 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-@@ -26,7 +26,9 @@
- #include "Util.h"
- #include "pyplaylist.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-index f2334bb..2410314 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.h b/xbmc/lib/libPython/xbmcmodule/pyutil.h
-index 4acf6e5..1a156f8 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyutil.h
-+++ b/xbmc/lib/libPython/xbmcmodule/pyutil.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/window.h b/xbmc/lib/libPython/xbmcmodule/window.h
-index 6ce8e72..40304ff 100644
---- a/xbmc/lib/libPython/xbmcmodule/window.h
-+++ b/xbmc/lib/libPython/xbmcmodule/window.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.cpp b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-index d3b703f..3e1b3c8 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.h b/xbmc/lib/libPython/xbmcmodule/winxml.h
-index 6e6489e..f3a8dd8 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxml.h
-+++ b/xbmc/lib/libPython/xbmcmodule/winxml.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-index b021501..92d9903 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-index b8bc0a3..c65aded 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-index 87c0ead..9941769 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-@@ -23,7 +23,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/structmember.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/structmember.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-index 3bab5a9..1e2c480 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
--- 
-1.7.3.1
-
diff --git a/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch b/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
deleted file mode 100644
index b3e8c7c..0000000
--- a/media-tv/xbmc/files/xbmc-10.1-gcc-4.6.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://trac.xbmc.org/ticket/11383
-http://bugs.gentoo.org/367261
-
-From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Wed, 30 Mar 2011 14:57:28 +0200
-Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
-
-Signed-off-by: Stephan Raue <stephan@openelec.tv>
----
- xbmc/cores/dvdplayer/Codecs/Makefile.in        |   18 +++++++++---------
- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in |    4 ++--
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-index a7ef1a0..308664a 100644
---- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-@@ -148,32 +148,32 @@ liba52:
- else
- 
- $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ifneq ($(ARCH), arm)
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- else # No ARM version of swscale available yet.
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- endif
- 
- $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ffmpeg/libavutil/libavutil.so     : ffmpeg;
-@@ -185,17 +185,17 @@ ffmpeg:
- 	$(MAKE) -C $@
- 
- $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdts/libdts/bitstream.o \
- 		libdts/libdts/downmix.o libdts/libdts/parse.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- libdts/libdts/libdts.a : libdts;
-diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-index 3c487e9..6d4abd4 100644
---- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
- else
- 
- $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdvdcss/src/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- endif
--- 
-1.7.0.2
-
diff --git a/media-tv/xbmc/files/xbmc-10.1-headers.patch b/media-tv/xbmc/files/xbmc-10.1-headers.patch
deleted file mode 100644
index 8c23db8..0000000
--- a/media-tv/xbmc/files/xbmc-10.1-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/TexturePacker/XBTFWriter.cpp
-+++ b/tools/TexturePacker/XBTFWriter.cpp
-@@ -28,6 +28,7 @@
- #include "EndianSwap.h"
- #define __STDC_FORMAT_MACROS
- #include <inttypes.h>
-+#include <unistd.h> /* for unlink() prototype */
- 
- #define TEMP_FILE "temp.xbt"
- #define TEMP_SIZE (10*1024*1024)
diff --git a/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch b/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch
deleted file mode 100644
index 4d99227..0000000
--- a/media-tv/xbmc/files/xbmc-10.1-libpng-1.5.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-fix building with newer libpng.  patch by Ian Stakenvicius.
-
-https://bugs.gentoo.org/380127
-
---- a/xbmc/lib/cximage-6.0/CxImage/ximapng.h
-+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.h
-@@ -69,8 +69,13 @@
- 
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
-+#if PNG_LIBPNG_VER > 10399
-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		strncpy((char*)png_ptr->error_ptr,error_msg,255);
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- };
- 
---- a/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/xbmc/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -15,7 +15,11 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
-+#if PNG_LIBPNG_VER > 10399
-+	longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	longjmp(png_ptr->jmpbuf, 1);
-+#endif
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +66,11 @@
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
-+#if PNG_LIBPNG_VER > 10399
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-+#else
- 	if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -70,16 +78,35 @@
- 	/* read the file information */
- 	png_read_info(png_ptr, info_ptr);
- 
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+#if PNG_LIBPNG_VER > 10399
-+	png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,
-+		&_interlace_type,&_compression_type,&_filter_type);
-+#else
-+	_width=info_ptr->width;
-+	_height=info_ptr->height;
-+	_bit_depth=info_ptr->bit_depth;
-+	_color_type=info_ptr->color_type;
-+	_interlace_type=info_ptr->interlace_type;
-+	_compression_type=info_ptr->compression_type;
-+	_filter_type=info_ptr->filter_type;
-+#endif
-+
- 	if (info.nEscape == -1){
--		head.biWidth = info_ptr->width;
--		head.biHeight= info_ptr->height;
-+		head.biWidth = _width;
-+		head.biHeight= _height;
- 		info.dwType = CXIMAGE_FORMAT_PNG;
-+#if PNG_LIBPNG_VER > 10399
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	/* calculate new number of channels */
- 	int channels=0;
--	switch(info_ptr->color_type){
-+	switch(_color_type){
- 	case PNG_COLOR_TYPE_GRAY:
- 	case PNG_COLOR_TYPE_PALETTE:
- 		channels = 1;
-@@ -101,71 +128,108 @@
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
-+#if PNG_LIBPNG_VER > 10399
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	//find the right pixel depth used for cximage
-+#if PNG_LIBPNG_VER > 10399
-+	int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);
-+#else
- 	int pixel_depth = info_ptr->pixel_depth;
-+#endif
- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
- 	if (channels == 2) pixel_depth=8;
- 	if (channels >= 3) pixel_depth=24;
- 
--	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
-+	if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){
-+#if PNG_LIBPNG_VER > 10399
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	/* get metrics */
--	switch (info_ptr->phys_unit_type)
-+	png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;
-+	int _phys_unit_type;
-+#if PNG_LIBPNG_VER > 10399
-+	png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);
-+#else
-+	_x_pixels_per_unit=info_ptr->x_pixels_per_unit;
-+	_y_pixels_per_unit=info_ptr->y_pixels_per_unit;
-+	_phys_unit_type=info_ptr->phys_unit_type;
-+#endif
-+	switch (_phys_unit_type)
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
--		SetXDPI(info_ptr->x_pixels_per_unit);
--		SetYDPI(info_ptr->y_pixels_per_unit);
-+		SetXDPI(_x_pixels_per_unit);
-+		SetYDPI(_y_pixels_per_unit);
- 		break;
- 	case PNG_RESOLUTION_METER:
--		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
--		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
- 		break;
- 	}
- 
--	if (info_ptr->num_palette>0){
--		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
--		SetClrImportant(info_ptr->num_palette);
--	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+	int _num_palette;
-+	png_colorp _palette;
-+#if PNG_LIBPNG_VER > 10399
-+	png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+#else
-+	_num_palette=info_ptr->num_palette;
-+	_palette=info_ptr->palette;
-+#endif
-+	if (_num_palette>0){
-+		SetPalette((rgb_color*)_palette,_num_palette);
-+		SetClrImportant(_num_palette);
-+	} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
- 		SetPaletteColor(0,0,0,0);
- 		SetPaletteColor(1,85,85,85);
- 		SetPaletteColor(2,170,170,170);
- 		SetPaletteColor(3,255,255,255);
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+	int nshift = max(0,(_bit_depth>>3)-1)<<3;
- 
--	if (info_ptr->num_trans!=0){ //palette transparency
--		if (info_ptr->num_trans==1){
--			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
-+	png_bytep _trans_alpha;
-+	int _num_trans;
-+	png_color_16p _trans_color;
-+#if PNG_LIBPNG_VER > 10399
-+	png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+#else
-+	_num_trans=info_ptr->num_trans;
-+#endif
-+	if (_num_trans!=0){ //palette transparency
-+		if (_num_trans==1){
-+			if (_color_type == PNG_COLOR_TYPE_PALETTE){
- #if PNG_LIBPNG_VER > 10399
--				info.nBkgndIndex = info_ptr->trans_color.index;
-+				info.nBkgndIndex = _trans_color->index;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.index;
- #endif
- 			} else{
- #if PNG_LIBPNG_VER > 10399
--				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
-+				info.nBkgndIndex = _trans_color->gray>>nshift;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
- #endif
- 			}
- 		}
--		if (info_ptr->num_trans>1){
-+		if (_num_trans>1){
- 			RGBQUAD* pal=GetPalette();
- 			if (pal){
- 				DWORD ip;
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
- #if PNG_LIBPNG_VER > 10399
--					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
-+					pal[ip].rgbReserved=_trans_alpha[ip];
- #else
- 					pal[ip].rgbReserved=info_ptr->trans[ip];
- #endif
--				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-+				for (ip=_num_trans;ip<head.biClrUsed;ip++){
- 					pal[ip].rgbReserved=255;
- 				}
- 				info.bAlphaPaletteEnabled=true;
-@@ -174,14 +238,12 @@
- 	}
- 
- 	if (channels == 3){ //check RGB binary transparency
--		png_bytep trans;
--		int num_trans;
--		png_color_16 *image_background;
--		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--#if PNG_LIBPNG_VER > 10399
--			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);
-+		/* seems unnecessary to call again, but the conditional must be important so... */
-+		if (png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color)){
-+#if PNG_LIBPNG_VER > 10399
-+			info.nBkgndColor.rgbRed   = (BYTE)(_trans_color->red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(_trans_color->blue>>nshift);
- #else
- 			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
-@@ -202,15 +264,24 @@
- 	}
- 
- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
--	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
-+	if (_color_type & PNG_COLOR_MASK_COLOR){
- 		png_set_bgr(png_ptr);
- 	}
- 
- 	// <vho> - handle cancel
--	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+	if (info.nEscape)
-+#if PNG_LIBPNG_VER > 10399
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
-+		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
-+#if PNG_LIBPNG_VER > 10399
-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
-+#else
- 	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-+#endif
- 
- 	// turn on interlace handling
- 	int number_passes = png_set_interlace_handling(png_ptr);
-@@ -221,8 +292,12 @@
- 		SetCodecOption(0);
- 	}
- 
--	int chan_offset = info_ptr->bit_depth >> 3;
-+	int chan_offset = _bit_depth >> 3;
-+#if PNG_LIBPNG_VER > 10399
-+	int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;
-+#else
- 	int pixel_offset = info_ptr->pixel_depth >> 3;
-+#endif
- 
- 	for (int pass=0; pass < number_passes; pass++) {
- 		iter.Upset();
-@@ -230,7 +305,12 @@
- 		do	{
- 
- 			// <vho> - handle cancel
--			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+			if (info.nEscape)
-+#if PNG_LIBPNG_VER > 10399
-+				longjmp(png_jmpbuf(png_ptr), 1);
-+#else
-+				longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -241,7 +321,7 @@
- 				BYTE* prow= iter.GetRow(ay);
- 
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0 && pass!=7){
-+				if (_interlace_type && pass>0 && pass!=7){
- 					for(ax=0;ax<head.biWidth;ax++){
- 						long px = ax * pixel_offset;
- 						if (channels == 2){
-@@ -278,10 +358,14 @@
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho
- 			{
- 				//recover data from previous scan
--				if (info_ptr->interlace_type && pass>0){
-+				if (_interlace_type && pass>0){
-+#if PNG_LIBPNG_VER > 10399
-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+#else
- 					iter.GetRow(row_pointers, info_ptr->rowbytes);
-+#endif
- 					//re-expand buffer for images with bit depth > 8
--					if (info_ptr->bit_depth > 8){
-+					if (_bit_depth > 8){
- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
- 							row_pointers[ax*chan_offset] = row_pointers[ax];
- 					}
-@@ -291,15 +375,19 @@
- 				png_read_row(png_ptr, row_pointers, NULL);
- 
- 				//shrink 16 bit depth images down to 8 bits
--				if (info_ptr->bit_depth > 8){
-+				if (_bit_depth > 8){
- 					for(long ax=0;ax<(head.biWidth*channels);ax++)
- 						row_pointers[ax] = row_pointers[ax*chan_offset];
- 				}
- 
- 				//copy the pixels
-+#if PNG_LIBPNG_VER > 10399
-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+#else
- 				iter.SetRow(row_pointers, info_ptr->rowbytes);
-+#endif
- 				//<DP> expand 2 bpp images only in the last pass
--				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
-+				if (_bit_depth==2 && pass==(number_passes-1))
- 					expand2to4bpp(iter.GetRow());
- 
- 				//go on
-@@ -361,9 +449,13 @@
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
-+#if PNG_LIBPNG_VER > 10399
-+	if (setjmp(png_jmpbuf(png_ptr))){
-+#else
- 	if (setjmp(png_ptr->jmpbuf)){
- 		/* If we get here, we had a problem reading the file */
- 		if (info_ptr->palette) free(info_ptr->palette);
-+#endif
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
- 		cx_throw("Error saving PNG file");
- 	}
-@@ -372,9 +464,23 @@
- 	//png_init_io(png_ptr, hFile);
- 
- 	// use custom I/O functions
--    png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
-+	png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
- 
- 	/* set the file information here */
-+#if PNG_LIBPNG_VER > 10399
-+	/* use variables to hold the values so it isnt necessary to png_get them later */
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+	png_byte _channels,_pixel_depth;
-+
-+	_width = GetWidth();
-+	_height = GetHeight();
-+	_pixel_depth = (BYTE)GetBpp();
-+	_channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
-+	_bit_depth = (BYTE)(GetBpp()/_channels);
-+	_compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
-+	_filter_type = PNG_FILTER_TYPE_DEFAULT;
-+#else
- 	info_ptr->width = GetWidth();
- 	info_ptr->height = GetHeight();
- 	info_ptr->pixel_depth = (BYTE)GetBpp();
-@@ -382,13 +488,22 @@
- 	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
- 	info_ptr->compression_type = info_ptr->filter_type = 0;
- 	info_ptr->valid = 0;
-+#endif
- 
- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
- 	case 1:
-+#if PNG_LIBPNG_VER > 10399
-+		_interlace_type = PNG_INTERLACE_ADAM7;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
-+#endif
- 		break;
- 	default:
-+#if PNG_LIBPNG_VER > 10399
-+		_interlace_type = PNG_INTERLACE_NONE;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
- 	}
- 
- 	/* set compression level */
-@@ -398,22 +513,47 @@
- 
- 	if (GetNumColors()){
- 		if (bGrayScale){
-+#if PNG_LIBPNG_VER > 10399
-+			_color_type = PNG_COLOR_TYPE_GRAY;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+#endif
- 		} else {
-+#if PNG_LIBPNG_VER > 10399
-+			_color_type = PNG_COLOR_TYPE_PALETTE;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+#endif
- 		}
- 	} else {
-+#if PNG_LIBPNG_VER > 10399
-+		_color_type = PNG_COLOR_TYPE_RGB;
-+#else
- 		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+#endif
- 	}
- #if CXIMAGE_SUPPORT_ALPHA
- 	if (AlphaIsValid()){
-+#if PNG_LIBPNG_VER > 10399
-+		_color_type |= PNG_COLOR_MASK_ALPHA;
-+		_channels++;
-+		_bit_depth = 8;
-+		_pixel_depth += 8;
-+#else
- 		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
- 		info_ptr->channels++;
- 		info_ptr->bit_depth = 8;
- 		info_ptr->pixel_depth += 8;
-+#endif
- 	}
- #endif
- 
-+#if PNG_LIBPNG_VER > 10399
-+	/* set the header here, since we're done modifying these values */
-+	png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,
-+		_compression_type,_filter_type);
-+#endif
-+
- 	/* set background */
- 	png_color_16 image_background={ 0, 255, 255, 255, 0 };
- 	RGBQUAD tc = GetTransColor();
-@@ -427,22 +567,24 @@
- 	/* set metrics */
- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
- 
-+#if PNG_LIBPNG_VER <= 10399
- 	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
- 				info_ptr->color_type, info_ptr->interlace_type,
- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+#endif
- 
- 	//<DP> simple transparency
- 	if (info.nBkgndIndex >= 0){
--		info_ptr->num_trans = 1;
--		info_ptr->valid |= PNG_INFO_tRNS;
- #if PNG_LIBPNG_VER > 10399
--		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;
-+		png_color_16 _trans_color;
-+		_trans_color.index = (BYTE)info.nBkgndIndex;
-+		_trans_color.red   = tc.rgbRed;
-+		_trans_color.green = tc.rgbGreen;
-+		_trans_color.blue  = tc.rgbBlue;
-+		_trans_color.gray  = _trans_color.index;
- #else
-+		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;
-@@ -454,34 +596,53 @@
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
- 			SwapIndex(0,(BYTE)info.nBkgndIndex);
-+
-+#if PNG_LIBPNG_VER > 10399
-+		png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);
-+#endif
- 	}
- 
- 	/* set the palette if there is one */
-+#if PNG_LIBPNG_VER > 10399
-+	png_colorp _palette;
-+#endif
- 	if (GetPalette()){
-+#if PNG_LIBPNG_VER <= 10399
- 		if (!bGrayScale){
- 			info_ptr->valid |= PNG_INFO_PLTE;
- 		}
-+#endif
- 
- 		int nc = GetClrImportant();
- 		if (nc==0) nc = GetNumColors();
- 
-+		// copy the palette colors
-+#if PNG_LIBPNG_VER > 10399
-+		_palette = new png_color[nc];
-+#else
-+		info_ptr->palette = new png_color[nc];
-+		info_ptr->num_palette = (png_uint_16) nc;
-+#endif
-+		for (int i=0; i<nc; i++)
-+#if PNG_LIBPNG_VER > 10399
-+			GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);
-+
-+		png_set_PLTE(png_ptr,info_ptr,_palette,nc);
-+#else
-+			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-+#endif
-+
- 		if (info.bAlphaPaletteEnabled){
- 			for(WORD ip=0; ip<nc;ip++)
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
--			info_ptr->num_trans = (WORD)nc;
--			info_ptr->valid |= PNG_INFO_tRNS;
- #if PNG_LIBPNG_VER > 10399
--			info_ptr->trans_alpha = trans;
-+			png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);
- #else
-+			info_ptr->num_trans = (WORD)nc;
-+			info_ptr->valid |= PNG_INFO_tRNS;
- 			info_ptr->trans = trans;
- #endif
- 		}
--
--		// copy the palette colors
--		info_ptr->palette = new png_color[nc];
--		info_ptr->num_palette = (png_uint_16) nc;
--		for (int i=0; i<nc; i++)
--			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
- 	}  
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
-@@ -495,8 +656,12 @@
- 	}	}	}
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
-+#if PNG_LIBPNG_VER > 10399
-+	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
-+#else
- 	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
- 	info_ptr->rowbytes = row_size;
-+#endif
- 	BYTE *row_pointers = new BYTE[row_size];
- 
- 	/* write the file information */
-@@ -514,7 +679,11 @@
- 			if (AlphaIsValid()){
- 				for (long ax=head.biWidth-1; ax>=0;ax--){
- 					c = BlindGetPixelColor(ax,ay);
-+#if PNG_LIBPNG_VER > 10399
-+					int px = ax * _channels;
-+#else
- 					int px = ax * info_ptr->channels;
-+#endif
- 					if (!bGrayScale){
- 						row_pointers[px++]=c.rgbRed;
- 						row_pointers[px++]=c.rgbGreen;
-@@ -529,7 +698,11 @@
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			{
- 				iter.GetRow(row_pointers, row_size);
-+#if PNG_LIBPNG_VER > 10399
-+				if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#else
- 				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#endif
- 					RGBtoBGR(row_pointers, row_size);
- 				png_write_row(png_ptr, row_pointers);
- 			}
-@@ -546,9 +719,14 @@
- 	png_write_end(png_ptr, info_ptr);
- 
- 	/* if you malloced the palette, free it here */
-+#if PNG_LIBPNG_VER > 10399
-+	if (_palette){
-+		delete [] (_palette);
-+#else
- 	if (info_ptr->palette){
- 		delete [] (info_ptr->palette);
- 		info_ptr->palette = NULL;
-+#endif
- 	}
- 
- 	/* clean up after the write, and free any memory allocated */
diff --git a/media-tv/xbmc/files/xbmc-11.0_beta2-libpng1.5-zenkibou-github.patch b/media-tv/xbmc/files/xbmc-11.0_beta2-libpng1.5-zenkibou-github.patch
deleted file mode 100644
index c065a57..0000000
--- a/media-tv/xbmc/files/xbmc-11.0_beta2-libpng1.5-zenkibou-github.patch
+++ /dev/null
@@ -1,618 +0,0 @@
-From 99d1031476f8ec74d42a54667023746ca4153931 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Damien=20Th=C3=A9bault?= <damien.thebault@gmail.com>
-Date: Sat, 14 Jan 2012 23:33:45 +0100
-Subject: [PATCH] Commit cleaned libpng 1.5 support.
-
----
- lib/cximage-6.0/CxImage/ximapng.cpp |  258 ++++++++++++++++++++++++++++++++++-
- lib/cximage-6.0/CxImage/ximapng.h   |    5 +
- 2 files changed, 262 insertions(+), 1 deletions(-)
-
-diff --git a/lib/cximage-6.0/CxImage/ximapng.cpp b/lib/cximage-6.0/CxImage/ximapng.cpp
-index f718269..3e0cf73 100644
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -15,7 +15,11 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
-+#if PNG_LIBPNG_VER > 10499
-+	longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	longjmp(png_ptr->jmpbuf, 1);
-+#endif
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +66,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
-+#if PNG_LIBPNG_VER > 10499
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-+#else
- 	if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -76,16 +84,34 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	/* read the file information */
- 	png_read_info(png_ptr, info_ptr);
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+	png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,
-+		&_interlace_type,&_compression_type,&_filter_type);
-+
-+	if (info.nEscape == -1){
-+		head.biWidth = _width;
-+		head.biHeight= _height;
-+		info.dwType = CXIMAGE_FORMAT_PNG;
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+	}
-+#else
- 	if (info.nEscape == -1){
- 		head.biWidth = info_ptr->width;
- 		head.biHeight= info_ptr->height;
- 		info.dwType = CXIMAGE_FORMAT_PNG;
- 		longjmp(png_ptr->jmpbuf, 1);
- 	}
-+#endif
- 
- 	/* calculate new number of channels */
- 	int channels=0;
-+#if PNG_LIBPNG_VER > 10499
-+	switch(_color_type){
-+#else
- 	switch(info_ptr->color_type){
-+#endif
- 	case PNG_COLOR_TYPE_GRAY:
- 	case PNG_COLOR_TYPE_PALETTE:
- 		channels = 1;
-@@ -101,20 +127,49 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
-+#if PNG_LIBPNG_VER > 10499
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	//find the right pixel depth used for cximage
-+#if PNG_LIBPNG_VER > 10499
-+	int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);
-+#else
- 	int pixel_depth = info_ptr->pixel_depth;
-+#endif
- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
- 	if (channels == 2) pixel_depth=8;
- 	if (channels >= 3) pixel_depth=24;
- 
-+#if PNG_LIBPNG_VER > 10499
-+	if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	/* get metrics */
-+#if PNG_LIBPNG_VER > 10499
-+	png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;
-+	int _phys_unit_type;
-+	png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);
-+	switch (_phys_unit_type)
-+	{
-+	case PNG_RESOLUTION_UNKNOWN:
-+		SetXDPI(_x_pixels_per_unit);
-+		SetYDPI(_y_pixels_per_unit);
-+		break;
-+	case PNG_RESOLUTION_METER:
-+		SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		break;
-+	}
-+#else
- 	switch (info_ptr->phys_unit_type)
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
-@@ -126,46 +181,94 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
- 		break;
- 	}
-+#endif
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int _num_palette;
-+	png_colorp _palette;
-+	png_uint_32 _palette_ret;
-+	_palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+	if (_palette_ret && _num_palette>0){
-+		SetPalette((rgb_color*)_palette,_num_palette);
-+		SetClrImportant(_num_palette);
-+	} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+#else
- 	if (info_ptr->num_palette>0){
- 		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
- 		SetClrImportant(info_ptr->num_palette);
- 	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+#endif
- 		SetPaletteColor(0,0,0,0);
- 		SetPaletteColor(1,85,85,85);
- 		SetPaletteColor(2,170,170,170);
- 		SetPaletteColor(3,255,255,255);
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
-+#if PNG_LIBPNG_VER > 10499
-+	int nshift = max(0,(_bit_depth>>3)-1)<<3;
-+#else
- 	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+#endif
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_bytep _trans_alpha;
-+	int _num_trans;
-+	png_color_16p _trans_color;
-+	png_uint_32 _trans_ret;
-+	_trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+	if (_trans_ret && _num_trans!=0){ //palette transparency
-+		if (_num_trans==1){
-+			if (_color_type == PNG_COLOR_TYPE_PALETTE){
-+#else
- 	if (info_ptr->num_trans!=0){ //palette transparency
- 		if (info_ptr->num_trans==1){
- 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+				info.nBkgndIndex = _trans_color->index;
-+#else
- #if PNG_LIBPNG_VER > 10399
- 				info.nBkgndIndex = info_ptr->trans_color.index;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.index;
- #endif
-+#endif
- 			} else{
-+#if PNG_LIBPNG_VER > 10499
-+				info.nBkgndIndex = _trans_color->gray>>nshift;
-+#else
- #if PNG_LIBPNG_VER > 10399
- 				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
- #endif
-+#endif
- 			}
- 		}
-+#if PNG_LIBPNG_VER > 10499
-+		if (_num_trans>1 && _trans_alpha!=NULL){
-+#else
- 		if (info_ptr->num_trans>1){
-+#endif
- 			RGBQUAD* pal=GetPalette();
- 			if (pal){
- 				DWORD ip;
-+#if PNG_LIBPNG_VER > 10499
-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
-+					pal[ip].rgbReserved=_trans_alpha[ip];
-+#else
- 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
- #if PNG_LIBPNG_VER > 10399
- 					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- #else
- 					pal[ip].rgbReserved=info_ptr->trans[ip];
- #endif
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+				for (ip=_num_trans;ip<head.biClrUsed;ip++){
-+#else
- 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-+#endif
- 					pal[ip].rgbReserved=255;
- 				}
- 				info.bAlphaPaletteEnabled=true;
-@@ -178,6 +281,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
-+#if PNG_LIBPNG_VER > 10499
-+			info.nBkgndColor.rgbRed   = (BYTE)(_trans_color->red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(_trans_color->blue>>nshift);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
-@@ -187,6 +295,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
- 			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
- #endif
-+#endif
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -202,15 +311,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	}
- 
- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
-+#if PNG_LIBPNG_VER > 10499
-+	if (_color_type & PNG_COLOR_MASK_COLOR){
-+#else
- 	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
-+#endif
- 		png_set_bgr(png_ptr);
- 	}
- 
- 	// <vho> - handle cancel
-+#if PNG_LIBPNG_VER > 10499
-+	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
-+#if PNG_LIBPNG_VER > 10499
-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
-+#else
- 	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-+#endif
- 
- 	// turn on interlace handling
- 	int number_passes = png_set_interlace_handling(png_ptr);
-@@ -221,8 +342,16 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		SetCodecOption(0);
- 	}
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int chan_offset = _bit_depth >> 3;
-+#else
- 	int chan_offset = info_ptr->bit_depth >> 3;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+	int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;
-+#else
- 	int pixel_offset = info_ptr->pixel_depth >> 3;
-+#endif
- 
- 	for (int pass=0; pass < number_passes; pass++) {
- 		iter.Upset();
-@@ -230,7 +359,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		do	{
- 
- 			// <vho> - handle cancel
-+#if PNG_LIBPNG_VER > 10499
-+			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -241,7 +374,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 				BYTE* prow= iter.GetRow(ay);
- 
- 				//recover data from previous scan
-+#if PNG_LIBPNG_VER > 10499
-+				if (_interlace_type && pass>0 && pass!=7){
-+#else
- 				if (info_ptr->interlace_type && pass>0 && pass!=7){
-+#endif
- 					for(ax=0;ax<head.biWidth;ax++){
- 						long px = ax * pixel_offset;
- 						if (channels == 2){
-@@ -278,10 +415,17 @@ bool CxImagePNG::Decode(CxFile *hFile)
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho
- 			{
- 				//recover data from previous scan
-+#if PNG_LIBPNG_VER > 10499
-+				if (_interlace_type && pass>0){
-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+					//re-expand buffer for images with bit depth > 8
-+					if (_bit_depth > 8){
-+#else
- 				if (info_ptr->interlace_type && pass>0){
- 					iter.GetRow(row_pointers, info_ptr->rowbytes);
- 					//re-expand buffer for images with bit depth > 8
- 					if (info_ptr->bit_depth > 8){
-+#endif
- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
- 							row_pointers[ax*chan_offset] = row_pointers[ax];
- 					}
-@@ -291,15 +435,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 				png_read_row(png_ptr, row_pointers, NULL);
- 
- 				//shrink 16 bit depth images down to 8 bits
-+#if PNG_LIBPNG_VER > 10499
-+				if (_bit_depth > 8){
-+#else
- 				if (info_ptr->bit_depth > 8){
-+#endif
- 					for(long ax=0;ax<(head.biWidth*channels);ax++)
- 						row_pointers[ax] = row_pointers[ax*chan_offset];
- 				}
- 
- 				//copy the pixels
-+#if PNG_LIBPNG_VER > 10499
-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+#else
- 				iter.SetRow(row_pointers, info_ptr->rowbytes);
-+#endif
- 				//<DP> expand 2 bpp images only in the last pass
-+#if PNG_LIBPNG_VER > 10499
-+				if (_bit_depth==2 && pass==(number_passes-1))
-+#else
- 				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
-+#endif
- 					expand2to4bpp(iter.GetRow());
- 
- 				//go on
-@@ -361,9 +517,13 @@ bool CxImagePNG::Encode(CxFile *hFile)
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
-+#if PNG_LIBPNG_VER > 10499
-+	if (setjmp(png_jmpbuf(png_ptr))){
-+#else
- 	if (setjmp(png_ptr->jmpbuf)){
- 		/* If we get here, we had a problem reading the file */
- 		if (info_ptr->palette) free(info_ptr->palette);
-+#endif
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
- 		cx_throw("Error saving PNG file");
- 	}
-@@ -372,9 +532,23 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	//png_init_io(png_ptr, hFile);
- 
- 	// use custom I/O functions
--    png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
-+	png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
- 
- 	/* set the file information here */
-+#if PNG_LIBPNG_VER > 10499
-+	/* use variables to hold the values so it isnt necessary to png_get them later */
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+	png_byte _channels,_pixel_depth;
-+
-+	_width = GetWidth();
-+	_height = GetHeight();
-+	_pixel_depth = (BYTE)GetBpp();
-+	_channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
-+	_bit_depth = (BYTE)(GetBpp()/_channels);
-+	_compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
-+	_filter_type = PNG_FILTER_TYPE_DEFAULT;
-+#else
- 	info_ptr->width = GetWidth();
- 	info_ptr->height = GetHeight();
- 	info_ptr->pixel_depth = (BYTE)GetBpp();
-@@ -382,13 +556,22 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
- 	info_ptr->compression_type = info_ptr->filter_type = 0;
- 	info_ptr->valid = 0;
-+#endif
- 
- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
- 	case 1:
-+#if PNG_LIBPNG_VER > 10499
-+		_interlace_type = PNG_INTERLACE_ADAM7;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
-+#endif
- 		break;
- 	default:
-+#if PNG_LIBPNG_VER > 10499
-+		_interlace_type = PNG_INTERLACE_NONE;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
- 	}
- 
- 	/* set compression level */
-@@ -398,19 +581,38 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 
- 	if (GetNumColors()){
- 		if (bGrayScale){
-+#if PNG_LIBPNG_VER > 10499
-+			_color_type = PNG_COLOR_TYPE_GRAY;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+#endif
- 		} else {
-+#if PNG_LIBPNG_VER > 10499
-+			_color_type = PNG_COLOR_TYPE_PALETTE;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+#endif
- 		}
- 	} else {
-+#if PNG_LIBPNG_VER > 10499
-+		_color_type = PNG_COLOR_TYPE_RGB;
-+#else
- 		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+#endif
- 	}
- #if CXIMAGE_SUPPORT_ALPHA
- 	if (AlphaIsValid()){
-+#if PNG_LIBPNG_VER > 10499
-+		_color_type |= PNG_COLOR_MASK_ALPHA;
-+		_channels++;
-+		_bit_depth = 8;
-+		_pixel_depth += 8;
-+#else
- 		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
- 		info_ptr->channels++;
- 		info_ptr->bit_depth = 8;
- 		info_ptr->pixel_depth += 8;
-+#endif
- 	}
- #endif
- 
-@@ -427,14 +629,30 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	/* set metrics */
- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,
-+		_compression_type,_filter_type);
-+#else
- 	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
- 				info_ptr->color_type, info_ptr->interlace_type,
- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+#endif
- 
- 	//<DP> simple transparency
- 	if (info.nBkgndIndex >= 0){
-+#if PNG_LIBPNG_VER <= 10499
- 		info_ptr->num_trans = 1;
- 		info_ptr->valid |= PNG_INFO_tRNS;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+		png_color_16 _trans_color;
-+		_trans_color.index = (BYTE)info.nBkgndIndex;
-+		_trans_color.red   = tc.rgbRed;
-+		_trans_color.green = tc.rgbGreen;
-+		_trans_color.blue  = tc.rgbBlue;
-+		_trans_color.gray  = _trans_color.index;
-+		png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 		info_ptr->trans_alpha = trans;
- 		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
-@@ -450,6 +668,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 		info_ptr->trans_values.blue  = tc.rgbBlue;
- 		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
- #endif
-+#endif
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -457,10 +676,16 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	}
- 
- 	/* set the palette if there is one */
-+#if PNG_LIBPNG_VER > 10499
-+	png_colorp _palette = NULL;
-+	if (GetPalette()){
-+		/* png_set_PLTE() will be called once the palette is ready */
-+#else
- 	if (GetPalette()){
- 		if (!bGrayScale){
- 			info_ptr->valid |= PNG_INFO_PLTE;
- 		}
-+#endif
- 
- 		int nc = GetClrImportant();
- 		if (nc==0) nc = GetNumColors();
-@@ -468,20 +693,34 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 		if (info.bAlphaPaletteEnabled){
- 			for(WORD ip=0; ip<nc;ip++)
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
-+#if PNG_LIBPNG_VER <= 10499
- 			info_ptr->num_trans = (WORD)nc;
- 			info_ptr->valid |= PNG_INFO_tRNS;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+			png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 			info_ptr->trans_alpha = trans;
- #else
- 			info_ptr->trans = trans;
- #endif
-+#endif
- 		}
- 
- 		// copy the palette colors
-+#if PNG_LIBPNG_VER > 10499
-+		_palette = new png_color[nc];
-+		for (int i=0; i<nc; i++)
-+			GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);
-+
-+		png_set_PLTE(png_ptr,info_ptr,_palette,nc);
-+#else
- 		info_ptr->palette = new png_color[nc];
- 		info_ptr->num_palette = (png_uint_16) nc;
- 		for (int i=0; i<nc; i++)
- 			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-+#endif
- 	}  
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
-@@ -495,8 +734,12 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	}	}	}
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
-+#else
- 	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
- 	info_ptr->rowbytes = row_size;
-+#endif
- 	BYTE *row_pointers = new BYTE[row_size];
- 
- 	/* write the file information */
-@@ -514,7 +757,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 			if (AlphaIsValid()){
- 				for (long ax=head.biWidth-1; ax>=0;ax--){
- 					c = BlindGetPixelColor(ax,ay);
-+#if PNG_LIBPNG_VER > 10499
-+					int px = ax * _channels;
-+#else
- 					int px = ax * info_ptr->channels;
-+#endif
- 					if (!bGrayScale){
- 						row_pointers[px++]=c.rgbRed;
- 						row_pointers[px++]=c.rgbGreen;
-@@ -529,7 +776,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			{
- 				iter.GetRow(row_pointers, row_size);
-+#if PNG_LIBPNG_VER > 10499
-+				if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#else
- 				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#endif
- 					RGBtoBGR(row_pointers, row_size);
- 				png_write_row(png_ptr, row_pointers);
- 			}
-@@ -546,9 +797,14 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	png_write_end(png_ptr, info_ptr);
- 
- 	/* if you malloced the palette, free it here */
-+#if PNG_LIBPNG_VER > 10499
-+	if (_palette){
-+		delete [] (_palette);
-+#else
- 	if (info_ptr->palette){
- 		delete [] (info_ptr->palette);
- 		info_ptr->palette = NULL;
-+#endif
- 	}
- 
- 	/* clean up after the write, and free any memory allocated */
-diff --git a/lib/cximage-6.0/CxImage/ximapng.h b/lib/cximage-6.0/CxImage/ximapng.h
-index db41935..68d8ddb 100644
---- a/lib/cximage-6.0/CxImage/ximapng.h
-+++ b/lib/cximage-6.0/CxImage/ximapng.h
-@@ -69,8 +69,13 @@ class CxImagePNG: public CxImage
- 
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
-+#if PNG_LIBPNG_VER > 10499
-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		strncpy((char*)png_ptr->error_ptr,error_msg,255);
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- };
- 
--- 
-1.7.5.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0_beta2-nomysql.patch b/media-tv/xbmc/files/xbmc-11.0_beta2-nomysql.patch
deleted file mode 100644
index 2b28006..0000000
--- a/media-tv/xbmc/files/xbmc-11.0_beta2-nomysql.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-http://trac.xbmc.org/attachment/ticket/11775
-
-make mysql support optional
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,13 +127,17 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/cmyth \
- 	lib/libhdhomerun \
- 	lib/libid3tag \
- 	lib/libapetag \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-+ifeq (@BUILD_MYTHTV@,1)
-+LIB_DIRS+=\
-+	lib/cmyth
-+endif
-+
- SS_DIRS=
- ifeq (@USE_OPENGL@,1)
- SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
-@@ -418,7 +422,10 @@ imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
- codecs: papcodecs dvdpcodecs
--libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+ifeq (@BUILD_MYTHTV@,1)
-+libs: cmyth
-+endif
- externals: codecs libs visualizations screensavers
- 
- xcode_depends: \
-
---- a/xbmc/dbwrappers/Database.cpp
-+++ b/xbmc/dbwrappers/Database.cpp
-@@ -29,7 +29,9 @@
- #include "utils/AutoPtrHandle.h"
- #include "utils/log.h"
- #include "utils/URIUtils.h"
-+#ifdef BUILD_MYTHTV
- #include "mysqldataset.h"
-+#endif /* BUILD_MYTHTV */
- #include "sqlitedataset.h"
- 
- 
-@@ -265,6 +267,7 @@ bool CDatabase::Open(const DatabaseSettings &settings)
- 
-   m_sqlite = true;
- 
-+#ifdef BUILD_MYTHTV
-   if ( dbSettings.type.Equals("mysql") )
-   {
-     // check we have all information before we cancel the fallback
-@@ -274,6 +277,7 @@ bool CDatabase::Open(const DatabaseSettings &settings)
-     else
-       CLog::Log(LOGINFO, "essential mysql database information is missing (eg. host, name, user, pass)");
-   }
-+#endif /* BUILD_MYTHTV */
- 
-   // always safely fallback to sqlite3, and use separate, versioned database
-   if (m_sqlite)
-@@ -339,10 +343,12 @@ bool CDatabase::Connect(const DatabaseSettings &dbSettings, bool create)
-   {
-     m_pDB.reset( new SqliteDatabase() ) ;
-   }
-+#ifdef BUILD_MYTHTV
-   else if (dbSettings.type.Equals("mysql"))
-   {
-     m_pDB.reset( new MysqlDatabase() ) ;
-   }
-+#endif /* BUILD_MYTHTV */
-   else
-   {
-     CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str());
---- a/xbmc/dbwrappers/Makefile
-+++ b/xbmc/dbwrappers/Makefile
-@@ -1,9 +1,13 @@
- SRCS=Database.cpp \
-      dataset.cpp \
--     mysqldataset.cpp \
-      qry_dat.cpp \
-      sqlitedataset.cpp \
- 
-+ifeq (@BUILD_MYTHTV@,1)
-+SRCS+=\
-+     mysqldataset.cpp
-+endif
-+
- LIB=dbwrappers.a
- 
- include ../../Makefile.include
-
---- a/configure.in	2012-01-21 00:52:52.000000000 +0000
-+++ b/configure.in	2012-01-29 18:46:09.544462430 +0000
-@@ -85,6 +85,8 @@
- x11_disabled="== X11 disabled. =="
- pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
- pulse_disabled="== PulseAudio support manually disabled. =="
-+mysql_not_found="Could not find required library libmysqlclient for MythTV."
-+mythtv_disabled="== MythTV support disabled. =="
- dvdcss_enabled="== DVDCSS support enabled. =="
- dvdcss_disabled="== DVDCSS support disabled. =="
- hal_not_found="== Could not find hal. HAL support disabled. =="
-@@ -325,6 +327,12 @@
-   [use_ffmpeg_libvorbis=$enableval],
-   [use_ffmpeg_libvorbis=no])
- 
-+AC_ARG_ENABLE([mythtv],
-+  [AS_HELP_STRING([--enable-mythtv],
-+  [enable MythTV support (default is yes)])],
-+  [use_mythtv=$enableval],
-+  [use_mythtv=yes])
-+
- AC_ARG_ENABLE([dvdcss],
-   [AS_HELP_STRING([--enable-dvdcss],
-   [enable DVDCSS support (default is yes)])],
-@@ -675,6 +683,7 @@
- fi
- 
- # platform common libraries
-+if test "$use_mythtv" = "yes"; then
- AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
- if test $MYSQL_CONFIG = "yes"; then
-   INCLUDES="$INCLUDES `mysql_config --include`"
-@@ -684,6 +693,12 @@
- else
-   AC_MSG_ERROR($missing_program)
- fi
-+  AC_CHECK_LIB([mysqlclient], [main],
-+    AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]),
-+    AC_MSG_ERROR($mysql_not_found))
-+else
-+  AC_MSG_RESULT($mythtv_disabled)
-+fi
- AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
-@@ -718,7 +733,6 @@
- AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
--AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
- AC_CHECK_LIB([bluetooth],   [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
- AC_CHECK_LIB([yajl],        [main],, AC_MSG_ERROR($missing_library))
-@@ -1704,6 +1718,12 @@
-   final_message="$final_message\n  HAL Support:\tNo"
- fi
- 
-+if test "$use_mythtv" = "yes"; then
-+  final_message="$final_message\n  MythTV:\tYes"
-+else
-+  final_message="$final_message\n  MythTV:\tNo"
-+fi
-+
- # DVDCSS
- if test "$use_dvdcss" = "yes"; then
-   AC_MSG_NOTICE($dvdcss_enabled)
-@@ -1926,6 +1946,7 @@
- AC_SUBST(PYTHON_VERSION)
- AC_SUBST(OUTPUT_FILES)
- AC_SUBST(HAVE_XBMC_NONFREE)
-+AC_SUBST(BUILD_MYTHTV)
- AC_SUBST(USE_ASAP_CODEC)
- AC_SUBST(LIBCURL_BASENAME)
- AC_SUBST(LIBFLAC_BASENAME)
diff --git a/media-tv/xbmc/files/xbmc-11.0_beta3-libpng1.5-zenkibou-github.patch b/media-tv/xbmc/files/xbmc-11.0_beta3-libpng1.5-zenkibou-github.patch
deleted file mode 100644
index c065a57..0000000
--- a/media-tv/xbmc/files/xbmc-11.0_beta3-libpng1.5-zenkibou-github.patch
+++ /dev/null
@@ -1,618 +0,0 @@
-From 99d1031476f8ec74d42a54667023746ca4153931 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Damien=20Th=C3=A9bault?= <damien.thebault@gmail.com>
-Date: Sat, 14 Jan 2012 23:33:45 +0100
-Subject: [PATCH] Commit cleaned libpng 1.5 support.
-
----
- lib/cximage-6.0/CxImage/ximapng.cpp |  258 ++++++++++++++++++++++++++++++++++-
- lib/cximage-6.0/CxImage/ximapng.h   |    5 +
- 2 files changed, 262 insertions(+), 1 deletions(-)
-
-diff --git a/lib/cximage-6.0/CxImage/ximapng.cpp b/lib/cximage-6.0/CxImage/ximapng.cpp
-index f718269..3e0cf73 100644
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -15,7 +15,11 @@
- void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
- {
- 	strcpy(info.szLastError,message);
-+#if PNG_LIBPNG_VER > 10499
-+	longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	longjmp(png_ptr->jmpbuf, 1);
-+#endif
- }
- ////////////////////////////////////////////////////////////////////////////////
- #if CXIMAGE_SUPPORT_DECODE
-@@ -62,7 +66,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
-     /* Set error handling if you are using the setjmp/longjmp method (this is
-     * the normal method of doing things with libpng).  REQUIRED unless you
-     * set up your own error handlers in the png_create_read_struct() earlier. */
-+#if PNG_LIBPNG_VER > 10499
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-+#else
- 	if (setjmp(png_ptr->jmpbuf)) {
-+#endif
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		delete [] row_pointers;
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -76,16 +84,34 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	/* read the file information */
- 	png_read_info(png_ptr, info_ptr);
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+	png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,
-+		&_interlace_type,&_compression_type,&_filter_type);
-+
-+	if (info.nEscape == -1){
-+		head.biWidth = _width;
-+		head.biHeight= _height;
-+		info.dwType = CXIMAGE_FORMAT_PNG;
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+	}
-+#else
- 	if (info.nEscape == -1){
- 		head.biWidth = info_ptr->width;
- 		head.biHeight= info_ptr->height;
- 		info.dwType = CXIMAGE_FORMAT_PNG;
- 		longjmp(png_ptr->jmpbuf, 1);
- 	}
-+#endif
- 
- 	/* calculate new number of channels */
- 	int channels=0;
-+#if PNG_LIBPNG_VER > 10499
-+	switch(_color_type){
-+#else
- 	switch(info_ptr->color_type){
-+#endif
- 	case PNG_COLOR_TYPE_GRAY:
- 	case PNG_COLOR_TYPE_PALETTE:
- 		channels = 1;
-@@ -101,20 +127,49 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		break;
- 	default:
- 		strcpy(info.szLastError,"unknown PNG color type");
-+#if PNG_LIBPNG_VER > 10499
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	//find the right pixel depth used for cximage
-+#if PNG_LIBPNG_VER > 10499
-+	int pixel_depth = _bit_depth * png_get_channels(png_ptr,info_ptr);
-+#else
- 	int pixel_depth = info_ptr->pixel_depth;
-+#endif
- 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
- 	if (channels == 2) pixel_depth=8;
- 	if (channels >= 3) pixel_depth=24;
- 
-+#if PNG_LIBPNG_VER > 10499
-+	if (!Create(_width, _height, pixel_depth, CXIMAGE_FORMAT_PNG)){
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- 
- 	/* get metrics */
-+#if PNG_LIBPNG_VER > 10499
-+	png_uint_32 _x_pixels_per_unit,_y_pixels_per_unit;
-+	int _phys_unit_type;
-+	png_get_pHYs(png_ptr,info_ptr,&_x_pixels_per_unit,&_y_pixels_per_unit,&_phys_unit_type);
-+	switch (_phys_unit_type)
-+	{
-+	case PNG_RESOLUTION_UNKNOWN:
-+		SetXDPI(_x_pixels_per_unit);
-+		SetYDPI(_y_pixels_per_unit);
-+		break;
-+	case PNG_RESOLUTION_METER:
-+		SetXDPI((long)floor(_x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		SetYDPI((long)floor(_y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
-+		break;
-+	}
-+#else
- 	switch (info_ptr->phys_unit_type)
- 	{
- 	case PNG_RESOLUTION_UNKNOWN:
-@@ -126,46 +181,94 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
- 		break;
- 	}
-+#endif
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int _num_palette;
-+	png_colorp _palette;
-+	png_uint_32 _palette_ret;
-+	_palette_ret = png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette);
-+	if (_palette_ret && _num_palette>0){
-+		SetPalette((rgb_color*)_palette,_num_palette);
-+		SetClrImportant(_num_palette);
-+	} else if (_bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+#else
- 	if (info_ptr->num_palette>0){
- 		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
- 		SetClrImportant(info_ptr->num_palette);
- 	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
-+#endif
- 		SetPaletteColor(0,0,0,0);
- 		SetPaletteColor(1,85,85,85);
- 		SetPaletteColor(2,170,170,170);
- 		SetPaletteColor(3,255,255,255);
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
-+#if PNG_LIBPNG_VER > 10499
-+	int nshift = max(0,(_bit_depth>>3)-1)<<3;
-+#else
- 	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+#endif
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_bytep _trans_alpha;
-+	int _num_trans;
-+	png_color_16p _trans_color;
-+	png_uint_32 _trans_ret;
-+	_trans_ret = png_get_tRNS(png_ptr,info_ptr,&_trans_alpha,&_num_trans,&_trans_color);
-+	if (_trans_ret && _num_trans!=0){ //palette transparency
-+		if (_num_trans==1){
-+			if (_color_type == PNG_COLOR_TYPE_PALETTE){
-+#else
- 	if (info_ptr->num_trans!=0){ //palette transparency
- 		if (info_ptr->num_trans==1){
- 			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+				info.nBkgndIndex = _trans_color->index;
-+#else
- #if PNG_LIBPNG_VER > 10399
- 				info.nBkgndIndex = info_ptr->trans_color.index;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.index;
- #endif
-+#endif
- 			} else{
-+#if PNG_LIBPNG_VER > 10499
-+				info.nBkgndIndex = _trans_color->gray>>nshift;
-+#else
- #if PNG_LIBPNG_VER > 10399
- 				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
- #else
- 				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
- #endif
-+#endif
- 			}
- 		}
-+#if PNG_LIBPNG_VER > 10499
-+		if (_num_trans>1 && _trans_alpha!=NULL){
-+#else
- 		if (info_ptr->num_trans>1){
-+#endif
- 			RGBQUAD* pal=GetPalette();
- 			if (pal){
- 				DWORD ip;
-+#if PNG_LIBPNG_VER > 10499
-+				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
-+					pal[ip].rgbReserved=_trans_alpha[ip];
-+#else
- 				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
- #if PNG_LIBPNG_VER > 10399
- 					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- #else
- 					pal[ip].rgbReserved=info_ptr->trans[ip];
- #endif
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+				for (ip=_num_trans;ip<head.biClrUsed;ip++){
-+#else
- 				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-+#endif
- 					pal[ip].rgbReserved=255;
- 				}
- 				info.bAlphaPaletteEnabled=true;
-@@ -178,6 +281,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		int num_trans;
- 		png_color_16 *image_background;
- 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
-+#if PNG_LIBPNG_VER > 10499
-+			info.nBkgndColor.rgbRed   = (BYTE)(_trans_color->red>>nshift);
-+			info.nBkgndColor.rgbGreen = (BYTE)(_trans_color->green>>nshift);
-+			info.nBkgndColor.rgbBlue  = (BYTE)(_trans_color->blue>>nshift);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
-@@ -187,6 +295,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
- 			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
- #endif
-+#endif
- 			info.nBkgndColor.rgbReserved = 0;
- 			info.nBkgndIndex = 0;
- 		}
-@@ -202,15 +311,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	}
- 
- 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
-+#if PNG_LIBPNG_VER > 10499
-+	if (_color_type & PNG_COLOR_MASK_COLOR){
-+#else
- 	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
-+#endif
- 		png_set_bgr(png_ptr);
- 	}
- 
- 	// <vho> - handle cancel
-+#if PNG_LIBPNG_VER > 10499
-+	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- 	// row_bytes is the width x number of channels x (bit-depth / 8)
-+#if PNG_LIBPNG_VER > 10499
-+	row_pointers = new BYTE[png_get_rowbytes(png_ptr,info_ptr) + 8];
-+#else
- 	row_pointers = new BYTE[info_ptr->rowbytes + 8];
-+#endif
- 
- 	// turn on interlace handling
- 	int number_passes = png_set_interlace_handling(png_ptr);
-@@ -221,8 +342,16 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		SetCodecOption(0);
- 	}
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int chan_offset = _bit_depth >> 3;
-+#else
- 	int chan_offset = info_ptr->bit_depth >> 3;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+	int pixel_offset = (_bit_depth * png_get_channels(png_ptr,info_ptr)) >> 3;
-+#else
- 	int pixel_offset = info_ptr->pixel_depth >> 3;
-+#endif
- 
- 	for (int pass=0; pass < number_passes; pass++) {
- 		iter.Upset();
-@@ -230,7 +359,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 		do	{
- 
- 			// <vho> - handle cancel
-+#if PNG_LIBPNG_VER > 10499
-+			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			if (AlphaIsValid()) {
-@@ -241,7 +374,11 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 				BYTE* prow= iter.GetRow(ay);
- 
- 				//recover data from previous scan
-+#if PNG_LIBPNG_VER > 10499
-+				if (_interlace_type && pass>0 && pass!=7){
-+#else
- 				if (info_ptr->interlace_type && pass>0 && pass!=7){
-+#endif
- 					for(ax=0;ax<head.biWidth;ax++){
- 						long px = ax * pixel_offset;
- 						if (channels == 2){
-@@ -278,10 +415,17 @@ bool CxImagePNG::Decode(CxFile *hFile)
- #endif // CXIMAGE_SUPPORT_ALPHA		// vho
- 			{
- 				//recover data from previous scan
-+#if PNG_LIBPNG_VER > 10499
-+				if (_interlace_type && pass>0){
-+					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+					//re-expand buffer for images with bit depth > 8
-+					if (_bit_depth > 8){
-+#else
- 				if (info_ptr->interlace_type && pass>0){
- 					iter.GetRow(row_pointers, info_ptr->rowbytes);
- 					//re-expand buffer for images with bit depth > 8
- 					if (info_ptr->bit_depth > 8){
-+#endif
- 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
- 							row_pointers[ax*chan_offset] = row_pointers[ax];
- 					}
-@@ -291,15 +435,27 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 				png_read_row(png_ptr, row_pointers, NULL);
- 
- 				//shrink 16 bit depth images down to 8 bits
-+#if PNG_LIBPNG_VER > 10499
-+				if (_bit_depth > 8){
-+#else
- 				if (info_ptr->bit_depth > 8){
-+#endif
- 					for(long ax=0;ax<(head.biWidth*channels);ax++)
- 						row_pointers[ax] = row_pointers[ax*chan_offset];
- 				}
- 
- 				//copy the pixels
-+#if PNG_LIBPNG_VER > 10499
-+				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr,info_ptr));
-+#else
- 				iter.SetRow(row_pointers, info_ptr->rowbytes);
-+#endif
- 				//<DP> expand 2 bpp images only in the last pass
-+#if PNG_LIBPNG_VER > 10499
-+				if (_bit_depth==2 && pass==(number_passes-1))
-+#else
- 				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
-+#endif
- 					expand2to4bpp(iter.GetRow());
- 
- 				//go on
-@@ -361,9 +517,13 @@ bool CxImagePNG::Encode(CxFile *hFile)
-    /* Set error handling.  REQUIRED if you aren't supplying your own
-     * error hadnling functions in the png_create_write_struct() call.
-     */
-+#if PNG_LIBPNG_VER > 10499
-+	if (setjmp(png_jmpbuf(png_ptr))){
-+#else
- 	if (setjmp(png_ptr->jmpbuf)){
- 		/* If we get here, we had a problem reading the file */
- 		if (info_ptr->palette) free(info_ptr->palette);
-+#endif
- 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
- 		cx_throw("Error saving PNG file");
- 	}
-@@ -372,9 +532,23 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	//png_init_io(png_ptr, hFile);
- 
- 	// use custom I/O functions
--    png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
-+	png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
- 
- 	/* set the file information here */
-+#if PNG_LIBPNG_VER > 10499
-+	/* use variables to hold the values so it isnt necessary to png_get them later */
-+	png_uint_32 _width,_height;
-+	int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
-+	png_byte _channels,_pixel_depth;
-+
-+	_width = GetWidth();
-+	_height = GetHeight();
-+	_pixel_depth = (BYTE)GetBpp();
-+	_channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
-+	_bit_depth = (BYTE)(GetBpp()/_channels);
-+	_compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
-+	_filter_type = PNG_FILTER_TYPE_DEFAULT;
-+#else
- 	info_ptr->width = GetWidth();
- 	info_ptr->height = GetHeight();
- 	info_ptr->pixel_depth = (BYTE)GetBpp();
-@@ -382,13 +556,22 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
- 	info_ptr->compression_type = info_ptr->filter_type = 0;
- 	info_ptr->valid = 0;
-+#endif
- 
- 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
- 	case 1:
-+#if PNG_LIBPNG_VER > 10499
-+		_interlace_type = PNG_INTERLACE_ADAM7;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
-+#endif
- 		break;
- 	default:
-+#if PNG_LIBPNG_VER > 10499
-+		_interlace_type = PNG_INTERLACE_NONE;
-+#else
- 		info_ptr->interlace_type = PNG_INTERLACE_NONE;
-+#endif
- 	}
- 
- 	/* set compression level */
-@@ -398,19 +581,38 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 
- 	if (GetNumColors()){
- 		if (bGrayScale){
-+#if PNG_LIBPNG_VER > 10499
-+			_color_type = PNG_COLOR_TYPE_GRAY;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-+#endif
- 		} else {
-+#if PNG_LIBPNG_VER > 10499
-+			_color_type = PNG_COLOR_TYPE_PALETTE;
-+#else
- 			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+#endif
- 		}
- 	} else {
-+#if PNG_LIBPNG_VER > 10499
-+		_color_type = PNG_COLOR_TYPE_RGB;
-+#else
- 		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+#endif
- 	}
- #if CXIMAGE_SUPPORT_ALPHA
- 	if (AlphaIsValid()){
-+#if PNG_LIBPNG_VER > 10499
-+		_color_type |= PNG_COLOR_MASK_ALPHA;
-+		_channels++;
-+		_bit_depth = 8;
-+		_pixel_depth += 8;
-+#else
- 		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
- 		info_ptr->channels++;
- 		info_ptr->bit_depth = 8;
- 		info_ptr->pixel_depth += 8;
-+#endif
- 	}
- #endif
- 
-@@ -427,14 +629,30 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	/* set metrics */
- 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
- 
-+#if PNG_LIBPNG_VER > 10499
-+	png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,_interlace_type,
-+		_compression_type,_filter_type);
-+#else
- 	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
- 				info_ptr->color_type, info_ptr->interlace_type,
- 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+#endif
- 
- 	//<DP> simple transparency
- 	if (info.nBkgndIndex >= 0){
-+#if PNG_LIBPNG_VER <= 10499
- 		info_ptr->num_trans = 1;
- 		info_ptr->valid |= PNG_INFO_tRNS;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+		png_color_16 _trans_color;
-+		_trans_color.index = (BYTE)info.nBkgndIndex;
-+		_trans_color.red   = tc.rgbRed;
-+		_trans_color.green = tc.rgbGreen;
-+		_trans_color.blue  = tc.rgbBlue;
-+		_trans_color.gray  = _trans_color.index;
-+		png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,1,&_trans_color);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 		info_ptr->trans_alpha = trans;
- 		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
-@@ -450,6 +668,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 		info_ptr->trans_values.blue  = tc.rgbBlue;
- 		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
- #endif
-+#endif
- 
- 		// the transparency indexes start from 0 for non grayscale palette
- 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -457,10 +676,16 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	}
- 
- 	/* set the palette if there is one */
-+#if PNG_LIBPNG_VER > 10499
-+	png_colorp _palette = NULL;
-+	if (GetPalette()){
-+		/* png_set_PLTE() will be called once the palette is ready */
-+#else
- 	if (GetPalette()){
- 		if (!bGrayScale){
- 			info_ptr->valid |= PNG_INFO_PLTE;
- 		}
-+#endif
- 
- 		int nc = GetClrImportant();
- 		if (nc==0) nc = GetNumColors();
-@@ -468,20 +693,34 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 		if (info.bAlphaPaletteEnabled){
- 			for(WORD ip=0; ip<nc;ip++)
- 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
-+#if PNG_LIBPNG_VER <= 10499
- 			info_ptr->num_trans = (WORD)nc;
- 			info_ptr->valid |= PNG_INFO_tRNS;
-+#endif
-+#if PNG_LIBPNG_VER > 10499
-+			png_set_tRNS(png_ptr,info_ptr,(png_bytep)trans,nc,NULL);
-+#else
- #if PNG_LIBPNG_VER > 10399
- 			info_ptr->trans_alpha = trans;
- #else
- 			info_ptr->trans = trans;
- #endif
-+#endif
- 		}
- 
- 		// copy the palette colors
-+#if PNG_LIBPNG_VER > 10499
-+		_palette = new png_color[nc];
-+		for (int i=0; i<nc; i++)
-+			GetPaletteColor(i, &_palette[i].red, &_palette[i].green, &_palette[i].blue);
-+
-+		png_set_PLTE(png_ptr,info_ptr,_palette,nc);
-+#else
- 		info_ptr->palette = new png_color[nc];
- 		info_ptr->num_palette = (png_uint_16) nc;
- 		for (int i=0; i<nc; i++)
- 			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-+#endif
- 	}  
- 
- #if CXIMAGE_SUPPORT_ALPHA	// <vho>
-@@ -495,8 +734,12 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	}	}	}
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
-+#if PNG_LIBPNG_VER > 10499
-+	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
-+#else
- 	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
- 	info_ptr->rowbytes = row_size;
-+#endif
- 	BYTE *row_pointers = new BYTE[row_size];
- 
- 	/* write the file information */
-@@ -514,7 +757,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 			if (AlphaIsValid()){
- 				for (long ax=head.biWidth-1; ax>=0;ax--){
- 					c = BlindGetPixelColor(ax,ay);
-+#if PNG_LIBPNG_VER > 10499
-+					int px = ax * _channels;
-+#else
- 					int px = ax * info_ptr->channels;
-+#endif
- 					if (!bGrayScale){
- 						row_pointers[px++]=c.rgbRed;
- 						row_pointers[px++]=c.rgbGreen;
-@@ -529,7 +776,11 @@ bool CxImagePNG::Encode(CxFile *hFile)
- #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
- 			{
- 				iter.GetRow(row_pointers, row_size);
-+#if PNG_LIBPNG_VER > 10499
-+				if (_color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#else
- 				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
-+#endif
- 					RGBtoBGR(row_pointers, row_size);
- 				png_write_row(png_ptr, row_pointers);
- 			}
-@@ -546,9 +797,14 @@ bool CxImagePNG::Encode(CxFile *hFile)
- 	png_write_end(png_ptr, info_ptr);
- 
- 	/* if you malloced the palette, free it here */
-+#if PNG_LIBPNG_VER > 10499
-+	if (_palette){
-+		delete [] (_palette);
-+#else
- 	if (info_ptr->palette){
- 		delete [] (info_ptr->palette);
- 		info_ptr->palette = NULL;
-+#endif
- 	}
- 
- 	/* clean up after the write, and free any memory allocated */
-diff --git a/lib/cximage-6.0/CxImage/ximapng.h b/lib/cximage-6.0/CxImage/ximapng.h
-index db41935..68d8ddb 100644
---- a/lib/cximage-6.0/CxImage/ximapng.h
-+++ b/lib/cximage-6.0/CxImage/ximapng.h
-@@ -69,8 +69,13 @@ class CxImagePNG: public CxImage
- 
-     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
- 	{
-+#if PNG_LIBPNG_VER > 10499
-+		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
-+		longjmp(png_jmpbuf(png_ptr), 1);
-+#else
- 		strncpy((char*)png_ptr->error_ptr,error_msg,255);
- 		longjmp(png_ptr->jmpbuf, 1);
-+#endif
- 	}
- };
- 
--- 
-1.7.5.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0_beta3-nomysql.patch b/media-tv/xbmc/files/xbmc-11.0_beta3-nomysql.patch
deleted file mode 100644
index 2b28006..0000000
--- a/media-tv/xbmc/files/xbmc-11.0_beta3-nomysql.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-http://trac.xbmc.org/attachment/ticket/11775
-
-make mysql support optional
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -127,13 +127,17 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/cmyth \
- 	lib/libhdhomerun \
- 	lib/libid3tag \
- 	lib/libapetag \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-+ifeq (@BUILD_MYTHTV@,1)
-+LIB_DIRS+=\
-+	lib/cmyth
-+endif
-+
- SS_DIRS=
- ifeq (@USE_OPENGL@,1)
- SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
-@@ -418,7 +422,10 @@ imagelib: dllloader
- 	$(MAKE) -C lib/cximage-6.0
- 
- codecs: papcodecs dvdpcodecs
--libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
-+ifeq (@BUILD_MYTHTV@,1)
-+libs: cmyth
-+endif
- externals: codecs libs visualizations screensavers
- 
- xcode_depends: \
-
---- a/xbmc/dbwrappers/Database.cpp
-+++ b/xbmc/dbwrappers/Database.cpp
-@@ -29,7 +29,9 @@
- #include "utils/AutoPtrHandle.h"
- #include "utils/log.h"
- #include "utils/URIUtils.h"
-+#ifdef BUILD_MYTHTV
- #include "mysqldataset.h"
-+#endif /* BUILD_MYTHTV */
- #include "sqlitedataset.h"
- 
- 
-@@ -265,6 +267,7 @@ bool CDatabase::Open(const DatabaseSettings &settings)
- 
-   m_sqlite = true;
- 
-+#ifdef BUILD_MYTHTV
-   if ( dbSettings.type.Equals("mysql") )
-   {
-     // check we have all information before we cancel the fallback
-@@ -274,6 +277,7 @@ bool CDatabase::Open(const DatabaseSettings &settings)
-     else
-       CLog::Log(LOGINFO, "essential mysql database information is missing (eg. host, name, user, pass)");
-   }
-+#endif /* BUILD_MYTHTV */
- 
-   // always safely fallback to sqlite3, and use separate, versioned database
-   if (m_sqlite)
-@@ -339,10 +343,12 @@ bool CDatabase::Connect(const DatabaseSettings &dbSettings, bool create)
-   {
-     m_pDB.reset( new SqliteDatabase() ) ;
-   }
-+#ifdef BUILD_MYTHTV
-   else if (dbSettings.type.Equals("mysql"))
-   {
-     m_pDB.reset( new MysqlDatabase() ) ;
-   }
-+#endif /* BUILD_MYTHTV */
-   else
-   {
-     CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str());
---- a/xbmc/dbwrappers/Makefile
-+++ b/xbmc/dbwrappers/Makefile
-@@ -1,9 +1,13 @@
- SRCS=Database.cpp \
-      dataset.cpp \
--     mysqldataset.cpp \
-      qry_dat.cpp \
-      sqlitedataset.cpp \
- 
-+ifeq (@BUILD_MYTHTV@,1)
-+SRCS+=\
-+     mysqldataset.cpp
-+endif
-+
- LIB=dbwrappers.a
- 
- include ../../Makefile.include
-
---- a/configure.in	2012-01-21 00:52:52.000000000 +0000
-+++ b/configure.in	2012-01-29 18:46:09.544462430 +0000
-@@ -85,6 +85,8 @@
- x11_disabled="== X11 disabled. =="
- pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
- pulse_disabled="== PulseAudio support manually disabled. =="
-+mysql_not_found="Could not find required library libmysqlclient for MythTV."
-+mythtv_disabled="== MythTV support disabled. =="
- dvdcss_enabled="== DVDCSS support enabled. =="
- dvdcss_disabled="== DVDCSS support disabled. =="
- hal_not_found="== Could not find hal. HAL support disabled. =="
-@@ -325,6 +327,12 @@
-   [use_ffmpeg_libvorbis=$enableval],
-   [use_ffmpeg_libvorbis=no])
- 
-+AC_ARG_ENABLE([mythtv],
-+  [AS_HELP_STRING([--enable-mythtv],
-+  [enable MythTV support (default is yes)])],
-+  [use_mythtv=$enableval],
-+  [use_mythtv=yes])
-+
- AC_ARG_ENABLE([dvdcss],
-   [AS_HELP_STRING([--enable-dvdcss],
-   [enable DVDCSS support (default is yes)])],
-@@ -675,6 +683,7 @@
- fi
- 
- # platform common libraries
-+if test "$use_mythtv" = "yes"; then
- AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no")
- if test $MYSQL_CONFIG = "yes"; then
-   INCLUDES="$INCLUDES `mysql_config --include`"
-@@ -684,6 +693,12 @@
- else
-   AC_MSG_ERROR($missing_program)
- fi
-+  AC_CHECK_LIB([mysqlclient], [main],
-+    AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]),
-+    AC_MSG_ERROR($mysql_not_found))
-+else
-+  AC_MSG_RESULT($mythtv_disabled)
-+fi
- AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
- AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library),
-@@ -718,7 +733,6 @@
- AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
--AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
- AC_CHECK_LIB([bluetooth],   [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
- AC_CHECK_LIB([yajl],        [main],, AC_MSG_ERROR($missing_library))
-@@ -1704,6 +1718,12 @@
-   final_message="$final_message\n  HAL Support:\tNo"
- fi
- 
-+if test "$use_mythtv" = "yes"; then
-+  final_message="$final_message\n  MythTV:\tYes"
-+else
-+  final_message="$final_message\n  MythTV:\tNo"
-+fi
-+
- # DVDCSS
- if test "$use_dvdcss" = "yes"; then
-   AC_MSG_NOTICE($dvdcss_enabled)
-@@ -1926,6 +1946,7 @@
- AC_SUBST(PYTHON_VERSION)
- AC_SUBST(OUTPUT_FILES)
- AC_SUBST(HAVE_XBMC_NONFREE)
-+AC_SUBST(BUILD_MYTHTV)
- AC_SUBST(USE_ASAP_CODEC)
- AC_SUBST(LIBCURL_BASENAME)
- AC_SUBST(LIBFLAC_BASENAME)
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
deleted file mode 100644
index 035500e..0000000
--- a/media-tv/xbmc/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>xbox</herd>
-<use>
- <flag name='airplay'>enable AirPlay support</flag>
- <flag name='bluray'>Enable playback of Blu-ray filesystems</flag>
- <flag name='goom'>Enable GOOM visualization plugin</flag>
- <flag name='midi'>Support MIDI files</flag>
- <flag name='projectm'>Enable projectM visualization plugin</flag>
- <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
- <flag name='rsxs'>Enable really slick X screensavers</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-11.0_beta2.ebuild b/media-tv/xbmc/xbmc-11.0_beta2.ebuild
deleted file mode 100644
index 1cb8f84..0000000
--- a/media-tv/xbmc/xbmc-11.0_beta2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils python
-
-EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-else
-	if [[ ${PV} == *beta* ]] ; then
-		inherit versionator
-		CODENAME="Eden"
-		MY_PV=`get_version_component_range 1-2`-${CODENAME}_`get_version_component_range 3`
-		MY_P="${PN}-${MY_PV}"
-	else
-		MY_P=${P/_/-}
-	fi
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${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="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
-
-# TODO: Verify that media-video/ffmpeg is correct (not virtual/ffmpeg)
-COMMON_DEPEND="app-arch/bzip2
-	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[cxx]
-	dev-libs/lzo
-	dev-libs/yajl
-	>=dev-python/pysqlite-2
-	dev-python/simplejson
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/glew
-	media-libs/jasper
-	media-libs/jbigkit
-	media-libs/libass
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsamplerate
-	media-libs/libsdl[audio,opengl,video,X]
-	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
-	media-sound/wavpack
-	media-video/ffmpeg
-	net-misc/curl
-	=net-wireless/bluez-4.96
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
-	x11-libs/libXinerama
-	x11-libs/libXrender
-	airplay? ( app-pda/libplist )
-	alsa? ( media-libs/libsdl[alsa] )
-	avahi? ( net-dns/avahi )
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	pulseaudio? ( media-sound/pulseaudio )
-	projectm? ( media-libs/libprojectm )
-	pvr? ( virtual/mysql )
-	rtmp? ( media-video/rtmpdump )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	vaapi? ( x11-libs/libva )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
-	)
-	webserver? ( net-libs/libmicrohttpd )
-	xrandr? ( x11-libs/libXrandr )"
-
-RDEPEND="${COMMON_DEPEND}
-	udev? (	sys-fs/udisks sys-power/upower )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake
-	dev-util/gperf
-	x11-proto/xineramaproto
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_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() {
-	epatch "${FILESDIR}"/${P}-nomysql.patch || die
-	epatch "${FILESDIR}"/${P}-libpng1.5-zenkibou-github.patch || die
-
-	# some dirs ship generated autotools, some dont
-	local d
-	for d in \
-		. \
-		lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \
-		xbmc/screensavers/rsxs-* \
-		xbmc/visualizations/Goom/goom2k4-0
-	do
-		[[ -e ${d}/configure ]] && continue
-		pushd ${d} >/dev/null
-		einfo "Generating autotools in ${d}"
-		eautoreconf
-		popd >/dev/null
-	done
-
-	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}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# Avoid lsb-release dependency
-	sed -i \
-		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
-		xbmc/utils/SystemInfo.cpp || die
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	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)
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		--enable-gl \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	prepalldocs
-
-	insinto /usr/share/applications
-	doins tools/Linux/xbmc.desktop
-	doicon tools/Linux/xbmc.png
-
-	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://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
diff --git a/media-tv/xbmc/xbmc-11.0_beta3.ebuild b/media-tv/xbmc/xbmc-11.0_beta3.ebuild
deleted file mode 100644
index e53d38a..0000000
--- a/media-tv/xbmc/xbmc-11.0_beta3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils python
-
-EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2
-else
-	if [[ ${PV} == *beta* ]] ; then
-		inherit versionator
-		CODENAME="Eden"
-		MY_PV=`get_version_component_range 1-2`-${CODENAME}_`get_version_component_range 3`
-
-		MY_P="${PN}-${MY_PV}"
-	else
-		MY_P=${P/_/-}
-	fi
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}${EXTRA_PV}"
-fi
-
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
-
-# TODO: Verify that media-video/ffmpeg is correct (not virtual/ffmpeg)
-COMMON_DEPEND="app-arch/bzip2
-	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[cxx]
-	dev-libs/lzo
-	dev-libs/yajl
-	>=dev-python/pysqlite-2
-	dev-python/simplejson
-	media-libs/alsa-lib
-	media-libs/flac
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/glew
-	media-libs/jasper
-	media-libs/jbigkit
-	media-libs/libass
-	media-libs/libmad
-	media-libs/libmodplug
-	media-libs/libmpeg2
-	media-libs/libogg
-	media-libs/libpng
-	media-libs/libsamplerate
-	media-libs/libsdl[audio,opengl,video,X]
-	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
-	media-sound/wavpack
-	media-video/ffmpeg
-	net-misc/curl
-	=net-wireless/bluez-4.96
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg
-	virtual/opengl
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
-	x11-libs/libXinerama
-	x11-libs/libXrender
-	airplay? ( app-pda/libplist )
-	alsa? ( media-libs/libsdl[alsa] )
-	avahi? ( net-dns/avahi )
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
-	pulseaudio? ( media-sound/pulseaudio )
-	projectm? ( media-libs/libprojectm )
-	pvr? ( virtual/mysql )
-	rtmp? ( media-video/rtmpdump )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
-	vaapi? ( x11-libs/libva )
-	vdpau? (
-		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
-	)
-	webserver? ( net-libs/libmicrohttpd )
-	xrandr? ( x11-libs/libXrandr )"
-
-RDEPEND="${COMMON_DEPEND}
-	udev? (	sys-fs/udisks sys-power/upower )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/cmake
-	dev-util/gperf
-	x11-proto/xineramaproto
-	x86? ( dev-lang/nasm )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-		cd "${S}" || die
-		rm -f configure
-	else
-		unpack ${A} || die
-		
-		# TODO: fix this
-		# zipfile: 11.0-Eden_beta3 has folder 11.0-Eden_beta3.1 
-		if ! [ -d ${S} ] && [ -d "${S}.1" ] ; then
-			S="${S}.1"
-		fi
-		cd "${S}" || die
-	fi
-
-	# Fix case sensitivity
-	mv media/Fonts/{a,A}rial.ttf || die
-	mv media/{S,s}plash.png || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nomysql.patch || die
-	epatch "${FILESDIR}"/${P}-libpng1.5-zenkibou-github.patch || die
-
-	# some dirs ship generated autotools, some dont
-	local d
-	for d in \
-		. \
-		lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \
-		xbmc/screensavers/rsxs-* \
-		xbmc/visualizations/Goom/goom2k4-0
-	do
-		[[ -e ${d}/configure ]] && continue
-		pushd ${d} >/dev/null
-		einfo "Generating autotools in ${d}"
-		eautoreconf
-		popd >/dev/null
-	done
-
-	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}" \
-		lib/libsquish/Makefile.in || die
-
-	# Fix XBMC's final version string showing as "exported"
-	# instead of the SVN revision number.
-	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
-
-	# Avoid lsb-release dependency
-	sed -i \
-		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
-		xbmc/utils/SystemInfo.cpp || die
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/linux/*.cpp || die
-
-	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)
-
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-ccache \
-		--disable-optimizations \
-		--enable-external-libraries \
-		--enable-gl \
-		$(use_enable airplay) \
-		$(use_enable avahi) \
-		$(use_enable bluray libbluray) \
-		$(use_enable css dvdcss) \
-		$(use_enable debug) \
-		$(use_enable goom) \
-		--disable-hal \
-		$(use_enable joystick) \
-		$(use_enable midi mid) \
-		$(use_enable profile profiling) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
-		$(use_enable rsxs) \
-		$(use_enable rtmp) \
-		$(use_enable samba) \
-		$(use_enable vaapi) \
-		$(use_enable vdpau) \
-		$(use_enable webserver) \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	prepalldocs
-
-	insinto /usr/share/applications
-	doins tools/Linux/xbmc.desktop
-	doicon tools/Linux/xbmc.png
-
-	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://wiki.xbmc.org/?title=XBMC_Online_Manual"
-}
author	James Broadhead <jamesbroadhead@gmail.com>	2012-08-04 13:35:12 +0100
committer	James Broadhead <jamesbroadhead@gmail.com>	2012-08-04 13:35:12 +0100
commit	7db20ddb208358281be542fc0bc1b020fd00cf35 (patch)
tree	9e78d624c3088c280e06831f3faf0c30e2da1055
parent	rm selenium - in sunrise (diff)
download	jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.tar.gz jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.tar.bz2 jamesbroadhead-7db20ddb208358281be542fc0bc1b020fd00cf35.zip