diff --git a/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-77888a2.patch b/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-efd2b27.patch
similarity index 98%
rename from packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-77888a2.patch
rename to packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-efd2b27.patch
index a428269dcf..1aada493cc 100644
--- a/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-77888a2.patch
+++ b/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-efd2b27.patch
@@ -1,57 +1,7 @@
-From 5fbfde4edcd9d852f2a2d7de1cb09f388ddd393d Mon Sep 17 00:00:00 2001
-From: wsnipex <wsnipex@a1.net>
-Date: Sun, 4 Nov 2012 14:05:52 +0100
-Subject: [PATCH 01/58] configure: add --enable-pvraddons-with-dependencies
- switch for intree building of PVR Addons
-
----
- configure.in |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index beb58c1..82f457a 100644
---- a/configure.in
-+++ b/configure.in
-@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg],
-   [use_external_ffmpeg=$use_external_libraries])
- 
- ### End of external library options
-+### PVR addons specific
-+AC_ARG_ENABLE([pvraddons-with-dependencies],
-+  [AS_HELP_STRING([--enable-pvraddons-with-dependencies],
-+  [enable build of pvr addons with dependencies (default is no) 'Linux only'])],
-+  [use_pvraddons_with_deps=$enableval],
-+  [use_pvraddons_with_deps=no])
-+
-+### End PVR addons specific
- 
- if test "x$host_vendor" != "xapple"; then
-   DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT"
-@@ -2766,12 +2774,16 @@ XB_CONFIG_MODULE([pvr-addons], [
-    if test "$USE_EXTERNAL_FFMPEG" = 1; then
-       PVR_EXT_FFMPEG="--enable-external-ffmpeg"
-    fi
-+   if test "$use_pvraddons_with_deps" = "yes"; then
-+      ADDONS_WITH_DEPS="--enable-addons-with-dependencies"
-+   fi
-   ./configure \
-     --prefix="${prefix}" \
-     --host=$host_alias \
-     --build=$build_alias \
-     --target=$target_alias \
-     $PVR_EXT_FFMPEG \
-+    $ADDONS_WITH_DEPS \
-     CC="$CC" \
-     CXX="$CXX" \
-     CFLAGS="$CFLAGS" \
--- 
-1.7.10
-
-
-From 58b1544f23706cd4097442d43fd9f40e17dd1315 Mon Sep 17 00:00:00 2001
+From df3cd6c904ec4361b1373bddbbe2631ef998fe6a Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:03:31 +0200
-Subject: [PATCH 02/58] VideoRenerers: add buffering
+Subject: [PATCH 01/59] VideoRenerers: add buffering
 
 ---
  xbmc/Application.cpp                            |    3 +
@@ -256,10 +206,10 @@ index acebfe0..9f55fcb 100644
    virtual bool ValidateRenderTarget();
    virtual void LoadShaders(int field=FIELD_FULL);
 diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-index 0630f13..e832adc 100644
+index c7c4f07..522d38a 100644
 --- a/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
 +++ b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-@@ -1966,16 +1966,16 @@ EINTERLACEMETHOD CLinuxRendererGLES::AutoInterlaceMethod()
+@@ -1973,16 +1973,16 @@ EINTERLACEMETHOD CLinuxRendererGLES::AutoInterlaceMethod()
  }
  
  #ifdef HAVE_LIBOPENMAX
@@ -947,7 +897,7 @@ index 2ab5684..f493ba7 100644
    virtual unsigned int PreInit();
    virtual void         UnInit();
 diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index 1a4c23c..bf47cd1 100644
+index 3a5c44b..1dc5812 100644
 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
 +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
 @@ -462,7 +462,7 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options)
@@ -1034,10 +984,10 @@ index 3008c25..a4bb1ba 100644
 1.7.10
 
 
-From 2c7b662016485902950503f2a02542522dc744c9 Mon Sep 17 00:00:00 2001
+From a166218ddbefad44da87931293484ba6397c6200 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 2 Oct 2012 10:49:09 +0200
-Subject: [PATCH 03/58] linuxrenderer: delete all textures on reconfigure
+Subject: [PATCH 02/59] linuxrenderer: delete all textures on reconfigure
 
 ---
  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |    2 +-
@@ -1060,10 +1010,10 @@ index a740954..15e5757 100644
 1.7.10
 
 
-From cc49be517f99d87e680418403d789fdca4bfdaeb Mon Sep 17 00:00:00 2001
+From bdcf265725076d7c96346dd623a7457b301dc219 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:17:33 +0200
-Subject: [PATCH 04/58] drop frame counter in application, ask render manager
+Subject: [PATCH 03/59] drop frame counter in application, ask render manager
  instead
 
 ---
@@ -1242,10 +1192,10 @@ index 34ff8d0..288175e 100644
 1.7.10
 
 
-From 03fde5238101a7b0190b516fc6cb79c95966808f Mon Sep 17 00:00:00 2001
+From 53e2b5542d96c877fbea00ad3ce8e36ee06d614a Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:34:39 +0200
-Subject: [PATCH 05/58] videoplayer: adopt lateness detection and dropping to
+Subject: [PATCH 04/59] videoplayer: adopt lateness detection and dropping to
  buffering
 
 ---
@@ -1784,10 +1734,10 @@ index fe7e12c..4913712 100644
 1.7.10
 
 
-From 532dbba16199d9f40b427b23f4922582883746eb Mon Sep 17 00:00:00 2001
+From af6b099b555a28ec0dfa03c0fc75a2dad6a7990c Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:41:31 +0200
-Subject: [PATCH 06/58] videoplayer: update frametime, it might change due to
+Subject: [PATCH 05/59] videoplayer: update frametime, it might change due to
  fps detection
 
 ---
@@ -1811,10 +1761,10 @@ index 93908a7..4675556 100644
 1.7.10
 
 
-From bba5b177fdc05dd35aa515757106c0b7f45501e5 Mon Sep 17 00:00:00 2001
+From 402da0b70ed0908d94bb1f68045430f6afac5b65 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:43:06 +0200
-Subject: [PATCH 07/58] videoplayer: give streams with invalid fps a chance
+Subject: [PATCH 06/59] videoplayer: give streams with invalid fps a chance
  for fps detection
 
 ---
@@ -1838,10 +1788,10 @@ index 4675556..2ef6358 100644
 1.7.10
 
 
-From 066a5bfdea464e3c2b1d42b7d95b94a0985340f0 Mon Sep 17 00:00:00 2001
+From 59abe0f9df990a738ea6bdf92da459f75076e313 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 10:49:05 +0200
-Subject: [PATCH 08/58] dvdplayer: allow rewinding at end of stream, do a seek
+Subject: [PATCH 07/59] dvdplayer: allow rewinding at end of stream, do a seek
  after rewind
 
 ---
@@ -1849,10 +1799,10 @@ Subject: [PATCH 08/58] dvdplayer: allow rewinding at end of stream, do a seek
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index bf47cd1..bd84086 100644
+index 1dc5812..81ef000 100644
 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
 +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-@@ -1554,7 +1554,7 @@ void CDVDPlayer::HandlePlaySpeed()
+@@ -1541,7 +1541,7 @@ void CDVDPlayer::HandlePlaySpeed()
  
      }
      else if (m_CurrentVideo.id >= 0
@@ -1861,7 +1811,7 @@ index bf47cd1..bd84086 100644
            &&  m_SpeedState.lastpts  != m_dvdPlayerVideo.GetCurrentPts()
            &&  m_SpeedState.lasttime != GetTime())
      {
-@@ -2190,6 +2190,12 @@ void CDVDPlayer::HandleMessages()
+@@ -2177,6 +2177,12 @@ void CDVDPlayer::HandleMessages()
            pvrinputstream->Pause( speed == 0 );
          }
  
@@ -1878,10 +1828,10 @@ index bf47cd1..bd84086 100644
 1.7.10
 
 
-From 2ab8e42700f00f0abb0b87547bb7e310e5db5700 Mon Sep 17 00:00:00 2001
+From 7002b6769c9c54968a920ce63223281317006e31 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 2 Sep 2012 16:05:21 +0200
-Subject: [PATCH 09/58] video player: present correct pts to user for a/v sync
+Subject: [PATCH 08/59] video player: present correct pts to user for a/v sync
  (after buffering in renderer)
 
 ---
@@ -1972,10 +1922,10 @@ index 4913712..509d5f7 100644
 1.7.10
 
 
-From 1692470e838c868b5e11c30a66faf493ae141321 Mon Sep 17 00:00:00 2001
+From ff0183d62f8092925a707671ca0f8a25bdf65cd0 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 28 May 2012 11:02:29 +0200
-Subject: [PATCH 10/58] vaapi: adopt to buffering in renderer
+Subject: [PATCH 09/59] vaapi: adopt to buffering in renderer
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp |    2 +-
@@ -2033,10 +1983,10 @@ index 863edc4..417cbc0 100644
 1.7.10
 
 
-From 2d199663b2c266c77af4bf9217f2974ca7caabb8 Mon Sep 17 00:00:00 2001
+From b2c4948a5560024bce14682643bf4bbd667a71b5 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 7 Apr 2012 09:19:00 +0200
-Subject: [PATCH 11/58] vdpau: redesign
+Subject: [PATCH 10/59] vdpau: redesign
 
 ---
  language/English/strings.po                        |   12 +-
@@ -2067,7 +2017,7 @@ Subject: [PATCH 11/58] vdpau: redesign
  create mode 100644 xbmc/utils/ActorProtocol.h
 
 diff --git a/language/English/strings.po b/language/English/strings.po
-index 7d35a93..d046110 100644
+index d1743ad..a3e59dc 100644
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -5114,7 +5114,15 @@ msgctxt "#13434"
@@ -7684,7 +7634,7 @@ index 10e2225..15a39fa 100644
          formatstr = "DXVA";
          break;
 diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
-index f79fcc1..e988e1b 100644
+index 2cbbf98..b38a7d7 100644
 --- a/xbmc/settings/AdvancedSettings.cpp
 +++ b/xbmc/settings/AdvancedSettings.cpp
 @@ -98,7 +98,7 @@ void CAdvancedSettings::Initialize()
@@ -7705,7 +7655,7 @@ index f79fcc1..e988e1b 100644
    m_DXVACheckCompatibility = false;
    m_DXVACheckCompatibilityPresent = false;
    m_DXVAForceProcessorRenderer = true;
-@@ -490,7 +492,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
+@@ -491,7 +493,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
      XMLUtils::GetString(pElement,"cleandatetime", m_videoCleanDateTimeRegExp);
      XMLUtils::GetString(pElement,"ppffmpegdeinterlacing",m_videoPPFFmpegDeint);
      XMLUtils::GetString(pElement,"ppffmpegpostprocessing",m_videoPPFFmpegPostProc);
@@ -7714,7 +7664,7 @@ index f79fcc1..e988e1b 100644
      XMLUtils::GetFloat(pElement, "nonlinearstretchratio", m_videoNonLinStretchRatio, 0.01f, 1.0f);
      XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers);
      XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f);
-@@ -498,6 +500,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
+@@ -499,6 +501,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
      XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI);    
      XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
      XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
@@ -7724,7 +7674,7 @@ index f79fcc1..e988e1b 100644
      TiXmlElement* pAdjustRefreshrate = pElement->FirstChildElement("adjustrefreshrate");
      if (pAdjustRefreshrate)
 diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
-index c262e4e..c0370e6 100644
+index 191868c..0a4cc01 100644
 --- a/xbmc/settings/AdvancedSettings.h
 +++ b/xbmc/settings/AdvancedSettings.h
 @@ -133,6 +133,8 @@ class CAdvancedSettings
@@ -7746,10 +7696,10 @@ index c262e4e..c0370e6 100644
      bool  m_videoEnableHighQualityHwScalers;
      float m_videoAutoScaleMaxFps;
 diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
-index 4464abb..e9bc6f5 100644
+index c1820a7..3b62658 100644
 --- a/xbmc/settings/GUISettings.cpp
 +++ b/xbmc/settings/GUISettings.cpp
-@@ -685,6 +685,8 @@ void CGUISettings::Initialize()
+@@ -686,6 +686,8 @@ void CGUISettings::Initialize()
  
  #ifdef HAVE_LIBVDPAU
    AddBool(vp, "videoplayer.usevdpau", 13425, true);
@@ -7759,7 +7709,7 @@ index 4464abb..e9bc6f5 100644
  #ifdef HAVE_LIBVA
    AddBool(vp, "videoplayer.usevaapi", 13426, true);
 diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
-index 8b29c4f..785f24d 100644
+index b4cee69..f802b82 100644
 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp
 +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
 @@ -596,6 +596,40 @@ void CGUIWindowSettingsCategory::UpdateSettings()
@@ -8196,10 +8146,10 @@ index e7af3cb..2dd8a9f 100644
 1.7.10
 
 
-From 40ce0dfbdd114dc86b1473392b76a8477b715d5b Mon Sep 17 00:00:00 2001
+From 48e6cfa678de00c4501eef441f42ceef00a246cf Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 25 Sep 2012 12:14:15 +0200
-Subject: [PATCH 12/58] linuxrenderer: drop method RenderMultiPass
+Subject: [PATCH 11/59] linuxrenderer: drop method RenderMultiPass
 
 ---
  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |    9 ++-------
@@ -8249,10 +8199,10 @@ index 3218cd5..afc78c2 100644
 1.7.10
 
 
-From 7474394537c4eea68e088cde78577978d46c8455 Mon Sep 17 00:00:00 2001
+From 7971d6abe45daf051fbc4782da7b18c36dd7213f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 25 Sep 2012 13:20:47 +0200
-Subject: [PATCH 13/58] linuxrenderer: implement progressive weave for vdpau
+Subject: [PATCH 12/59] linuxrenderer: implement progressive weave for vdpau
 
 ---
  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |   55 ++++++++++++++++++-------
@@ -8380,10 +8330,10 @@ index afc78c2..2fc34ae 100644
 1.7.10
 
 
-From e6f1e4673fcbdb4fad66cd78d6a96a2134b376bd Mon Sep 17 00:00:00 2001
+From b9ffecf89d125a90c3c6a4b252a16e9b16539727 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:22:05 +0200
-Subject: [PATCH 14/58] X11: ditch SDL for video and window events
+Subject: [PATCH 13/59] X11: ditch SDL for video and window events
 
 ---
  xbmc/Application.cpp                |    2 +-
@@ -9867,10 +9817,10 @@ index 2dd8a9f..9616d17 100644
 1.7.10
 
 
-From 69c6e04937b94309459d93fc9e72be60400b2764 Mon Sep 17 00:00:00 2001
+From aa14d6e3051f4f3a6c4cc15120ab7b869051536e Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:24:22 +0200
-Subject: [PATCH 15/58] X11: Add xbmc icon
+Subject: [PATCH 14/59] X11: Add xbmc icon
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |  126 ++++++++++++++++++++++++++++++++++-
@@ -10059,10 +10009,10 @@ index 9616d17..debf714 100644
 1.7.10
 
 
-From 377a09cf01961fff54a6e7b995a7b84cb26ea9e6 Mon Sep 17 00:00:00 2001
+From d44e43825001ffe1acc763f67f40b20ebdd2fcf4 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 20 May 2012 14:11:26 +0200
-Subject: [PATCH 16/58] X11: add SDL joystick until we have a better solution
+Subject: [PATCH 15/59] X11: add SDL joystick until we have a better solution
 
 ---
  xbmc/windowing/WinEventsX11.cpp |   26 ++++++++++++++++++++++++++
@@ -10116,10 +10066,10 @@ index 24477ae..2ec86a8 100644
 1.7.10
 
 
-From f6f9d3688c745890331c040d231f34752ad4bd2d Mon Sep 17 00:00:00 2001
+From 105d66cc876cf61565486022a6af4b55840339f4 Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 12:35:55 +0200
-Subject: [PATCH 17/58] X11: factor out code handling device reset
+Subject: [PATCH 16/59] X11: factor out code handling device reset
  notification
 
 ---
@@ -10183,10 +10133,10 @@ index debf714..8c28e3f 100644
 1.7.10
 
 
-From 4ec04fa1d25596745b4499ae37503647bd212bd4 Mon Sep 17 00:00:00 2001
+From 797f2a8dd63022b49ab664ff711304ba0fa110d9 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 15:02:00 +0200
-Subject: [PATCH 18/58] X11: move xrandr events to WinEventsX11
+Subject: [PATCH 17/59] X11: move xrandr events to WinEventsX11
 
 ---
  xbmc/windowing/WinEventsX11.cpp     |   42 +++++++++++++++++++++++++++++++++++
@@ -10330,10 +10280,10 @@ index 70557d0..1cce843 100644
 1.7.10
 
 
-From 1661885a13a500db73af817de5629538ee8bf65f Mon Sep 17 00:00:00 2001
+From 23e75c1c78ea9f3490c7e5323ebe5e9bae9444e1 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 12 Apr 2012 15:43:56 +0200
-Subject: [PATCH 19/58] xrandr: remove method RestoreState
+Subject: [PATCH 18/59] xrandr: remove method RestoreState
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |   13 +++++++++++--
@@ -10412,10 +10362,10 @@ index 2a269d0..5b64633 100644
 1.7.10
 
 
-From 01182003c79da8445e0d8cdf951cb7c6d3579c70 Mon Sep 17 00:00:00 2001
+From 27356f9fb696117bd94c37323cb88a660fcf2557 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 20 May 2012 13:17:10 +0200
-Subject: [PATCH 20/58] xrandr: observe orientation
+Subject: [PATCH 19/59] xrandr: observe orientation
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |   61 +++++++++++++++++++++++++++++++++--
@@ -10584,10 +10534,10 @@ index 5b64633..618bd68 100644
 1.7.10
 
 
-From 2249ddc7458204c171fcf8ed29c39b66373a2de6 Mon Sep 17 00:00:00 2001
+From 6d4e17228197f9da952d52e5bbf794588616f289 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:54:15 +0200
-Subject: [PATCH 21/58] xrandr: allow getting info for multiple screen's
+Subject: [PATCH 20/59] xrandr: allow getting info for multiple screen's
 
 Refactored by: Joakim Plate <elupus@xbmc.org>
 ---
@@ -10762,10 +10712,10 @@ index 618bd68..0824af5 100644
 1.7.10
 
 
-From bd5aaf4fca228cb80d361262b9e28c7f2443fa0b Mon Sep 17 00:00:00 2001
+From fccb34aaa09cabe38b4dd46b693cfd977254faf6 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:44:00 +0200
-Subject: [PATCH 22/58] X11: fix multi-head setups
+Subject: [PATCH 21/59] X11: fix multi-head setups
 
 ---
  language/English/strings.po                 |    4 +-
@@ -10779,7 +10729,7 @@ Subject: [PATCH 22/58] X11: fix multi-head setups
  8 files changed, 235 insertions(+), 115 deletions(-)
 
 diff --git a/language/English/strings.po b/language/English/strings.po
-index d046110..9887f19 100644
+index a3e59dc..2e76b0f 100644
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -895,7 +895,9 @@ msgctxt "#245"
@@ -10806,10 +10756,10 @@ index efe5493..85d780d 100644
    virtual void SetViewPort(CRect& viewPort);
    virtual void GetViewPort(CRect& viewPort);
 diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
-index e9bc6f5..abf5c01 100644
+index 3b62658..6c0637e 100644
 --- a/xbmc/settings/GUISettings.cpp
 +++ b/xbmc/settings/GUISettings.cpp
-@@ -392,11 +392,16 @@ void CGUISettings::Initialize()
+@@ -391,11 +391,16 @@ void CGUISettings::Initialize()
    AddGroup(SETTINGS_SYSTEM, 13000);
    CSettingsCategory* vs = AddCategory(SETTINGS_SYSTEM, "videoscreen", 21373);
  
@@ -10827,7 +10777,7 @@ index e9bc6f5..abf5c01 100644
    // contains an index to the g_settings.m_ResInfo array. the only meaningful fields are iScreen, iWidth, iHeight.
  #if defined(TARGET_DARWIN)
 diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
-index 785f24d..89addf7 100644
+index f802b82..bc7afa1 100644
 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp
 +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
 @@ -528,6 +528,12 @@ void CGUIWindowSettingsCategory::CreateSettings()
@@ -10864,7 +10814,7 @@ index 785f24d..89addf7 100644
    else if (strSetting.Equals("videoscreen.resolution"))
    {
      RESOLUTION nextRes = (RESOLUTION) g_guiSettings.GetInt("videoscreen.resolution");
-@@ -2418,11 +2438,15 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
+@@ -2426,11 +2446,15 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
      if (g_advancedSettings.m_canWindowed)
        pControl->AddLabel(g_localizeStrings.Get(242), -1);
  
@@ -10880,7 +10830,7 @@ index 785f24d..89addf7 100644
      pControl->SetValue(mode);
      g_guiSettings.SetInt("videoscreen.screen", mode);
    }
-@@ -2430,6 +2454,36 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
+@@ -2438,6 +2462,36 @@ DisplayMode CGUIWindowSettingsCategory::FillInScreens(CStdString strSetting, RES
    return mode;
  }
  
@@ -10917,7 +10867,7 @@ index 785f24d..89addf7 100644
  void CGUIWindowSettingsCategory::FillInResolutions(CStdString strSetting, DisplayMode mode, RESOLUTION res, bool UserChange)
  {
    CBaseSettingControl *control = GetSetting(strSetting);
-@@ -2558,13 +2612,15 @@ void CGUIWindowSettingsCategory::OnRefreshRateChanged(RESOLUTION nextRes)
+@@ -2566,13 +2620,15 @@ void CGUIWindowSettingsCategory::OnRefreshRateChanged(RESOLUTION nextRes)
    RESOLUTION lastRes = g_graphicsContext.GetVideoResolution();
    bool cancelled = false;
  
@@ -11497,10 +11447,10 @@ index 93cf5db..71034fc 100644
 1.7.10
 
 
-From a172c0820920629f6bbfc5c93b855d1495e09ec8 Mon Sep 17 00:00:00 2001
+From 22cd095ee0b01342d4ae2974fd1b67e89ba10c19 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:36:32 +0200
-Subject: [PATCH 23/58] X11: remove all DefaultScreen and RootWindow macros
+Subject: [PATCH 22/59] X11: remove all DefaultScreen and RootWindow macros
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp   |    6 +++---
@@ -11568,10 +11518,10 @@ index f858f88..d192697 100644
 1.7.10
 
 
-From 6b513d66eeea6d266e3d447012445b8598e39c72 Mon Sep 17 00:00:00 2001
+From 277da851992e981ee50e5d4c1ea81063d0ba09a2 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 11:45:22 +0200
-Subject: [PATCH 24/58] X11: remove all DefaultScreen and RootWindow macros
+Subject: [PATCH 23/59] X11: remove all DefaultScreen and RootWindow macros
  (VideoRefClock)
 
 Note this is on a separate display connection.
@@ -11643,10 +11593,10 @@ index 9785fe7..0004e07 100644
 1.7.10
 
 
-From 85e142c39ee955350da2dd1d690677ad84c810ec Mon Sep 17 00:00:00 2001
+From 0994ac9f61010955f2e0e18208ac2c96565dc5a2 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Wed, 20 Jun 2012 17:37:11 +0200
-Subject: [PATCH 25/58] X11: recreate gl context after output has changed
+Subject: [PATCH 24/59] X11: recreate gl context after output has changed
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp   |   24 ++++++++++++++----------
@@ -11797,10 +11747,10 @@ index d192697..0f2d1d2 100644
 1.7.10
 
 
-From e93c757a4f7a982af81f5e647e6e246d330fd5ec Mon Sep 17 00:00:00 2001
+From f56417bcd425dd14f9ae3245a3fb759e7ec6534d Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:06:25 +0200
-Subject: [PATCH 26/58] X11: hook video reference clock in windowing
+Subject: [PATCH 25/59] X11: hook video reference clock in windowing
 
 ---
  xbmc/video/VideoReferenceClock.cpp |   71 ++++++++++++++++++++++++++----------
@@ -12005,10 +11955,10 @@ index dcc4f09..7eb6317 100644
 1.7.10
 
 
-From 514b28d959f14ca495e76f1e8b2f0f5cd55082ce Mon Sep 17 00:00:00 2001
+From cc38a73ecba33cfa8ff933164dbf1c230f2d975d Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 21 Jun 2012 17:26:51 +0200
-Subject: [PATCH 27/58] X11: fix video calibrations
+Subject: [PATCH 26/59] X11: fix video calibrations
 
 ---
  xbmc/settings/Settings.cpp          |    1 +
@@ -12113,10 +12063,10 @@ index cc28f56..c046c86 100644
 1.7.10
 
 
-From a9c1e53503d51463f731763cb4eaa58a4dc7d83d Mon Sep 17 00:00:00 2001
+From 682203619db3e1e5381bb52fa74e372641d07430 Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:00:26 +0200
-Subject: [PATCH 28/58] X11: deactivate screen saver on startup
+Subject: [PATCH 27/59] X11: deactivate screen saver on startup
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |   29 +++++++++++++++++++++++++++++
@@ -12186,10 +12136,10 @@ index c046c86..e953d2d 100644
 1.7.10
 
 
-From a2f6f8c51f7a0bf58c9f42536b14880a5592a016 Mon Sep 17 00:00:00 2001
+From 0593d5f3915dc4360c80f5b1adf708c084e4927b Mon Sep 17 00:00:00 2001
 From: FernetMenta <fernetmenta@online.de>
 Date: Thu, 5 Jul 2012 12:10:09 +0200
-Subject: [PATCH 29/58] X11: change method of going full-screen
+Subject: [PATCH 28/59] X11: change method of going full-screen
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |    9 ++++++++-
@@ -12233,10 +12183,10 @@ index b3e7ab5..91f92c1 100644
 1.7.10
 
 
-From 32561409b440dec1ad2aa0542b32b3c687512045 Mon Sep 17 00:00:00 2001
+From f03be0f0fd20b91519d6723a2b87957211860066 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 28 Jun 2012 19:12:39 +0200
-Subject: [PATCH 30/58] X11: reset key repeat and key modifier on focus lost
+Subject: [PATCH 29/59] X11: reset key repeat and key modifier on focus lost
  and gain
 
 ---
@@ -12268,10 +12218,10 @@ index 6c22358..d86205d 100644
 1.7.10
 
 
-From c89ca3e1e69fce896d866d1c92bc5626baae8406 Mon Sep 17 00:00:00 2001
+From 40e9b1fe262817c392daf111834f6a8c34d11fcd Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 14:18:46 +0200
-Subject: [PATCH 31/58] X11: replace custom utf8 to unicode with charset
+Subject: [PATCH 30/59] X11: replace custom utf8 to unicode with charset
  convertor (squash to x11 events)
 
 ---
@@ -12488,10 +12438,10 @@ index 6100933..72955ad 100644
 1.7.10
 
 
-From f14ba6206ff8cdb5acd928528b78bfd0f3bcf9cd Mon Sep 17 00:00:00 2001
+From eaaec3ab2335ed678eed63d8e57aaa744e53f1f8 Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@xbmc.org>
 Date: Thu, 5 Jul 2012 14:23:54 +0200
-Subject: [PATCH 32/58] X11: fixed invalid usage of sizeof() (squash into x11
+Subject: [PATCH 31/59] X11: fixed invalid usage of sizeof() (squash into x11
  changes)
 
 ---
@@ -12555,10 +12505,10 @@ index 72955ad..102a076 100644
 1.7.10
 
 
-From 70b39d59155703ea8f3f80b33e11298b5bbb8316 Mon Sep 17 00:00:00 2001
+From c60aa57751d70011ce0fd0330c33220d838bb9fa Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 9 Jun 2012 18:23:53 +0200
-Subject: [PATCH 33/58] add missing keys to xbmc keytable
+Subject: [PATCH 32/59] add missing keys to xbmc keytable
 
 ---
  xbmc/input/XBMC_keytable.cpp |    2 ++
@@ -12581,10 +12531,10 @@ index dbc28a7..0ab6e78 100644
 1.7.10
 
 
-From 2cac8b3da3061ea9847e475aa50030a882f09e63 Mon Sep 17 00:00:00 2001
+From eb00fddcf80cc26943789f5110ff34eb741670fa Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 16 Mar 2012 15:57:51 +0100
-Subject: [PATCH 34/58] videorefclock: temp deactivate of nv settings
+Subject: [PATCH 33/59] videorefclock: temp deactivate of nv settings
 
 ---
  xbmc/video/VideoReferenceClock.cpp |    2 +-
@@ -12607,10 +12557,10 @@ index fa8e35a..85e36c7 100644
 1.7.10
 
 
-From 2541e950b628baf5cbee4e73a022c8d2d9b66481 Mon Sep 17 00:00:00 2001
+From a0d5f344326030df66e56fb8b3c693188a4cd447 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 20 Aug 2012 09:09:09 +0200
-Subject: [PATCH 35/58] videorefclock: ask graphics context for refresh rate
+Subject: [PATCH 34/59] videorefclock: ask graphics context for refresh rate
 
 ---
  xbmc/video/VideoReferenceClock.cpp |    3 ++-
@@ -12641,10 +12591,10 @@ index 85e36c7..8209163 100644
 1.7.10
 
 
-From d41b611cce7bbbdbe4e267ea773e0293b7339607 Mon Sep 17 00:00:00 2001
+From 4e414b8a29f3f09f6716a33fd41f33b976a9ac5c Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 9 Jul 2012 14:00:18 +0200
-Subject: [PATCH 36/58] X11: fix icon texture after
+Subject: [PATCH 35/59] X11: fix icon texture after
  cc5ed3c2474084ebc0373a3046410e6f766e03f4
 
 ---
@@ -12752,10 +12702,10 @@ index 91f92c1..174ccef 100644
 1.7.10
 
 
-From 9923666f9cf1f0fdabb4b2e0b104e30f0a9fab28 Mon Sep 17 00:00:00 2001
+From 9641aa4585e2966abda96614c16a6410acf07f47 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 10 Jul 2012 11:14:12 +0200
-Subject: [PATCH 37/58] X11: check for window manager
+Subject: [PATCH 36/59] X11: check for window manager
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |   74 ++++++++++++++++++++++++++++++++++-
@@ -12876,10 +12826,10 @@ index e953d2d..0b7c10a 100644
 1.7.10
 
 
-From 10cf8477872ce1e7f986c66dd2d187745653a9d1 Mon Sep 17 00:00:00 2001
+From 2f28294d8e612ebd07613c6af193d0fc3f5482bc Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 12 Jul 2012 11:11:47 +0200
-Subject: [PATCH 38/58] X11: dont set window on xrandr if no mode available
+Subject: [PATCH 37/59] X11: dont set window on xrandr if no mode available
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |   11 ++++++-----
@@ -12916,10 +12866,10 @@ index 4f1ae26..c11ea89 100644
 1.7.10
 
 
-From 8eb784a2b8e9e949742645d94fabeff3194ac359 Mon Sep 17 00:00:00 2001
+From 4f4d3485beaef146a133cdff8046466bd8ea990a Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 26 Jul 2012 09:34:28 +0200
-Subject: [PATCH 39/58] X11: fix crash after a resolution change on startup
+Subject: [PATCH 38/59] X11: fix crash after a resolution change on startup
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |    3 ++-
@@ -12943,10 +12893,10 @@ index c11ea89..0bd72d4 100644
 1.7.10
 
 
-From b727c8d69417726979856e6f1250fa04f1a57589 Mon Sep 17 00:00:00 2001
+From 28b45c214640eca751baa91ff9193d339dc5b82f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 15 Sep 2012 18:27:29 +0200
-Subject: [PATCH 40/58] X11: lock graphics context in NotifyXRREvent
+Subject: [PATCH 39/59] X11: lock graphics context in NotifyXRREvent
 
 ---
  xbmc/windowing/X11/WinSystemX11.cpp |    2 ++
@@ -12969,10 +12919,10 @@ index 0bd72d4..ef83133 100644
 1.7.10
 
 
-From 7ed7ca37f86fb84ad867cf29e78e481bd8425c19 Mon Sep 17 00:00:00 2001
+From db39155fc537a91377fe6e42d9414eec730dbd0e Mon Sep 17 00:00:00 2001
 From: Rainer Hochecker <fernetmenta@online.de>
 Date: Sat, 8 Oct 2011 16:45:13 +0200
-Subject: [PATCH 41/58] ffmpeg: add xvba hwaccel
+Subject: [PATCH 40/59] ffmpeg: add xvba hwaccel
 
 ---
  lib/ffmpeg/configure                  |    8 ++
@@ -13839,10 +13789,10 @@ index f0d9c01..0f8cf7b 100644
 1.7.10
 
 
-From ba3ff34f25538a4214d3734b12b938b032396a1f Mon Sep 17 00:00:00 2001
+From f0ac9783e599023a7140a724edc2889e87355389 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 12 Apr 2012 12:09:31 +0200
-Subject: [PATCH 42/58] xvba: add decoder
+Subject: [PATCH 41/59] xvba: add decoder
 
 ---
  configure.in                                       |   48 +
@@ -13865,7 +13815,7 @@ Subject: [PATCH 42/58] xvba: add decoder
  create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h
 
 diff --git a/configure.in b/configure.in
-index 82f457a..c328f0f 100644
+index 5d514b8..aebe108 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. =="
@@ -13890,7 +13840,7 @@ index 82f457a..c328f0f 100644
  
  AC_ARG_ENABLE([vdadecoder],
    [AS_HELP_STRING([--enable-vdadecoder],
-@@ -1760,6 +1768,38 @@ else
+@@ -1759,6 +1767,38 @@ else
    USE_CRYSTALHD=0
  fi
  
@@ -13929,7 +13879,7 @@ index 82f457a..c328f0f 100644
  # VDADecoder
  if test "x$use_vdadecoder" != "xno"; then
    if test "$host_vendor" = "apple" ; then
-@@ -1971,6 +2011,12 @@ else
+@@ -1970,6 +2010,12 @@ else
    final_message="$final_message\n  CrystalHD:\tNo"
  fi
  
@@ -13942,7 +13892,7 @@ index 82f457a..c328f0f 100644
  if test "x$use_vdadecoder" != "xno"; then
    final_message="$final_message\n  VDADecoder:\tYes"
  else
-@@ -2444,6 +2490,7 @@ AC_SUBST(USE_OPENGLES)
+@@ -2443,6 +2489,7 @@ AC_SUBST(USE_OPENGLES)
  AC_SUBST(USE_VDPAU)
  AC_SUBST(USE_VAAPI)
  AC_SUBST(USE_CRYSTALHD)
@@ -13950,7 +13900,7 @@ index 82f457a..c328f0f 100644
  AC_SUBST(USE_LIBSMBCLIENT)
  AC_SUBST(USE_LIBNFS)
  AC_SUBST(USE_LIBAFPCLIENT)
-@@ -2627,6 +2674,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
+@@ -2626,6 +2673,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
        `if test "x$use_vdpau" != "xno"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
        `if test "x$use_vaapi" != "xno"; then echo --enable-vaapi; else echo --disable-vaapi; fi` \
        `if test "$use_optimizations" != "no"; then echo --enable-optimizations; else echo --disable-optimizations; fi` \
@@ -13959,7 +13909,7 @@ index 82f457a..c328f0f 100644
        --enable-pthreads \
        --enable-runtime-cpudetect \
 diff --git a/language/English/strings.po b/language/English/strings.po
-index 9887f19..c616348 100644
+index 2e76b0f..f53dd60 100644
 --- a/language/English/strings.po
 +++ b/language/English/strings.po
 @@ -5124,7 +5124,11 @@ msgctxt "#13436"
@@ -17247,10 +17197,10 @@ index 15a39fa..e5e71f3 100644
  
      if(m_bAllowFullscreen)
 diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp
-index abf5c01..ee0c789 100644
+index 6c0637e..0926dd9 100644
 --- a/xbmc/settings/GUISettings.cpp
 +++ b/xbmc/settings/GUISettings.cpp
-@@ -696,6 +696,9 @@ void CGUISettings::Initialize()
+@@ -697,6 +697,9 @@ void CGUISettings::Initialize()
  #ifdef HAVE_LIBVA
    AddBool(vp, "videoplayer.usevaapi", 13426, true);
  #endif
@@ -17289,10 +17239,10 @@ index f25d10d..f6b1ea4 100644
 1.7.10
 
 
-From f14ba2a7b0bb2dc3b3335572e3578c39c44d68ce Mon Sep 17 00:00:00 2001
+From bf8c46257fcedc3b34861faa82fef00f88d1590f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 23 Aug 2012 19:39:49 +0200
-Subject: [PATCH 43/58] ffmpeg: add av_find_default_stream_index to interface
+Subject: [PATCH 42/59] ffmpeg: add av_find_default_stream_index to interface
 
 ---
  lib/DllAvFormat.h |    4 ++++
@@ -17338,10 +17288,10 @@ index 9bda3f3..bf31fcb 100644
 1.7.10
 
 
-From 04c4aec1667a07fc2270a1f5ca5ae4d06833db23 Mon Sep 17 00:00:00 2001
+From 3a355c48b98c0d590b444163ff46dd2754706ee2 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 20 Aug 2012 16:06:39 +0200
-Subject: [PATCH 44/58] dvdplayer: observe pts counter overflow
+Subject: [PATCH 43/59] dvdplayer: observe pts counter overflow
 
 ---
  .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp |  198 +++++++++++++++++++-
@@ -17627,10 +17577,10 @@ index 2b5f2e8..e0acf29 100644
 1.7.10
 
 
-From 8154babe8b8862701468ccb33d22798e3fab8c4d Mon Sep 17 00:00:00 2001
+From 6744d6446f8d526cd25be5c09ca2851de4f7e205 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Tue, 2 Oct 2012 13:02:10 +0200
-Subject: [PATCH 45/58] dvdplayer: avoid short screen flicker caused by
+Subject: [PATCH 44/59] dvdplayer: avoid short screen flicker caused by
  unnecessary reconfigure of renderer
 
 ---
@@ -17663,10 +17613,10 @@ index e5e71f3..8b02d81 100644
 1.7.10
 
 
-From 5151698a925c539654a90a19d1d3df11d38e7938 Mon Sep 17 00:00:00 2001
+From ebea481adc008ae3b81bbc7b1c857fcaa7157213 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sat, 16 Jun 2012 12:46:30 +0200
-Subject: [PATCH 46/58] xvba: do not use vaapi if xvba is present
+Subject: [PATCH 45/59] xvba: do not use vaapi if xvba is present
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp |    9 +++++++++
@@ -17696,10 +17646,10 @@ index a2b9195..43a05b3 100644
 1.7.10
 
 
-From 4501236a67eefb4b6def816b57be86f71b19297f Mon Sep 17 00:00:00 2001
+From 730fafc91c8d0eb57332d4505ece0aa74cfaf989 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 11 Oct 2012 12:05:50 +0200
-Subject: [PATCH 47/58] vdpau: advanced settings for auto deinterlacing
+Subject: [PATCH 46/59] vdpau: advanced settings for auto deinterlacing
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp |    8 ++++----
@@ -17727,7 +17677,7 @@ index 235f565..d95797b 100644
      if (deint != -1)
      {
 diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
-index e988e1b..710e85e 100644
+index b38a7d7..17bd995 100644
 --- a/xbmc/settings/AdvancedSettings.cpp
 +++ b/xbmc/settings/AdvancedSettings.cpp
 @@ -106,6 +106,8 @@ void CAdvancedSettings::Initialize()
@@ -17739,7 +17689,7 @@ index e988e1b..710e85e 100644
    m_videoVDPAUtelecine = false;
    m_videoVDPAUdeintSkipChromaHD = false;
    m_DXVACheckCompatibility = false;
-@@ -500,6 +502,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
+@@ -501,6 +503,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file)
      XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI);    
      XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace);
      XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1);
@@ -17749,7 +17699,7 @@ index e988e1b..710e85e 100644
      XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD);
  
 diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
-index c0370e6..737fda6 100644
+index 0a4cc01..050d33f 100644
 --- a/xbmc/settings/AdvancedSettings.h
 +++ b/xbmc/settings/AdvancedSettings.h
 @@ -133,6 +133,8 @@ class CAdvancedSettings
@@ -17765,20 +17715,20 @@ index c0370e6..737fda6 100644
 1.7.10
 
 
-From 09c3552c12928c65853920f85c91b02933666c4b Mon Sep 17 00:00:00 2001
+From 871095f4adee62a03408c2be443cc7df4e1c901a Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Thu, 11 Oct 2012 13:01:08 +0200
-Subject: [PATCH 48/58] dvdplayer: correct determination if video is playing
+Subject: [PATCH 47/59] dvdplayer: correct determination if video is playing
 
 ---
  xbmc/cores/dvdplayer/DVDPlayer.cpp |   11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index bd84086..b09ed01 100644
+index 81ef000..0a5d818 100644
 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
 +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-@@ -2389,9 +2389,16 @@ bool CDVDPlayer::IsPaused() const
+@@ -2376,9 +2376,16 @@ bool CDVDPlayer::IsPaused() const
  
  bool CDVDPlayer::HasVideo() const
  {
@@ -17801,10 +17751,10 @@ index bd84086..b09ed01 100644
 1.7.10
 
 
-From 388d82b9394c452affb1379fe74b10066ae01839 Mon Sep 17 00:00:00 2001
+From c6e9fecccf60ef179a8236fbf82fe69f6e0d92e2 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 14 Oct 2012 13:46:54 +0200
-Subject: [PATCH 49/58] rendermanager: fix stuttering in non full-screen mode,
+Subject: [PATCH 48/59] rendermanager: fix stuttering in non full-screen mode,
  squash to add buffering
 
 ---
@@ -17830,10 +17780,10 @@ index 0506823..b141c80 100644
 1.7.10
 
 
-From d025c444708f859b397a3cb110be55c73057c92c Mon Sep 17 00:00:00 2001
+From 7cbde0f6d56c34a1ba286ec930c1682fb9960737 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 14 Oct 2012 17:54:02 +0200
-Subject: [PATCH 50/58] rendermanager: forgot to set flip event if buffering
+Subject: [PATCH 49/59] rendermanager: forgot to set flip event if buffering
  is not used
 
 ---
@@ -17876,10 +17826,10 @@ index b141c80..9290f80 100644
 1.7.10
 
 
-From 4f19b85dd90f9eea8bf29e6f208e4fdb1da4d160 Mon Sep 17 00:00:00 2001
+From ebe95bf2f6d32355b2d7853f8457f4c6d2d630ad Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 26 Oct 2012 15:30:22 +0200
-Subject: [PATCH 51/58] vdpau: fix small mem leak
+Subject: [PATCH 50/59] vdpau: fix small mem leak
 
 ---
  xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp |    2 ++
@@ -17902,10 +17852,10 @@ index d95797b..fec4b88 100644
 1.7.10
 
 
-From 2fdfb80c70f030a51391f93aa57234cc73191e51 Mon Sep 17 00:00:00 2001
+From 7dd95b18e9e66dfc90e838467aac3c1bb906bef9 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Mon, 29 Oct 2012 18:25:56 +0100
-Subject: [PATCH 52/58] xvba: do not render if there is no valid texture
+Subject: [PATCH 51/59] xvba: do not render if there is no valid texture
 
 ---
  xbmc/cores/VideoRenderers/LinuxRendererGL.cpp |    8 +++-----
@@ -17939,10 +17889,10 @@ index 723ab34..4a6ab25 100644
 1.7.10
 
 
-From 6cc9cd9c48f4ee86e0f35544284ba65ec6c1b99f Mon Sep 17 00:00:00 2001
+From 12489a2692ee537259b4ff02847ca027c89e17bd Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 2 Nov 2012 13:20:03 +0100
-Subject: [PATCH 53/58] player: fix rewind
+Subject: [PATCH 52/59] player: fix rewind
 
 ---
  xbmc/cores/dvdplayer/DVDMessage.h       |    5 ++++-
@@ -17990,10 +17940,10 @@ index 30b2f5c..b9831d4 100644
  
  class CDVDMsgPlayerSeekChapter : public CDVDMsg
 diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-index b09ed01..da9058d 100644
+index 0a5d818..bd718fd 100644
 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
 +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
-@@ -1555,11 +1555,13 @@ void CDVDPlayer::HandlePlaySpeed()
+@@ -1542,11 +1542,13 @@ void CDVDPlayer::HandlePlaySpeed()
      }
      else if (m_CurrentVideo.id >= 0
            &&  (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file
@@ -18008,7 +17958,7 @@ index b09ed01..da9058d 100644
        // check how much off clock video is when ff/rw:ing
        // a problem here is that seeking isn't very accurate
        // and since the clock will be resynced after seek
-@@ -1578,7 +1580,7 @@ void CDVDPlayer::HandlePlaySpeed()
+@@ -1565,7 +1567,7 @@ void CDVDPlayer::HandlePlaySpeed()
        {
          CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
          int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL);
@@ -18017,7 +17967,7 @@ index b09ed01..da9058d 100644
        }
      }
    }
-@@ -2037,7 +2039,7 @@ void CDVDPlayer::HandleMessages()
+@@ -2024,7 +2026,7 @@ void CDVDPlayer::HandleMessages()
              if(!m_pSubtitleDemuxer->SeekTime(time, msg.GetBackward()))
                CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time);
            }
@@ -18026,7 +17976,7 @@ index b09ed01..da9058d 100644
          }
          else
            CLog::Log(LOGWARNING, "error while seeking");
-@@ -2175,9 +2177,10 @@ void CDVDPlayer::HandleMessages()
+@@ -2162,9 +2164,10 @@ void CDVDPlayer::HandleMessages()
            double offset;
            offset  = CDVDClock::GetAbsoluteClock() - m_State.timestamp;
            offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL;
@@ -18038,7 +17988,7 @@ index b09ed01..da9058d 100644
            m_State.timestamp =  CDVDClock::GetAbsoluteClock();
          }
  
-@@ -2193,7 +2196,8 @@ void CDVDPlayer::HandleMessages()
+@@ -2180,7 +2183,8 @@ void CDVDPlayer::HandleMessages()
          // do a seek after rewind, clock is not in sync with current pts
          if (m_playSpeed < 0 && speed >= 0)
          {
@@ -18048,7 +17998,7 @@ index b09ed01..da9058d 100644
          }
  
          // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE
-@@ -2774,10 +2778,11 @@ int64_t CDVDPlayer::GetTime()
+@@ -2761,10 +2765,11 @@ int64_t CDVDPlayer::GetTime()
    {
      offset  = CDVDClock::GetAbsoluteClock() - m_State.timestamp;
      offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL;
@@ -18061,7 +18011,7 @@ index b09ed01..da9058d 100644
  }
  
  // return length in msec
-@@ -3136,7 +3141,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers)
+@@ -3123,7 +3128,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers)
    return true;
  }
  
@@ -18070,7 +18020,7 @@ index b09ed01..da9058d 100644
  {
    double startpts;
    if(accurate)
-@@ -3148,19 +3153,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
+@@ -3135,19 +3140,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
    if(startpts != DVD_NOPTS_VALUE)
      startpts -= m_offset_pts;
  
@@ -18098,7 +18048,7 @@ index b09ed01..da9058d 100644
    m_CurrentTeletext.dts      = DVD_NOPTS_VALUE;
    m_CurrentTeletext.startpts = startpts;
  
-@@ -3204,7 +3213,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
+@@ -3191,7 +3200,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
        m_CurrentTeletext.started = false;
      }
  
@@ -18187,10 +18137,10 @@ index 509d5f7..7cddda7 100644
 1.7.10
 
 
-From 3ca0b89c8009e1e61da27d7bc616b8cb03435bd5 Mon Sep 17 00:00:00 2001
+From 8f9a3476cf1aeb736877698134d4f2bf62185558 Mon Sep 17 00:00:00 2001
 From: fritsch <peter.fruehberger@gmail.com>
 Date: Fri, 2 Nov 2012 17:56:12 +0100
-Subject: [PATCH 54/58] xvba: do not create decoder for surfaces larger than
+Subject: [PATCH 53/59] xvba: do not create decoder for surfaces larger than
  width 2048 or height 1536
 
 ---
@@ -18227,10 +18177,10 @@ index e8e376a..b73c48a 100644
 1.7.10
 
 
-From 7716a8fd17116103cc43c573de398038a614c79e Mon Sep 17 00:00:00 2001
+From f20ae3c612863d9493af5f97ecad288e7a6450d4 Mon Sep 17 00:00:00 2001
 From: fritsch <peter.fruehberger@gmail.com>
 Date: Sun, 4 Nov 2012 16:24:10 +0100
-Subject: [PATCH 55/58] xvba: add string for available decoders - we are
+Subject: [PATCH 54/59] xvba: add string for available decoders - we are
  important so make sure we are there
 
 ---
@@ -18257,10 +18207,10 @@ index 0cea7a9..6fb74b7 100644
 1.7.10
 
 
-From a8a42001b07528e79758bfc79717c95f3282dc58 Mon Sep 17 00:00:00 2001
+From 6a0030d69d05ac648b8b0fc7ee56e3190cd25aa7 Mon Sep 17 00:00:00 2001
 From: fritsch <Peter.Fruehberger@gmail.com>
 Date: Thu, 22 Nov 2012 21:32:21 +0100
-Subject: [PATCH 56/58] xvba: revisit Artefacts. There are more broken video
+Subject: [PATCH 55/59] xvba: revisit Artefacts. There are more broken video
  files out there
 
 ---
@@ -18294,10 +18244,10 @@ index a077442..87af687 100644
 1.7.10
 
 
-From 5bad32f250578a0ff23a1424039f6acfd43e7f08 Mon Sep 17 00:00:00 2001
+From c2d15233697c7b872ed9ccf32d5b36a3c5fa180f Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 23 Nov 2012 09:42:02 +0100
-Subject: [PATCH 57/58] xvba: reactivate accidently disabled
+Subject: [PATCH 56/59] xvba: reactivate accidently disabled
  IsDecodingFinished
 
 ---
@@ -18321,10 +18271,10 @@ index b73c48a..47ff25f 100644
 1.7.10
 
 
-From 77888a23dd4c76d67481e7e964b0c862403b52c5 Mon Sep 17 00:00:00 2001
+From e40ab705e4a9057e723e2c16f6a9ff7d0b15e653 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Fri, 23 Nov 2012 17:41:12 +0100
-Subject: [PATCH 58/58] xrandr: fix query for multiple screens
+Subject: [PATCH 57/59] xrandr: fix query for multiple screens
 
 ---
  xbmc/windowing/X11/XRandR.cpp |   10 ++++++----
@@ -18364,3 +18314,62 @@ index cc933b9..533e03d 100644
 -- 
 1.7.10
 
+
+From be6205093cda42414c07776760632dbb1460caaa Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Sun, 2 Dec 2012 15:46:55 +0100
+Subject: [PATCH 58/59] X11: add debug log to print out refresh after xrr
+ event
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index ef83133..76c6362 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -685,6 +685,12 @@ void CWinSystemX11::NotifyXRREvent()
+   XOutput *out = g_xrandr.GetOutput(currentOutput);
+   XMode   mode = g_xrandr.GetCurrentMode(currentOutput);
+ 
++  if (out)
++    CLog::Log(LOGDEBUG, "%s - current output: %s, mode: %s, refresh: %.3f", __FUNCTION__
++             , out->name.c_str(), mode.id.c_str(), mode.hz);
++  else
++    CLog::Log(LOGWARNING, "%s - output name not set", __FUNCTION__);
++
+   RESOLUTION_INFO res;
+   unsigned int i;
+   bool found(false);
+-- 
+1.7.10
+
+
+From efd2b27ce9ca7f179bf8e0071f45105a66fcec4e Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Tue, 11 Dec 2012 11:08:13 +0100
+Subject: [PATCH 59/59] X11: dont call XCloseDisplay on shutdown, it crashes
+ when powered doen by cec on ATI
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index 76c6362..e4e25b2 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -108,7 +108,8 @@ bool CWinSystemX11::DestroyWindowSystem()
+     //we don't call XCloseDisplay() here, since ati keeps a pointer to our m_dpy
+     //so instead we just let m_dpy die on exit
+     // i have seen core dumps on ATI if the display is not closed here
+-    XCloseDisplay(m_dpy);
++    // crashes when shutting down via cec
++//    XCloseDisplay(m_dpy);
+   }
+ 
+   // m_SDLSurface is free()'d by SDL_Quit().
+-- 
+1.7.10
+