From 44e82cc0403a4a9a6c927762f19bc3e44f12f603 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 4 Jan 2014 20:29:47 +0200 Subject: [PATCH] xbmc: update to xbmc-13.alpha-6ea5b07 --- .../mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/package.mk | 2 +- ...bmc-995.01-fernetmenta-fixes-a66a9b9.patch | 320 ++++++++++-------- 3 files changed, 172 insertions(+), 152 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 8c3b5031e4..2a34775323 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-a9e8763" +PKG_VERSION="13.alpha-6ea5b07" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 88dd519025..cb44b2f9ab 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-a9e8763" +PKG_VERSION="13.alpha-6ea5b07" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch index a9bd97b26a..942d84d47b 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-a66a9b9.patch @@ -1,4 +1,4 @@ -From cc60ad1599bf8e2d9f929a0b8992c37e28b4ea53 Mon Sep 17 00:00:00 2001 +From 24592f3fbd65cf39e89d333f5176aea829aefc1f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 Subject: [PATCH 01/90] videoplayer: adapt lateness detection and dropping to @@ -582,7 +582,7 @@ index f8ad541..186e271 100644 1.8.5.1 -From 2dd1839dcf214943deb30c57ed7f31011f13886c Mon Sep 17 00:00:00 2001 +From e53738b30c0505d02cd748862d4b4df22d815e69 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 Subject: [PATCH 02/90] video player: present correct pts to user for a/v sync @@ -653,7 +653,7 @@ index 186e271..59c7f09 100644 1.8.5.1 -From 8ce634fcf620e03e689af7f995f8a1c4f69d783b Mon Sep 17 00:00:00 2001 +From 6615f14d24c86f4ffdf3cc9a885e675921b55ac4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 Subject: [PATCH 03/90] videoplayer: some rework and documentation @@ -767,7 +767,7 @@ index 4c3d0e8..7f6de3c 100644 1.8.5.1 -From 57c8d83f7dc8300037f2fbea8de72aa42cbe9700 Mon Sep 17 00:00:00 2001 +From 5db5f14c8e9732174580db0d088e53d02b2223af Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 Subject: [PATCH 04/90] renderer: bump buffers to 5 @@ -793,7 +793,7 @@ index 5a21fec..c131dd1 100644 1.8.5.1 -From ffbe058b1e9863f85b1a1a5746e2f0c6f95c7c97 Mon Sep 17 00:00:00 2001 +From a930387a334734aa7e206673576bb4b285d496d6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 Subject: [PATCH 05/90] videoplayer: update frametime, it might change due to @@ -820,7 +820,7 @@ index 7f6de3c..699a10a 100644 1.8.5.1 -From f3c3524370488a8b4241cb012f737d1803e24c9b Mon Sep 17 00:00:00 2001 +From 745a1468704148868fce3de8bfe669e224fad325 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 Subject: [PATCH 06/90] videoplayer: give streams with invalid fps a chance for @@ -847,7 +847,7 @@ index 699a10a..9d1a920 100644 1.8.5.1 -From 175fc6248ee9d1973dc41565c9331caf14fa4869 Mon Sep 17 00:00:00 2001 +From 2c9244d653b58d8fc26a76586f64dc027ef99e0a Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 Subject: [PATCH 07/90] dvdplayer: allow rewinding at end of stream, do a seek @@ -887,7 +887,7 @@ index a698b8f..a845c7e 100644 1.8.5.1 -From 9746105ce58566a8c98c4508e5d336d17e180697 Mon Sep 17 00:00:00 2001 +From b8c6c6eac810e27016811f308848931163355ad1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 Subject: [PATCH 08/90] X11: ditch SDL for video and window events @@ -2427,7 +2427,7 @@ index b1464d0..34b912f 100644 1.8.5.1 -From 09ca4434e809ffd55323ec19dc5e9cb229108bf4 Mon Sep 17 00:00:00 2001 +From cc20b7067548448a0871322d8aa57cfdbbc23e73 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 Subject: [PATCH 09/90] X11: Add xbmc icon @@ -2620,7 +2620,7 @@ index 34b912f..352e90e 100644 1.8.5.1 -From 1038908ae98b142dbb91d6eef54b9893196650ce Mon Sep 17 00:00:00 2001 +From 0b4532f02fe51adf2d61ca5ef912b81b6a983b67 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 Subject: [PATCH 10/90] X11: add SDL joystick until we have a better solution @@ -2677,7 +2677,7 @@ index ad58aad..6f57a87 100644 1.8.5.1 -From 57c812481d9b5b198bda281f8321e3710ca7c96b Mon Sep 17 00:00:00 2001 +From 16cbb53a9afd1c78c11e54720dd56e8721fcd8d8 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 Subject: [PATCH 11/90] X11: factor out code handling device reset notification @@ -2743,7 +2743,7 @@ index 352e90e..3f91b9b 100644 1.8.5.1 -From b1870ecdcf66cca195218db4a78f56f144d33463 Mon Sep 17 00:00:00 2001 +From ba1f475963878c21ab85c6534e0bf9d90b1b6e1f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 Subject: [PATCH 12/90] X11: move xrandr events to WinEventsX11 @@ -2890,7 +2890,7 @@ index 304dac8..16b13aa 100644 1.8.5.1 -From b1fe49b49b40ed974f6c11c2b1db92fe7f2684bf Mon Sep 17 00:00:00 2001 +From dd8a6126089ab97a632614b83e8dfa01af66ef1d Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 Subject: [PATCH 13/90] xrandr: remove method RestoreState @@ -2972,7 +2972,7 @@ index 0aec487..00b49dc 100644 1.8.5.1 -From c9f772bf89e05969b347d1410ce2b94b4af417e8 Mon Sep 17 00:00:00 2001 +From 71a4051ceafefaf2b017fa0d2e6cae48d828cc96 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 Subject: [PATCH 14/90] xrandr: observe orientation @@ -3190,7 +3190,7 @@ index 00b49dc..508604d 100644 1.8.5.1 -From 33f4a8a9797d9bf1c79391d74e9cba91ed56818a Mon Sep 17 00:00:00 2001 +From 60eafb7be8d81765eb7d4c6cddd5d1bea5c09a72 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 Subject: [PATCH 15/90] xrandr: allow getting info for multiple screen's @@ -3368,7 +3368,7 @@ index 508604d..d37838a 100644 1.8.5.1 -From 5fd7a0899667fc2c3ac619c3d1681dce67360546 Mon Sep 17 00:00:00 2001 +From edb6bec9f527c1ee329bc9b5fa411e8e1001df8c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 Subject: [PATCH 16/90] X11: fix multi-head setups @@ -3386,7 +3386,7 @@ Subject: [PATCH 16/90] X11: fix multi-head setups 9 files changed, 227 insertions(+), 113 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 80c02aa..092e909 100755 +index 1c391f0..0c8f3fc 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1019,7 +1019,9 @@ msgctxt "#245" @@ -3401,10 +3401,10 @@ index 80c02aa..092e909 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 799fe16..d447268 100644 +index 8168282..c942022 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2054,6 +2054,15 @@ +@@ -2067,6 +2067,15 @@
@@ -3420,7 +3420,7 @@ index 799fe16..d447268 100644 0 0 -@@ -2075,6 +2084,7 @@ +@@ -2088,6 +2097,7 @@ -1 @@ -3428,7 +3428,7 @@ index 799fe16..d447268 100644 -@@ -2092,6 +2102,7 @@ +@@ -2105,6 +2115,7 @@ -1 @@ -4130,7 +4130,7 @@ index 4175aab..94584ab 100644 1.8.5.1 -From eb01dad48070908970fe2ff93e891e6fd9c0e63a Mon Sep 17 00:00:00 2001 +From 3d06c2ad91484062c27442e36277e2946debb5e3 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 Subject: [PATCH 17/90] X11: remove all DefaultScreen and RootWindow macros @@ -4201,7 +4201,7 @@ index 6383754..21e7dc5 100644 1.8.5.1 -From 2c0cc098e1383080b89b2a88c9e2700fdc56d75e Mon Sep 17 00:00:00 2001 +From 9068a69c5dca6c9f48497afba9536df2b486f649 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 Subject: [PATCH 18/90] X11: remove all DefaultScreen and RootWindow macros @@ -4276,7 +4276,7 @@ index 0b3950a..ca43b5a 100644 1.8.5.1 -From 2991af5fb9e9c4759cdd70aed66f4883ee57304b Mon Sep 17 00:00:00 2001 +From 1f827d223dcc8b11ea19a0f1b754f26a2db86e64 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 Subject: [PATCH 19/90] X11: recreate gl context after output has changed @@ -4430,7 +4430,7 @@ index 21e7dc5..8e68d5d 100644 1.8.5.1 -From 545132b296c61f81e5c0a67ea3f69b1ac55275e0 Mon Sep 17 00:00:00 2001 +From 4a7bf50922fcfd2a349d4f50f52b9bd1828cd1ca Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 Subject: [PATCH 20/90] X11: hook video reference clock in windowing @@ -4638,7 +4638,7 @@ index dd65a1b..afd71fc 100644 1.8.5.1 -From 527e1ce12c984e78e3761fff623df1354864498e Mon Sep 17 00:00:00 2001 +From a83c19d317c47e11d94d7705d48793d320b0f28e Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 Subject: [PATCH 21/90] X11: fix video calibrations @@ -4733,7 +4733,7 @@ index 9666cc3..5b52d6c 100644 1.8.5.1 -From ee0ebdb914e9688ce91099ec11789b52706aaffe Mon Sep 17 00:00:00 2001 +From 8268631f4ee07cdc08c5225487efe3ba2a30ba2f Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 Subject: [PATCH 22/90] X11: deactivate screen saver on startup @@ -4806,7 +4806,7 @@ index 5b52d6c..b2bd5a0 100644 1.8.5.1 -From 50a5c52df7db2eb9f1e4ef301c8c27a674fe53d4 Mon Sep 17 00:00:00 2001 +From b6b5356d8e0ee94ac975d89b9da33ee555942312 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 Subject: [PATCH 23/90] X11: change method of going full-screen @@ -4853,7 +4853,7 @@ index b76b229..869baa8 100644 1.8.5.1 -From 900a2f80c02052643c9119fdba1a37aed0d1b13f Mon Sep 17 00:00:00 2001 +From d5c29f6c17f4c8af16f94e2edb6220493194f155 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 Subject: [PATCH 24/90] X11: reset key repeat and key modifier on focus lost @@ -4888,7 +4888,7 @@ index d98f12f..743aca9 100644 1.8.5.1 -From a7d520d411c29307d9f81aaa69ebdba2ab69bfce Mon Sep 17 00:00:00 2001 +From f64d20fd9758be91f03b6392864176185e92c919 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 Subject: [PATCH 25/90] X11: replace custom utf8 to unicode with charset @@ -5108,7 +5108,7 @@ index a412f32..9a8a912 100644 1.8.5.1 -From 5c2facf469cc09d6520b719fd61010c7b3a1527e Mon Sep 17 00:00:00 2001 +From a76e0054995e838e1eb1880127d2c7e467d8f0c3 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 Subject: [PATCH 26/90] X11: fixed invalid usage of sizeof() (squash into x11 @@ -5175,7 +5175,7 @@ index 9a8a912..c69169c 100644 1.8.5.1 -From 28a4ccf215b2247cbc175bd66b1ca2414ecae7e8 Mon Sep 17 00:00:00 2001 +From 949285f58f21f975fe867d277004fe42828bc389 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 Subject: [PATCH 27/90] add missing keys to xbmc keytable @@ -5201,7 +5201,7 @@ index d57f4d3..b807897 100644 1.8.5.1 -From eefa892601e780e38d6f6590718fc459ababcc9a Mon Sep 17 00:00:00 2001 +From be9cc25c82711ee3809766240a8a3b28cda9f7de Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 Subject: [PATCH 28/90] videorefclock: temp deactivate of nv settings @@ -5227,7 +5227,7 @@ index 0ddf102..3ae7107 100644 1.8.5.1 -From a84af1a050e80c1e7ab65d5eb80a74caaef473aa Mon Sep 17 00:00:00 2001 +From 0f056bdb6f278097d78f7481c49f0a528f5c7608 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 Subject: [PATCH 29/90] videorefclock: ask graphics context for refresh rate @@ -5261,7 +5261,7 @@ index 3ae7107..27bebde 100644 1.8.5.1 -From 668b52790b8ef7c4bf8ac7db931b0ef3251814cb Mon Sep 17 00:00:00 2001 +From 65e0cc47e6a127aab6c0ddcd9c4d557584bbc621 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 Subject: [PATCH 30/90] X11: fix icon texture after @@ -5372,7 +5372,7 @@ index 869baa8..bfe3797 100644 1.8.5.1 -From 3827cbc3ff50ee67cb7c925108da9634c6a2610d Mon Sep 17 00:00:00 2001 +From aed5bb5a8c312f685130ec3f82bd8f410ec8fc68 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 Subject: [PATCH 31/90] X11: check for window manager @@ -5496,7 +5496,7 @@ index b2bd5a0..3e62cd8 100644 1.8.5.1 -From b0a2f65223b7d91a0db1c10f3969a2d6cfd868ce Mon Sep 17 00:00:00 2001 +From 317cd32960a30f9b3513edd91a8c9d9476a4ec03 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 Subject: [PATCH 32/90] X11: dont set window on xrandr if no mode available @@ -5536,7 +5536,7 @@ index af82061..4f33c68 100644 1.8.5.1 -From a61c5b92bbf6895d810d6b453cd1009e05c5e475 Mon Sep 17 00:00:00 2001 +From 08d7410875489edee825cf3ac94b8233c4f5f52c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 Subject: [PATCH 33/90] X11: fix crash after a resolution change on startup @@ -5563,7 +5563,7 @@ index 4f33c68..bc4e963 100644 1.8.5.1 -From 77692fda9e58207995fe276d2c7b1d908f9a2d31 Mon Sep 17 00:00:00 2001 +From e41ee196dcbbcb55eff486d15a3d7aff7261b5aa Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 Subject: [PATCH 34/90] X11: lock graphics context in NotifyXRREvent @@ -5589,7 +5589,7 @@ index bc4e963..57a8d20 100644 1.8.5.1 -From 31582fccfaf8e878ae295d1ed24a21018deed7bc Mon Sep 17 00:00:00 2001 +From 52a382f011f58f35950b38c7823e18092a1fc6b0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 Subject: [PATCH 35/90] ffmpeg: add av_find_default_stream_index to interface @@ -5638,7 +5638,7 @@ index 0016c0b..3514856 100644 1.8.5.1 -From b94213f827a2ce103d456fbaa8f0cf1ab811b2dc Mon Sep 17 00:00:00 2001 +From e37d46be368c6940cd717587e3af4ae6710ce85f Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 Subject: [PATCH 36/90] dvdplayer: observe pts counter overflow @@ -5928,7 +5928,7 @@ index aef5ab1..35abbdf 100644 1.8.5.1 -From bc70000f9395ccf749e5f976e8aeb0ac3b823297 Mon Sep 17 00:00:00 2001 +From 9b0b3316f29fb8a7be77159b88082657eed6467d Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 Subject: [PATCH 37/90] dvdplayer: avoid short screen flicker caused by @@ -5964,7 +5964,7 @@ index 9d1a920..9880bdb 100644 1.8.5.1 -From 1e0c4331afd4a19c5018d3e079feb88c8d2300c1 Mon Sep 17 00:00:00 2001 +From 797a38995b45dd6d95eb15875ad2b44a8a6cd0aa Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 Subject: [PATCH 38/90] vdpau: advanced settings for auto deinterlacing @@ -5995,7 +5995,7 @@ index 277802f..3292461 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 06f40b1..d11fa02 100644 +index 6980cc7..efe1bed 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -165,6 +165,8 @@ void CAdvancedSettings::Initialize() @@ -6007,7 +6007,7 @@ index 06f40b1..d11fa02 100644 m_videoVDPAUtelecine = false; m_videoVDPAUdeintSkipChromaHD = false; m_DXVACheckCompatibility = false; -@@ -603,6 +605,8 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) +@@ -602,6 +604,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); @@ -6017,7 +6017,7 @@ index 06f40b1..d11fa02 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 7d16957..bb70f3e 100644 +index 88d2cde..0f0a24e 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -160,6 +160,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -6033,7 +6033,7 @@ index 7d16957..bb70f3e 100644 1.8.5.1 -From f9a2270e3a9448bde5e604eb7741ec99319a1323 Mon Sep 17 00:00:00 2001 +From 7abe03bc02e60907156d35b919115852db32ebaf Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 Subject: [PATCH 39/90] player: fix rewind @@ -6251,7 +6251,7 @@ index 59c7f09..65dea76 100644 1.8.5.1 -From 992caf7be29e5f479b5b483a06d31013a91c4b75 Mon Sep 17 00:00:00 2001 +From e5bfcf319482954baa9f90f22a23b04919874276 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 Subject: [PATCH 40/90] xrandr: fix query for multiple screens @@ -6295,7 +6295,7 @@ index 4685413..e610150 100644 1.8.5.1 -From 559b87adb5487142e0c261d9bc4d38f17a914aef Mon Sep 17 00:00:00 2001 +From c18799ec45038e62b99f09ebccd54783f00c6fef Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 Subject: [PATCH 41/90] X11: add debug log to print out refresh after xrr event @@ -6325,7 +6325,7 @@ index 57a8d20..a237dc0 100644 1.8.5.1 -From 6b6c4c0f213ea4325e07ba6329c98f6b5cb8353d Mon Sep 17 00:00:00 2001 +From 968cc2a4fdbf7bf705fdce3dbf2c785004a7aea1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 Subject: [PATCH 42/90] X11: dont call XCloseDisplay on shutdown, it crashes @@ -6353,7 +6353,7 @@ index a237dc0..ab660b1 100644 1.8.5.1 -From 06f204882dbcf6a11a0d67e3dded950faf45f1cd Mon Sep 17 00:00:00 2001 +From 78c202f2aacc84714032c702c7be32fabf89ee09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 Subject: [PATCH 43/90] x11: support for multiple x screens @@ -6379,7 +6379,7 @@ index e610150..5c53574 100644 1.8.5.1 -From 5ded13e5b544bd39ccd627292f9910dba6db3b8a Mon Sep 17 00:00:00 2001 +From d4b3c981e066b88587e0ba3f90380480d2996834 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 Subject: [PATCH 44/90] pvr: increase changes counter of stream on stream @@ -6416,7 +6416,7 @@ index e5f8234..96c9e89 100644 1.8.5.1 -From 82cba9f3f4061874803f837e25b2a6f1835c8d8c Mon Sep 17 00:00:00 2001 +From 7988e181ecfba7bc299887f124348511dc8ac6a5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 Subject: [PATCH 45/90] X11: add keymapping for XF86XK_Sleep @@ -6441,7 +6441,7 @@ index a62521f..263cb5a 100644 1.8.5.1 -From 8bfc2f3cc1652d8734219d314398bd2f361d7097 Mon Sep 17 00:00:00 2001 +From 30340583a20eadbdab107cc59226ab89a8193161 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 Subject: [PATCH 46/90] X11: remove toggle full screen after resume @@ -6470,7 +6470,7 @@ index 590a887..35b5a21 100644 1.8.5.1 -From c1ac6f12b90b6f8efe56b2bd7e4b3ac93c76c46b Mon Sep 17 00:00:00 2001 +From 62738e234d581d0e0d470d2c8ccecadf769a82e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 Subject: [PATCH 47/90] xrandr: set screen on mode change command @@ -6496,7 +6496,7 @@ index 5c53574..4355ef7 100644 1.8.5.1 -From 4aee40ec675e47a41b404275473854628d37a92f Mon Sep 17 00:00:00 2001 +From 23902bc50ee2ee5f8377e88676700042ecb8e36c Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 Subject: [PATCH 48/90] X11: recreate glx context when output changes @@ -6550,7 +6550,7 @@ index 3e62cd8..2a1fb41 100644 1.8.5.1 -From a9cdf8c2d2ca4c72f057f4deddb47be76141c012 Mon Sep 17 00:00:00 2001 +From e4cd314a94e46ef500ce19d3b2a6be70f183efb4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 Subject: [PATCH 49/90] pvr: do not show selection dialog for a single menu @@ -6591,7 +6591,7 @@ index 14c9cde..57b18a5 100644 1.8.5.1 -From b2775b08807d687ec997e2cf27ab0efa319e2dfd Mon Sep 17 00:00:00 2001 +From 33d5eb66824afda9bf4c6f17322aac53e5c5a31f Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 Subject: [PATCH 50/90] X11: use default screen parameters if no output @@ -6698,7 +6698,7 @@ index 4329a22..2adf8a0 100644 1.8.5.1 -From f45f1462058dee07de75f6fabe71ddf53cedeff4 Mon Sep 17 00:00:00 2001 +From 0e21994cb45758ff47b4c43d110ba3543fd74df3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 Subject: [PATCH 51/90] X11: create parent window @@ -6967,7 +6967,7 @@ index 2a1fb41..e8993f1 100644 1.8.5.1 -From f82996b5fa3c3cbc250e4e0bec22be4c924246c3 Mon Sep 17 00:00:00 2001 +From b7614099a9b3b74d404e6c989c50e7189dc27d2c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 Subject: [PATCH 52/90] X11: use system key repeat rate instead of hardcoded @@ -7172,7 +7172,7 @@ index c69169c..6429291 100644 1.8.5.1 -From 5cce4a216899639aba5704a7a8c4d7802991198f Mon Sep 17 00:00:00 2001 +From 60cc0c4ff96182568d9bbfa4823fadfc517bbc3b Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 Subject: [PATCH 53/90] linux: use CLOCK_MONOTONIC_RAW as this is not subject @@ -7213,7 +7213,7 @@ index c06b8c5..4390d2e 100644 1.8.5.1 -From c772efa2a43ceb40adf8adac9bae8cf1ffcefb5a Mon Sep 17 00:00:00 2001 +From 3e109b19d0ae881366938a674d2d2e7a2c7bc789 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 Subject: [PATCH 54/90] OMXPlayer: some caching fixes for pvr @@ -7240,7 +7240,7 @@ index 9cccaac..4168195 100644 1.8.5.1 -From 9ea2cf8a1f85ba5ae5d41ec6e49f85f0d59bdc8b Mon Sep 17 00:00:00 2001 +From f34ea1f3d74e0641f011e7c3746254b563480f55 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 Subject: [PATCH 55/90] fix incorrect display of fps when dr kicks in @@ -7270,7 +7270,7 @@ index 1aa5e0f..1f04f7e 100644 1.8.5.1 -From 8723d7dc12e385d5e4d926ff1e40ba46d0c7f096 Mon Sep 17 00:00:00 2001 +From ed4b5ab98f24ed626737d1f3a26e5f7ef0c66461 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 Subject: [PATCH 56/90] X11: fix mouse coverage @@ -7339,7 +7339,7 @@ index e8993f1..5cccfb7 100644 1.8.5.1 -From cee10a23b3ec6642d4713bb1bc14fc3e89af7930 Mon Sep 17 00:00:00 2001 +From bf23611d168952e56c6405181ee8d7328c37cf2c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 Subject: [PATCH 57/90] X11: fix incorrectly used screen num in desktop @@ -7377,7 +7377,7 @@ index 2acb36d..101ba98 100644 1.8.5.1 -From 7f0b0faf60bd5d7b197537f46ab182d04b576e43 Mon Sep 17 00:00:00 2001 +From b489c94c45203e47ad88b4fcf72ab43e16d0a2dc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 Subject: [PATCH 58/90] X11: do not overwrite user selected monitor with @@ -7505,7 +7505,7 @@ index 5cccfb7..1b658e2 100644 1.8.5.1 -From 6b0b5083be835698fab7abfe7638945803341fa6 Mon Sep 17 00:00:00 2001 +From 0bc5eaa8d1f3872f91b3a23d44e0f3af80bdccfe Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 Subject: [PATCH 59/90] xrandr: add turn on/off to wrapper @@ -7674,7 +7674,7 @@ index d37838a..059062f 100644 1.8.5.1 -From 6b9b5f7d29aa419c7db9646cae3b2ff2c7b97ddd Mon Sep 17 00:00:00 2001 +From ea07b3b211dfa1a60db9b7c5fdf9bf61358a753b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 Subject: [PATCH 60/90] xrandr: add GetPreferredMode to wrapper @@ -7734,7 +7734,7 @@ index 059062f..ab7cc63 100644 1.8.5.1 -From a3ef9716e59322c4bba854a72230a15dc9e24551 Mon Sep 17 00:00:00 2001 +From 4c9eb7d258bf9cbfd68cbcef93eff0d70fb51bba Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 Subject: [PATCH 61/90] X11: multi-head improvement - poll for desired output @@ -7752,7 +7752,7 @@ Subject: [PATCH 61/90] X11: multi-head improvement - poll for desired output 8 files changed, 105 insertions(+), 12 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 092e909..f142362 100755 +index 0c8f3fc..e37b543 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6464,7 +6464,7 @@ msgctxt "#14071" @@ -7779,10 +7779,10 @@ index 092e909..f142362 100755 #: xbmc/video/VideoDatabase.cpp msgctxt "#15012" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index d447268..75e1e23 100644 +index c942022..52164de 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2063,6 +2063,11 @@ +@@ -2076,6 +2076,11 @@ @@ -7794,7 +7794,7 @@ index d447268..75e1e23 100644 0 0 -@@ -2115,6 +2120,7 @@ +@@ -2128,6 +2133,7 @@ @@ -8018,7 +8018,7 @@ index 62003f5..8525ede 100644 1.8.5.1 -From 4084254ea30fdc7ab825ba63b52e9c21e1b8f020 Mon Sep 17 00:00:00 2001 +From 8c771dd67da94ca6af616887747b2544b9e19ee9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 Subject: [PATCH 62/90] X11: ignore mouse move event form other windows @@ -8053,7 +8053,7 @@ index 908c8b6..938ad26 100644 1.8.5.1 -From 8dc93fe587d548467a62e6d974457dd0807acced Mon Sep 17 00:00:00 2001 +From e621fb6da4d79ec9938632bf37c386d43b0ed47b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 Subject: [PATCH 63/90] renderer: allow some lateness within vblank interval @@ -8116,7 +8116,7 @@ index 949c652b..d84ff6c 100644 1.8.5.1 -From 732426ec8aa649e06aef555f0772f271f59291f8 Mon Sep 17 00:00:00 2001 +From bbe4389f41ccb394fcf038450fea77d2998814ab Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 Subject: [PATCH 64/90] X11: another fix for mouse coverage @@ -8152,7 +8152,7 @@ index 938ad26..e4ca56d 100644 1.8.5.1 -From f2a385149b90045927c918adac2ebbdbb0e0093c Mon Sep 17 00:00:00 2001 +From cdc2f2c9b610c765fbb43618677f5b94d92c337e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 Subject: [PATCH 65/90] X11: set windows class name @@ -8197,7 +8197,7 @@ index b3fe5102..df5fe9b 100644 1.8.5.1 -From 8f8b67df7738cceaf5731436968e5c33395cd780 Mon Sep 17 00:00:00 2001 +From a7c7b381e34c6bdee86f90933a2d312cc8a9a516 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 Subject: [PATCH 66/90] fixed: typo @@ -8207,7 +8207,7 @@ Subject: [PATCH 66/90] fixed: typo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/English/strings.po b/language/English/strings.po -index f142362..2371a62 100755 +index e37b543..0f7d4d8 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6598,7 +6598,7 @@ msgstr "" @@ -8223,7 +8223,7 @@ index f142362..2371a62 100755 1.8.5.1 -From 267f2ceb88feb17b834967e9694d73c0a9de6134 Mon Sep 17 00:00:00 2001 +From 81da99425aa1be448b0bf1fe7db1f1fd159a39b6 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 Subject: [PATCH 67/90] ActiveAE: slightly reduce buffer size @@ -8233,7 +8233,7 @@ Subject: [PATCH 67/90] ActiveAE: slightly reduce buffer size 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 843321f..037e50d 100644 +index 1a05cdb..76ade09 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8251,7 +8251,7 @@ index 843321f..037e50d 100644 1.8.5.1 -From 14aec36042dc758d2a2bc6c6c23bd8392e27e873 Mon Sep 17 00:00:00 2001 +From 842b13f6890fc69aad8923bcc5e37c505aebfd02 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 Subject: [PATCH 68/90] Revert "vdpau: comment some features that will be added @@ -8310,7 +8310,7 @@ index 3292461..c04f161 100644 1.8.5.1 -From 30175b0437ee8964a65f59e5960af9a2f0e87dfa Mon Sep 17 00:00:00 2001 +From f3a46fb8a624053a475db86d23408f77b8358dad Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 Subject: [PATCH 69/90] X11: fix keysyms @@ -8336,7 +8336,7 @@ index e4ca56d..b20130c 100644 1.8.5.1 -From cf9387053e7ad979bc4ca06cb7371f750dbbe59e Mon Sep 17 00:00:00 2001 +From b83e40a86eb6779e7eb36fe8392241bfcb52e5a5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 Subject: [PATCH 70/90] X11: fix keysym for non-IM @@ -8362,7 +8362,7 @@ index b20130c..a38890c 100644 1.8.5.1 -From a0f7382461877ed5bf46776ab47103d0fc2d2a84 Mon Sep 17 00:00:00 2001 +From 26dd7261956f82ff7427fb50acab001209362ae0 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 Subject: [PATCH 71/90] add some missing multi media keys @@ -8420,7 +8420,7 @@ index ee6bb69..364b45a 100644 1.8.5.1 -From ed3b41943815121859025443a7b28c3f20b82493 Mon Sep 17 00:00:00 2001 +From bc09b9c0c458b8760d1a840741b1e58b12262bdb Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 Subject: [PATCH 72/90] X11: squash multi @@ -8446,7 +8446,7 @@ index df5fe9b..d8e04d6 100644 1.8.5.1 -From 15fe4f0a4274e680853028d5d1291c50bc45b3ab Mon Sep 17 00:00:00 2001 +From c17028082c85062d378b8908a1b2518f09cc8932 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 Subject: [PATCH 73/90] X11: do not poll default monitor @@ -8472,7 +8472,7 @@ index d8e04d6..01f5272 100644 1.8.5.1 -From a52013d32501b9ae27aff73b63f14fcfead2b488 Mon Sep 17 00:00:00 2001 +From 091c743ee3b3ac8deb0518cadf4015209a7380c5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 Subject: [PATCH 74/90] X11: fix broken monitor switching @@ -8483,10 +8483,10 @@ Subject: [PATCH 74/90] X11: fix broken monitor switching 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 75e1e23..4a969ab 100644 +index 52164de..0af2826 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2107,7 +2107,6 @@ +@@ -2120,7 +2120,6 @@ -1 @@ -8578,7 +8578,7 @@ index 40bc3b3..1663836 100644 1.8.5.1 -From 7e650e8543858cf024d757875b7b7a050e3da74b Mon Sep 17 00:00:00 2001 +From 046f8d70c4023960b70488bb4b5d9d299a4757c3 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 Subject: [PATCH 75/90] X11: remove polling for connected outputs, use xrr @@ -8882,7 +8882,7 @@ index 7ec5be4..14622cb 100644 1.8.5.1 -From 002f2b9460307b456c83a130310c6e78545ef22f Mon Sep 17 00:00:00 2001 +From 9cb6fbb70e4083aba4683398c295bc913b4f4e2a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 Subject: [PATCH 76/90] X11: remove grabbing of keyboard and mouse @@ -9003,7 +9003,7 @@ index 14622cb..d1c8729 100644 1.8.5.1 -From a47c2e5525273538f689ea576de0e4b7ba3261e6 Mon Sep 17 00:00:00 2001 +From ae37df8068f82c8b439e8f5d996c06e90ecd2bc1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 Subject: [PATCH 77/90] X11: set ExposureMask on gl window, fixes not updated @@ -9032,7 +9032,7 @@ index 695b352..e55583c 100644 1.8.5.1 -From f0f4564dd6311d7fa2219184d9ca93dede507d3d Mon Sep 17 00:00:00 2001 +From 4a42945269e9c8a72ad9307e09b7969c51abbdfd Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 Subject: [PATCH 78/90] X11: drop shortcuts, have WM do this @@ -9097,7 +9097,7 @@ index 6429291..4334d21 100644 1.8.5.1 -From 75d96fa30505779285fb4ad6111c9bba3ff943e3 Mon Sep 17 00:00:00 2001 +From c23e578c7ec7f7ca1bfd2dd75b4b78a01c8db494 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 7 Nov 2013 15:02:00 +0100 Subject: [PATCH 79/90] X11: adapt to new settings @@ -9107,10 +9107,10 @@ Subject: [PATCH 79/90] X11: adapt to new settings 1 file changed, 1 insertion(+) diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 4a969ab..d2df28d 100644 +index 0af2826..87f4018 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml -@@ -2067,6 +2067,7 @@ +@@ -2080,6 +2080,7 @@ HAS_GLX 0 false @@ -9122,7 +9122,7 @@ index 4a969ab..d2df28d 100644 1.8.5.1 -From cdd9e5706d0769273508e43c2a0ee52f452b5452 Mon Sep 17 00:00:00 2001 +From 04108f6c5aa93b641436219c6d2d7cc4c32b52c8 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 09:28:24 +0100 Subject: [PATCH 80/90] X11: adapt to changes in cstdstring @@ -9173,7 +9173,7 @@ index 8525ede..c94f2e3 100644 1.8.5.1 -From c81a823b3a9e04eb7f811e262a124b3ef31a6a8e Mon Sep 17 00:00:00 2001 +From d8c3a034087e33e6fdf73263feec2a2fd3e0cd75 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 18:50:57 +0100 Subject: [PATCH 81/90] dvdplayer: fix failed to get stream message, lookup @@ -9200,7 +9200,7 @@ index ad851e9..60475a3 100644 1.8.5.1 -From 6d557af281e1aeb31f32797c7e69cf6f0b53c3d6 Mon Sep 17 00:00:00 2001 +From 19fca107462764a06bce2b6f8420da6cb3017219 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 19:22:01 +0100 Subject: [PATCH 82/90] omxplayer: fix failed to get stream message @@ -9226,7 +9226,7 @@ index 4168195..f48a30f 100644 1.8.5.1 -From 37defa9d4b6e6c5cf209bb667b01c8a0786869c6 Mon Sep 17 00:00:00 2001 +From 50d0fca3aa08a39084d21358bde8409470b348ac Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Mon, 18 Nov 2013 17:44:31 +0100 Subject: [PATCH 83/90] ActiveAE: correct time of buffered samples by resample @@ -9238,10 +9238,10 @@ Subject: [PATCH 83/90] ActiveAE: correct time of buffered samples by resample 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -index 037e50d..42a4b78 100644 +index 76ade09..716cc5b 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp -@@ -103,7 +103,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) +@@ -101,7 +101,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream) if (delay < 0) delay = 0.0; @@ -9266,7 +9266,7 @@ index 4a75f9e..78a2892 100644 1.8.5.1 -From 8d979f3ca3a59c76ae0a492d6be70e501d98990f Mon Sep 17 00:00:00 2001 +From 4461e323ee97c6622ef12ae24192f3d3497cc4d7 Mon Sep 17 00:00:00 2001 From: Marcel Groothuis Date: Thu, 5 Dec 2013 22:02:50 +0100 Subject: [PATCH 84/90] ffmpeg demuxer: faster channel change for PVR addons @@ -9630,7 +9630,7 @@ index ca689d0..f383563 100644 1.8.5.1 -From d970a5969848922b22a55fca007ff5242011f281 Mon Sep 17 00:00:00 2001 +From dade96a4ed607310cb8dfded523f86f821b49cd4 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 14 Nov 2013 20:35:04 +0100 Subject: [PATCH 85/90] ffmpeg demuxer: make sure we start mpegts video with an @@ -9717,7 +9717,7 @@ index acde9a8..9ec0877 100644 1.8.5.1 -From 2f97ac1eae87c1c0cf1ac3b2df32949f8bdacf93 Mon Sep 17 00:00:00 2001 +From 844ba26c952996370543d38ae3d447e4aa3ae6b3 Mon Sep 17 00:00:00 2001 From: Wolfgang Haupt Date: Thu, 5 Dec 2013 22:11:57 +0100 Subject: [PATCH 86/90] DVDFactoryDemuxer: skip streaminfo for udp tcp and @@ -9844,7 +9844,7 @@ index 146bf5c..e030b9d 100644 1.8.5.1 -From 10840c6ffb3580cf390f5e9a30258d9e7b31b30c Mon Sep 17 00:00:00 2001 +From 38cb405a86d6760e5f6a30225bbd85cde283aa9f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 22 Dec 2013 14:52:29 +0100 Subject: [PATCH 87/90] linux: add shared lib for sse4 operations @@ -9888,7 +9888,7 @@ index 76936d4..0890432 100644 externals: codecs libs visualizations screensavers libaddon pvraddons diff --git a/configure.in b/configure.in -index f277cac..74ed562 100644 +index 2fe5f93..96d0c30 100644 --- a/configure.in +++ b/configure.in @@ -875,6 +875,19 @@ elif test "$use_arch" = "arm"; then @@ -9911,7 +9911,7 @@ index f277cac..74ed562 100644 # Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_CHOWN -@@ -2575,6 +2588,10 @@ if test "$use_codec_libstagefright" = "yes"; then +@@ -2578,6 +2591,10 @@ if test "$use_codec_libstagefright" = "yes"; then OUTPUT_FILES="$OUTPUT_FILES xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile" fi @@ -9922,7 +9922,7 @@ index f277cac..74ed562 100644 OUTPUT_FILES="$OUTPUT_FILES \ xbmc/interfaces/python/Makefile \ xbmc/interfaces/python/test/Makefile" -@@ -2649,6 +2666,7 @@ AC_SUBST(USE_ANDROID) +@@ -2652,6 +2669,7 @@ AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) @@ -10142,7 +10142,7 @@ index 0000000..45aa826 1.8.5.1 -From 6c96b06b6c4f5da2f2d5a68c9cd2a430f420e842 Mon Sep 17 00:00:00 2001 +From effc1304680e2c6f26661e2fe4a42d84e1208c60 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 19 Dec 2013 15:36:11 +0100 Subject: [PATCH 88/90] vaapi: option to enable sw filters @@ -10161,7 +10161,7 @@ Subject: [PATCH 88/90] vaapi: option to enable sw filters 10 files changed, 274 insertions(+), 41 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 2371a62..80165e4 100755 +index 0f7d4d8..0b67f51 100755 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -6001,7 +6001,12 @@ msgctxt "#13440" @@ -10178,29 +10178,29 @@ index 2371a62..80165e4 100755 #: system/settings/settings.xml msgctxt "#13500" -@@ -14710,7 +14715,12 @@ msgctxt "#36423" - msgid "Use ffmpeg frame multiple thread decoding when hardware decoding not working or disabled. (less reliable than default single thread mode)" +@@ -14735,7 +14740,12 @@ msgctxt "#36428" + msgid "Record" msgstr "" --#empty strings from id 36424 to 36499 +-#empty strings from id 36429 to 36499 +#: system/settings/settings.xml -+msgctxt "#36424" ++msgctxt "#36429" +msgid "This option enables the deinterlacing methods available for software decoding. It gives the possiblity to use high quality deinterlacers in combination with VAAPI." +msgstr "" + -+#empty strings from id 36425 to 36499 ++#empty strings from id 36430 to 36499 #end reservation #: system/settings/settings.xml diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index d2df28d..af8032f 100644 +index 87f4018..706cf56 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -436,6 +436,15 @@ true -+ ++ + HAVE_LIBVA + + true @@ -10798,45 +10798,17 @@ index 65dea76..e29c5cc 100644 1.8.5.1 -From 2e11188a7c78468a2bc2fd4649a0a5833c3417f7 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sat, 28 Dec 2013 15:44:35 +0100 -Subject: [PATCH 89/90] dvdpalyer audio: fix delivering the packet in wrong - format - ---- - xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp -index 69992cc..9e31d6c 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp -@@ -117,6 +117,9 @@ bool CDVDAudioCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options - m_pFrame1 = m_dllAvCodec.avcodec_alloc_frame(); - m_bOpenedCodec = true; - m_iSampleFormat = AV_SAMPLE_FMT_NONE; -+ -+ // check if conversion is needed -+ GetDataFormat(); - return true; - } - --- -1.8.5.1 - - -From 77202cc3a62194935976f4f336f5922274dad250 Mon Sep 17 00:00:00 2001 +From f79746a67c55e4b8d8eac1e6a43539fa991a59d9 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 28 Dec 2013 11:05:02 +0100 -Subject: [PATCH 90/90] VAAPI: Also try to enable sse4 on normal x86 arch +Subject: [PATCH 89/90] VAAPI: Also try to enable sse4 on normal x86 arch --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 74ed562..7e7cafa 100644 +index 96d0c30..4756e82 100644 --- a/configure.in +++ b/configure.in @@ -876,7 +876,7 @@ elif test "$use_arch" = "arm"; then @@ -10851,3 +10823,51 @@ index 74ed562..7e7cafa 100644 -- 1.8.5.1 + +From bca1dab4489a10eeb9ab682ff2bb21f8a90bd6d1 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Fri, 3 Jan 2014 20:50:46 +0100 +Subject: [PATCH 90/90] X11: check for user output on resize window + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 9962f08..c95f4ec 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -167,7 +167,20 @@ bool CWinSystemX11::DestroyWindow() + bool CWinSystemX11::ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) + { + m_userOutput = CSettings::Get().GetString("videoscreen.monitor"); +- if (m_userOutput.compare("Default") == 0) ++ XOutput *out = NULL; ++ if (m_userOutput.compare("Default") != 0) ++ { ++ out = g_xrandr.GetOutput(m_userOutput); ++ if (out) ++ { ++ XMode mode = g_xrandr.GetCurrentMode(m_userOutput); ++ if (!mode.isCurrent) ++ { ++ out = NULL; ++ } ++ } ++ } ++ if (!out) + { + std::vector outputs = g_xrandr.GetModes(); + if (outputs.size() > 0) +@@ -176,8 +189,6 @@ bool CWinSystemX11::ResizeWindow(int newWidth, int newHeight, int newLeft, int n + } + } + +- m_userOutput = g_xrandr.GetModes()[0].name; +- + if(m_nWidth == newWidth + && m_nHeight == newHeight + && m_userOutput.compare(m_currentOutput) == 0) +-- +1.8.5.1 +