diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 92b5474769..f4e7a2becb 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13.alpha-9f8d687" +PKG_VERSION="13.alpha-b58612c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index e34919de75..216da306a3 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13.alpha-9f8d687" +PKG_VERSION="13.alpha-b58612c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch index 7f7f6ecec1..2294243486 100644 --- a/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch +++ b/packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-81fd4d3.patch @@ -1,7 +1,7 @@ -From 54a044fb221073109f36f42dc18302987202cd02 Mon Sep 17 00:00:00 2001 +From 2ac04a9baa17dabb4f44ceffdeaf3c993f337dca Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 01/79] videoplayer: adapt lateness detection and dropping to +Subject: [PATCH 01/81] videoplayer: adapt lateness detection and dropping to buffering --- @@ -114,7 +114,7 @@ index c469795..949c652b 100644 double m_presenterr; double m_errorbuff[ERRORBUFFSIZE]; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h -index baee6e0..8a88c0d 100644 +index b78f779..794ddb6 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h @@ -123,6 +123,10 @@ struct DVDVideoUserData @@ -582,10 +582,10 @@ index f8ad541..186e271 100644 1.8.4 -From 89a773d12365d6e7f4dde3ef06cfb8cd0447360e Mon Sep 17 00:00:00 2001 +From 30c3cd738919887370c1bba15b51a4d47b38bc56 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 02/79] video player: present correct pts to user for a/v sync +Subject: [PATCH 02/81] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -653,10 +653,10 @@ index 186e271..59c7f09 100644 1.8.4 -From 9c5055c07c3606c2026fb4e95f7c738f82f772b6 Mon Sep 17 00:00:00 2001 +From 59c12e6ffe4c7e40f4bf644947a2b3727d451226 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Feb 2013 18:25:53 +0100 -Subject: [PATCH 03/79] videoplayer: some rework and documentation +Subject: [PATCH 03/81] videoplayer: some rework and documentation --- .../dvdplayer/DVDCodecs/Video/DVDVideoCodec.h | 29 ++++++++++++++++++++-- @@ -666,7 +666,7 @@ Subject: [PATCH 03/79] videoplayer: some rework and documentation 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h -index 8a88c0d..b898491 100644 +index 794ddb6..c9f9c98 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h @@ -145,7 +145,6 @@ struct DVDVideoUserData @@ -767,10 +767,10 @@ index 752a291..0aef5ee 100644 1.8.4 -From eb55770281207a2864f1bb83bef8b87af3b7be78 Mon Sep 17 00:00:00 2001 +From 98ec7969d1060fcca24bc3fd7c8bbb58fd6a7c6b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 1 Jun 2013 11:21:19 +0200 -Subject: [PATCH 04/79] renderer: bump buffers to 5 +Subject: [PATCH 04/81] renderer: bump buffers to 5 --- xbmc/cores/VideoRenderers/BaseRenderer.h | 2 +- @@ -793,10 +793,10 @@ index a61d3cf..df5fe0e 100644 1.8.4 -From 391e6905d0e8043ae27eebfdd19ca947a0d6d29a Mon Sep 17 00:00:00 2001 +From ae5b8a3f59c485af8fb04df3c5e36f05e6b0e7ca Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/79] videoplayer: update frametime, it might change due to +Subject: [PATCH 05/81] videoplayer: update frametime, it might change due to fps detection --- @@ -820,10 +820,10 @@ index 0aef5ee..e7e5097 100644 1.8.4 -From 8ddae454fd8ebff67192bbe58c3afda9865b49d9 Mon Sep 17 00:00:00 2001 +From 29b464c80c8afc2dfa461dfa35e77ec106fca7d6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/79] videoplayer: give streams with invalid fps a chance for +Subject: [PATCH 06/81] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -847,10 +847,10 @@ index e7e5097..c40d193 100644 1.8.4 -From 2d6788dce632ac58e5203b477c40da9600ae6e76 Mon Sep 17 00:00:00 2001 +From d1fc297c71baf2ffb2a53435b27245517ac9b9c4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/79] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 07/81] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -858,7 +858,7 @@ Subject: [PATCH 07/79] 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 ed11151..5c1b31e 100644 +index c2bbc82..f61b77a 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1548,7 +1548,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -887,10 +887,10 @@ index ed11151..5c1b31e 100644 1.8.4 -From 22aec370845072e477277452916f13e2f1a9df9f Mon Sep 17 00:00:00 2001 +From 7d41eda313c31c271bd3ab188b98ebd3b82627d8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 08/79] X11: ditch SDL for video and window events +Subject: [PATCH 08/81] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -906,7 +906,7 @@ Subject: [PATCH 08/79] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index c78b847..f62c9fa 100644 +index d5022e6..05af50e 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -856,7 +856,7 @@ bool CApplication::CreateGUI() @@ -2428,10 +2428,10 @@ index 2454fb1..f5e5731 100644 1.8.4 -From c9c2f0027ecabd6593b8c7fd5f7cffa0095be6c4 Mon Sep 17 00:00:00 2001 +From e8a8af3e809c9b1b2dfce52c3d7b7de3bbdce6bd Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 09/79] X11: Add xbmc icon +Subject: [PATCH 09/81] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 +++++++++++++++++++++++++++++++++++- @@ -2621,10 +2621,10 @@ index f5e5731..6953b68 100644 1.8.4 -From 1829af44c7d393f48cd82258c270db660e38bb92 Mon Sep 17 00:00:00 2001 +From 7db694dec38bd5286e0ad930a354d0b195d2cff7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 10/79] X11: add SDL joystick until we have a better solution +Subject: [PATCH 10/81] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -2678,10 +2678,10 @@ index ad58aad..6f57a87 100644 1.8.4 -From 08fb8df97e96dfbf8b78ea7fac651230b42748ca Mon Sep 17 00:00:00 2001 +From 65b5fac3841a63c792f7f0e66954d6cf0d2b0e84 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 11/79] X11: factor out code handling device reset notification +Subject: [PATCH 11/81] X11: factor out code handling device reset notification --- xbmc/windowing/X11/WinSystemX11.cpp | 22 ++++++++++++++-------- @@ -2744,10 +2744,10 @@ index 6953b68..d60d04a 100644 1.8.4 -From 3a661ebc7a116c316f91199ea8c8ea8018c819d6 Mon Sep 17 00:00:00 2001 +From e63371dd0dd79e838877dbb2d15aa5ae8669dca1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 12/79] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 12/81] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++++ @@ -2891,10 +2891,10 @@ index b3be9fc..7259674 100644 1.8.4 -From 08c1afa9a285b7224c2f1078154653ab2963280b Mon Sep 17 00:00:00 2001 +From 1b2e3ec103f37b6c1f18771610f5a1e59ef60bd8 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 13/79] xrandr: remove method RestoreState +Subject: [PATCH 13/81] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -2973,10 +2973,10 @@ index 0aec487..00b49dc 100644 1.8.4 -From 4e4a6dcbcfd7a80d12c72b78325841b6bb9af512 Mon Sep 17 00:00:00 2001 +From 3046674fdf3889e5cb2a9db14ea42a4f271eee3c Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 14/79] xrandr: observe orientation +Subject: [PATCH 14/81] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 89 ++++++++++++++++++++++++++++++------- @@ -3191,10 +3191,10 @@ index 00b49dc..508604d 100644 1.8.4 -From 13a042ed277448a4aa56f415d00762641e366b0e Mon Sep 17 00:00:00 2001 +From ed845a3b22d8602bcb18488c10548688a970d692 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 15/79] xrandr: allow getting info for multiple screen's +Subject: [PATCH 15/81] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -3369,10 +3369,10 @@ index 508604d..d37838a 100644 1.8.4 -From 0fc30291ebd470b1958686d2ada9a1350a32982e Mon Sep 17 00:00:00 2001 +From 8f798408a71fc7c85ef16a989cc62d32492da581 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 16/79] X11: fix multi-head setups +Subject: [PATCH 16/81] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -3402,7 +3402,7 @@ index 5096061..b581e01 100755 msgctxt "#247" msgid "Scripts" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 00dce05..144e569 100644 +index 3556adb..af9bf81 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1988,6 +1988,15 @@ @@ -3556,7 +3556,7 @@ index cc4002b..d80f1dc 100644 protected: CDisplaySettings(); diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 226669a..19ac324 100644 +index 3c4310c..ddae578 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -406,6 +406,7 @@ void CSettings::Uninitialize() @@ -4141,10 +4141,10 @@ index eb8005e..7d53d36 100644 1.8.4 -From 8633d4b566782cff1197c1fd811d710d8a9ad7f0 Mon Sep 17 00:00:00 2001 +From a85f9dbc6e5efa7c0d51a5854f76d750e8682c7c Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 17/79] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 17/81] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -4212,10 +4212,10 @@ index 81c6800..8a8ff83 100644 1.8.4 -From 86034fa01e3d8f9bcfd7c9a6705b3ac22c5fb4ec Mon Sep 17 00:00:00 2001 +From 63bc6da094e3d66288a3b323e0910e34c4930766 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 18/79] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 18/81] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -4287,10 +4287,10 @@ index 3ba991a..7eecd40 100644 1.8.4 -From c2f34af678ae662ea6e9a9205030374cb7696c4e Mon Sep 17 00:00:00 2001 +From e758aa85c4442ed8c10222ce1819940ab885a6ce Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 19/79] X11: recreate gl context after output has changed +Subject: [PATCH 19/81] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -4441,10 +4441,10 @@ index 8a8ff83..8707467 100644 1.8.4 -From ee99e1ee8777134c98e74480f17712edd4cd4c53 Mon Sep 17 00:00:00 2001 +From 498bbc3845568beb33c735ea4842250fbef5fc14 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 20/79] X11: hook video reference clock in windowing +Subject: [PATCH 20/81] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 +++++++++++++++++++++++++++----------- @@ -4649,10 +4649,10 @@ index dd65a1b..afd71fc 100644 1.8.4 -From d1c587b9b46ef8d3fd9a4cde12af185ffdfde751 Mon Sep 17 00:00:00 2001 +From c88862a57e2dd3cf93f150776d9a0bfa855f6ff5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 21/79] X11: fix video calibrations +Subject: [PATCH 21/81] X11: fix video calibrations --- xbmc/windowing/WinSystem.h | 1 + @@ -4744,10 +4744,10 @@ index 2868707..282bb9a 100644 1.8.4 -From 5161e3e34fdf68ae804630749bde49813b1ca5c9 Mon Sep 17 00:00:00 2001 +From 3c4a0b1ead8093e036ccb6af5d5310222837e8b1 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 22/79] X11: deactivate screen saver on startup +Subject: [PATCH 22/81] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -4817,10 +4817,10 @@ index 282bb9a..32f90da 100644 1.8.4 -From 99f047d587714fa274fbb2d79f3daf9c94316063 Mon Sep 17 00:00:00 2001 +From 15c987d025cf52b5bc2e5490bb7f3218bebb1163 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 23/79] X11: change method of going full-screen +Subject: [PATCH 23/81] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -4864,10 +4864,10 @@ index e1fd4e5..acd6497 100644 1.8.4 -From f370a34ab69bab8a687708d83bdb7fb935cecb3a Mon Sep 17 00:00:00 2001 +From cfe82736f26353bfc61fce39c691c0ff39ee4170 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 24/79] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 24/81] X11: reset key repeat and key modifier on focus lost and gain --- @@ -4899,10 +4899,10 @@ index d98f12f..743aca9 100644 1.8.4 -From 61a60e1ac6b5ba05c7de476232a1b5281d0d6e81 Mon Sep 17 00:00:00 2001 +From 07b008215ddf807d8b3f955f759da5e5a0269a1c Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 25/79] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 25/81] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -5119,10 +5119,10 @@ index a412f32..9a8a912 100644 1.8.4 -From 127c0dbe7de76d1b7601340de420ad0f73bc9ebd Mon Sep 17 00:00:00 2001 +From 53a1baff8041034cf06d85377849e67d6b52866a Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 26/79] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 26/81] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -5186,10 +5186,10 @@ index 9a8a912..c69169c 100644 1.8.4 -From 79b2e28df2b3a25d440ad976b5e48dbb1687c9a9 Mon Sep 17 00:00:00 2001 +From 260f34350344a91dfd535ab6ce0bbae54661b3d0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 27/79] add missing keys to xbmc keytable +Subject: [PATCH 27/81] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ @@ -5212,10 +5212,10 @@ index b430f55..246164b 100644 1.8.4 -From e0a7af21b097d709cbeac6d98759ae57997ca13b Mon Sep 17 00:00:00 2001 +From 617e2889d473976c235a0bb03baf108ad9534f19 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 28/79] videorefclock: temp deactivate of nv settings +Subject: [PATCH 28/81] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -5238,10 +5238,10 @@ index 4071ff0..b9afc09 100644 1.8.4 -From 37c3ad8f9f41f3d9922025b0bee4614f78dd2f3f Mon Sep 17 00:00:00 2001 +From 0a2f531106ad6db7a1077b12b6c11120e2c2a651 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 29/79] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 29/81] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -5272,10 +5272,10 @@ index b9afc09..2f6c7de 100644 1.8.4 -From 1111dbee1d7a3bf79a5c228d3583fd170e806acd Mon Sep 17 00:00:00 2001 +From 0a722083da3422d99bd0df68859a841c1b8c254a Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 30/79] X11: fix icon texture after +Subject: [PATCH 30/81] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -5383,10 +5383,10 @@ index acd6497..805eed7 100644 1.8.4 -From 488ba6b0d6ca6c020878b1c59c40e43823c50521 Mon Sep 17 00:00:00 2001 +From 9aaf6eec098c8ed9c332e6dd769565d344b30972 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 31/79] X11: check for window manager +Subject: [PATCH 31/81] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++++- @@ -5507,10 +5507,10 @@ index 32f90da..28d9d03 100644 1.8.4 -From 19704dd2ffcd514f23b72f5e05e20feba6585bc9 Mon Sep 17 00:00:00 2001 +From 68876eca442314a2955522c2b87a768551563156 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 32/79] X11: dont set window on xrandr if no mode available +Subject: [PATCH 32/81] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -5547,10 +5547,10 @@ index b103248..45741d7 100644 1.8.4 -From 5007fbf749b461038ad9f155bd9bfcdd6589fd02 Mon Sep 17 00:00:00 2001 +From 7abd300b42cb8a2ada406833e692568bf648235f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 33/79] X11: fix crash after a resolution change on startup +Subject: [PATCH 33/81] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -5574,10 +5574,10 @@ index 45741d7..a6cb67f 100644 1.8.4 -From d6bdb0231e70b0e1dee81389d024b4410fd54b9e Mon Sep 17 00:00:00 2001 +From 4f56bafbf7941b7f8998af9f144906a576d78b5a Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 34/79] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 34/81] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -5600,10 +5600,10 @@ index a6cb67f..70b5f10 100644 1.8.4 -From fc3af19b1014e79056df52fbc74c3989c294f8af Mon Sep 17 00:00:00 2001 +From d8365a8feac6c5dac663f0e9ddefa8a704071be8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 35/79] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 35/81] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -5649,10 +5649,10 @@ index 0016c0b..3514856 100644 1.8.4 -From b765fdad776a4524371970ec2594890a99f8b6bb Mon Sep 17 00:00:00 2001 +From 0c734465dd80e0f0ac143bf283bdb05aa7df2ac6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 36/79] dvdplayer: observe pts counter overflow +Subject: [PATCH 36/81] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 ++++++++++++++++++++- @@ -5939,10 +5939,10 @@ index aef5ab1..35abbdf 100644 1.8.4 -From 927015a67e212990e2636fa29758adb59b15fd3b Mon Sep 17 00:00:00 2001 +From fa5a87f38f620e2e292c9f8617d235c4e938c5d4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 37/79] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 37/81] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -5975,10 +5975,10 @@ index c40d193..6419951 100644 1.8.4 -From 67aeb3b105793038cdaf11c8238c171d6f7946c5 Mon Sep 17 00:00:00 2001 +From d98d2bd61063c6c385c259d0cfeb38246ceba512 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 38/79] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 38/81] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -5987,7 +5987,7 @@ Subject: [PATCH 38/79] vdpau: advanced settings for auto deinterlacing 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index f026c92..73c9b50 100644 +index 97dea48..57bb704 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1959,10 +1959,10 @@ EINTERLACEMETHOD CMixer::GetDeinterlacingMethod(bool log /* = false */) @@ -6006,7 +6006,7 @@ index f026c92..73c9b50 100644 if (deint != -1) { diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index dc10c0b..a2cc6f5 100644 +index cc8cdec..50e659b 100644 --- a/xbmc/settings/AdvancedSettings.cpp +++ b/xbmc/settings/AdvancedSettings.cpp @@ -165,6 +165,8 @@ void CAdvancedSettings::Initialize() @@ -6028,7 +6028,7 @@ index dc10c0b..a2cc6f5 100644 XMLUtils::GetBoolean(pElement,"vdpauHDdeintSkipChroma",m_videoVDPAUdeintSkipChromaHD); diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 7f21bc4..9c4831b 100644 +index bf6797f..cbb5ff5 100644 --- a/xbmc/settings/AdvancedSettings.h +++ b/xbmc/settings/AdvancedSettings.h @@ -160,6 +160,8 @@ class CAdvancedSettings : public ISettingCallback, public ISettingsHandler @@ -6044,10 +6044,10 @@ index 7f21bc4..9c4831b 100644 1.8.4 -From 81ea69baabfc1a4453022f83832264f94a977a16 Mon Sep 17 00:00:00 2001 +From a177f444b9f75e87bd874e4c7d701b3501226142 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 39/79] player: fix rewind +Subject: [PATCH 39/81] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -6095,7 +6095,7 @@ index 2ea8b8f..e8274f9 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 5c1b31e..0af6b7c 100644 +index f61b77a..b39d5fe 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1549,11 +1549,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -6262,10 +6262,10 @@ index 59c7f09..65dea76 100644 1.8.4 -From 03463194d42977133366d0563d281d128571d25a Mon Sep 17 00:00:00 2001 +From 91d88b319f9e0ab74005e6e768ec54f14e66067d Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 40/79] xrandr: fix query for multiple screens +Subject: [PATCH 40/81] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -6306,10 +6306,10 @@ index 9e181f2..ce0a02b 100644 1.8.4 -From 3e7454db53221bd4531f23c11c4cb32d8168f12f Mon Sep 17 00:00:00 2001 +From d260ebb337772d4fc71b54addafd1df2c48b9091 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 41/79] X11: add debug log to print out refresh after xrr event +Subject: [PATCH 41/81] X11: add debug log to print out refresh after xrr event --- xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++++ @@ -6336,10 +6336,10 @@ index 70b5f10..64d5730 100644 1.8.4 -From 0cef0072305e36b3ff36467859505a612cf3649b Mon Sep 17 00:00:00 2001 +From 9ef1432bc02fe98e0de6bc7cc7e0801bf18f5b15 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 42/79] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 42/81] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -6364,10 +6364,10 @@ index 64d5730..edc81c8 100644 1.8.4 -From 287fd3cdb8f86f8394bd5ae1b01bdb68fed87eae Mon Sep 17 00:00:00 2001 +From 33f974cfec278b7bbc459602a10f3ed5b5cf2c4c 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/79] x11: support for multiple x screens +Subject: [PATCH 43/81] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6390,10 +6390,10 @@ index ce0a02b..aa27d2b 100644 1.8.4 -From 8d6932814e15fda0d6a8e695227014b3d61838de Mon Sep 17 00:00:00 2001 +From c958d5ba34219d2a9ccd9beec9e33ba4db551da0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 44/79] pvr: increase changes counter of stream on stream +Subject: [PATCH 44/81] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be --- @@ -6427,10 +6427,10 @@ index b96d520..df89f6f 100644 1.8.4 -From 24596101ec30d223d370f60b776d14168d34f010 Mon Sep 17 00:00:00 2001 +From 67bd337e018378d4a18a520d884501e0d8d42be9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH 45/79] X11: add keymapping for XF86XK_Sleep +Subject: [PATCH 45/81] X11: add keymapping for XF86XK_Sleep --- xbmc/windowing/WinEventsX11.cpp | 1 + @@ -6452,10 +6452,10 @@ index a62521f..263cb5a 100644 1.8.4 -From 603aab617e0ab490fa9d2dd6c71838cceed03100 Mon Sep 17 00:00:00 2001 +From 22ef44d113635c463be1130cca0b5d4be4a637bf Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 21 Jan 2013 09:00:19 +0100 -Subject: [PATCH 46/79] X11: remove toggle full screen after resume +Subject: [PATCH 46/81] X11: remove toggle full screen after resume --- xbmc/powermanagement/PowerManager.cpp | 5 ----- @@ -6481,10 +6481,10 @@ index 2033574..c79bbc1 100644 1.8.4 -From 8152b2ccb41679ff584606761770af36704cc35d Mon Sep 17 00:00:00 2001 +From 958006351c0e72a23cf5499f25774e54cbfb5218 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:02 +0100 -Subject: [PATCH 47/79] xrandr: set screen on mode change command +Subject: [PATCH 47/81] xrandr: set screen on mode change command --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -6507,10 +6507,10 @@ index aa27d2b..67bf6ca 100644 1.8.4 -From accfee15fc5f56a91a8a48d1229db4e29743a024 Mon Sep 17 00:00:00 2001 +From 6369efab824e3891136008340324358d2df48771 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 23 Jan 2013 17:03:39 +0100 -Subject: [PATCH 48/79] X11: recreate glx context when output changes +Subject: [PATCH 48/81] X11: recreate glx context when output changes --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -6561,10 +6561,10 @@ index 28d9d03..5a21b00 100644 1.8.4 -From bb5b45e26408df190fbd470b6f51873e790cbad8 Mon Sep 17 00:00:00 2001 +From f417192987cde15be69be46f9c04699fd261df91 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 14 Dec 2012 14:19:15 +0100 -Subject: [PATCH 49/79] pvr: do not show selection dialog for a single menu +Subject: [PATCH 49/81] pvr: do not show selection dialog for a single menu hook --- @@ -6602,10 +6602,10 @@ index 5aaf881..4c64877 100644 1.8.4 -From 685fb07e0ef2f35ad9f42db6fd03892f076d2178 Mon Sep 17 00:00:00 2001 +From c849ac70cad0fd286457091f77faacb996fff464 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 3 Feb 2013 08:17:16 +0100 -Subject: [PATCH 50/79] X11: use default screen parameters if no output +Subject: [PATCH 50/81] X11: use default screen parameters if no output connected --- @@ -6709,10 +6709,10 @@ index c6aa51a..f481ea4 100644 1.8.4 -From 99ef928d3aecd8da98807a22367146dccbc19bdc Mon Sep 17 00:00:00 2001 +From aeaf78a841e79099ee1b7237be0f8779339ff819 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 23 Mar 2013 15:13:32 +0100 -Subject: [PATCH 51/79] X11: create parent window +Subject: [PATCH 51/81] X11: create parent window --- xbmc/windowing/X11/WinSystemX11.cpp | 69 +++++++++++++++++++++++-------------- @@ -6978,10 +6978,10 @@ index 5a21b00..b866d52 100644 1.8.4 -From 9a582b91956cdf46239de00265bdd9b34a1f11d8 Mon Sep 17 00:00:00 2001 +From 85a20a4098f3f4eb573f811de773c3deac1776e1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 12:30:12 +0100 -Subject: [PATCH 52/79] X11: use system key repeat rate instead of hardcoded +Subject: [PATCH 52/81] X11: use system key repeat rate instead of hardcoded one, taken from 58fd64b194e38b73b5f3132744bab35e994e7441 --- @@ -7183,10 +7183,10 @@ index c69169c..6429291 100644 1.8.4 -From a17f3c7fdd4783520fdd8684ce128d1dc5797fdb Mon Sep 17 00:00:00 2001 +From c6bf94c47d63004534232bba86d722ea1a602fcf Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 24 Mar 2013 16:04:48 +0100 -Subject: [PATCH 53/79] linux: use CLOCK_MONOTONIC_RAW as this is not subject +Subject: [PATCH 53/81] linux: use CLOCK_MONOTONIC_RAW as this is not subject to NTP --- @@ -7224,17 +7224,17 @@ index c06b8c5..4390d2e 100644 1.8.4 -From 6a5610785a97af067163ef3e8f24aa3ebca6f087 Mon Sep 17 00:00:00 2001 +From b70092419619186fdb3b2b3aaa5a19a9bf6454a4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 15:18:53 +0100 -Subject: [PATCH 54/79] OMXPlayer: some caching fixes for pvr +Subject: [PATCH 54/81] OMXPlayer: some caching fixes for pvr --- xbmc/cores/omxplayer/OMXPlayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp -index a149070..5903081 100644 +index 94dd7c4..39f6cbb 100644 --- a/xbmc/cores/omxplayer/OMXPlayer.cpp +++ b/xbmc/cores/omxplayer/OMXPlayer.cpp @@ -2461,7 +2461,8 @@ void COMXPlayer::HandleMessages() @@ -7251,20 +7251,20 @@ index a149070..5903081 100644 1.8.4 -From 8519ba9a8ca2c3937d45764f25e99a556f50f253 Mon Sep 17 00:00:00 2001 +From e83dd6c398d633eae739504e40b7aead883a3fc9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Mar 2013 20:50:59 +0100 -Subject: [PATCH 55/79] fix incorrect display of fps when dr kicks in +Subject: [PATCH 55/81] fix incorrect display of fps when dr kicks in --- xbmc/Application.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index f62c9fa..0bf1e80 100644 +index 05af50e..76bb1bf 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2224,10 +2224,11 @@ void CApplication::Render() +@@ -2232,10 +2232,11 @@ void CApplication::Render() if (frameTime < singleFrameTime) Sleep(singleFrameTime - frameTime); } @@ -7281,10 +7281,10 @@ index f62c9fa..0bf1e80 100644 1.8.4 -From a568fd7bca6b7481cf8b00f4adcb2de7727a8151 Mon Sep 17 00:00:00 2001 +From 9ce5a4c3c1419d0a4810b7bcd7f664ff08f05646 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 13 Apr 2013 08:32:06 +0200 -Subject: [PATCH 56/79] X11: fix mouse coverage +Subject: [PATCH 56/81] X11: fix mouse coverage --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++++--- @@ -7350,10 +7350,10 @@ index b866d52..3f1b5f8 100644 1.8.4 -From b3957dc0082cb0e619750a90920685e598d6ddc5 Mon Sep 17 00:00:00 2001 +From a5d1e5647cf54900776d08cd631e71049d47b0de Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 8 May 2013 13:14:58 +0200 -Subject: [PATCH 57/79] X11: fix incorrectly used screen num in desktop +Subject: [PATCH 57/81] X11: fix incorrectly used screen num in desktop resolution --- @@ -7388,10 +7388,10 @@ index 7987cc2..b13f1a5 100644 1.8.4 -From 1dae812688760a3ad13f6052437faebcf658022c Mon Sep 17 00:00:00 2001 +From 3144c9a45d08f04531256ae68efa8b542fa6735c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 9 May 2013 12:07:09 +0200 -Subject: [PATCH 58/79] X11: do not overwrite user selected monitor with +Subject: [PATCH 58/81] X11: do not overwrite user selected monitor with fallback --- @@ -7516,10 +7516,10 @@ index 3f1b5f8..ed70d9c 100644 1.8.4 -From 853f2aafb21fbe6debbb62829f191228f6fa3260 Mon Sep 17 00:00:00 2001 +From dfdcb915bc7235444e1921f178625f111ef0c01f Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 12 May 2013 10:50:30 +0200 -Subject: [PATCH 59/79] xrandr: add turn on/off to wrapper +Subject: [PATCH 59/81] xrandr: add turn on/off to wrapper --- xbmc/windowing/X11/XRandR.cpp | 78 +++++++++++++++++++++++++++++++++++++++---- @@ -7685,10 +7685,10 @@ index d37838a..059062f 100644 1.8.4 -From d4250ce921b968555481b625f3726d21983eb122 Mon Sep 17 00:00:00 2001 +From 29cf32118cf0b12bba9bf1437640e7c3cdd8ac99 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 19 May 2013 12:55:35 +0200 -Subject: [PATCH 60/79] xrandr: add GetPreferredMode to wrapper +Subject: [PATCH 60/81] xrandr: add GetPreferredMode to wrapper --- xbmc/windowing/X11/XRandR.cpp | 23 +++++++++++++++++++++++ @@ -7745,10 +7745,10 @@ index 059062f..ab7cc63 100644 1.8.4 -From c8bf0955dceeb9bec9e7e5b5a4bfb89ad05418f2 Mon Sep 17 00:00:00 2001 +From b1f825b433292fe3815086feb71985c62b46325b Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 11 May 2013 17:12:12 +0200 -Subject: [PATCH 61/79] X11: multi-head improvement - poll for desired output +Subject: [PATCH 61/81] X11: multi-head improvement - poll for desired output if we do not get an xrr event --- @@ -7790,7 +7790,7 @@ index b581e01..382c963 100755 #: xbmc/dialogs/GUIDialogFavourites.cpp msgctxt "#15015" diff --git a/system/settings/settings.xml b/system/settings/settings.xml -index 144e569..5118f4f 100644 +index af9bf81..b67541a 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1997,6 +1997,11 @@ @@ -8029,10 +8029,10 @@ index 4809821..1ad26b2 100644 1.8.4 -From 06979523bdc4684eba060007e4faba3f8935833f Mon Sep 17 00:00:00 2001 +From 3ab8c0de5d0e6ea34def06ffbc90b0c6411c2f27 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Wed, 15 May 2013 09:14:34 +0200 -Subject: [PATCH 62/79] X11: ignore mouse move event form other windows +Subject: [PATCH 62/81] X11: ignore mouse move event form other windows --- xbmc/windowing/WinEventsX11.cpp | 4 +++- @@ -8064,10 +8064,10 @@ index 908c8b6..938ad26 100644 1.8.4 -From 5ea114fcdb8a2a27ac7b234d752a69c310087e66 Mon Sep 17 00:00:00 2001 +From eb73d7faa1dd6101637f37390e711a7cf898ef1e Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 11 Jun 2013 16:20:29 +0200 -Subject: [PATCH 63/79] renderer: allow some lateness within vblank interval +Subject: [PATCH 63/81] renderer: allow some lateness within vblank interval --- xbmc/cores/VideoRenderers/RenderManager.cpp | 12 ++++++++++-- @@ -8127,10 +8127,10 @@ index 949c652b..d84ff6c 100644 1.8.4 -From 6844340b06198a528efdba74e38cd78838516a67 Mon Sep 17 00:00:00 2001 +From 1ab3ed702fe9e79373c2f9fd0d53921edc956678 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 16 Jun 2013 13:22:58 +0200 -Subject: [PATCH 64/79] X11: another fix for mouse coverage +Subject: [PATCH 64/81] X11: another fix for mouse coverage --- xbmc/windowing/WinEventsX11.cpp | 6 ++++-- @@ -8163,10 +8163,10 @@ index 938ad26..e4ca56d 100644 1.8.4 -From 722537eadc8823298e4b5f3adaed4da7874ead46 Mon Sep 17 00:00:00 2001 +From b2adf65daaa3bf2c6956c001b2d6eee84470d7e5 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 5 Jul 2013 12:14:00 +0200 -Subject: [PATCH 65/79] X11: set windows class name +Subject: [PATCH 65/81] X11: set windows class name --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -8208,10 +8208,10 @@ index cbb56bf..e74f2b0 100644 1.8.4 -From e9fd40531b497ed3064f5f956c9cb1c5929ec8fe Mon Sep 17 00:00:00 2001 +From c1e415708ac60e989b2189b3d1cf070e9ea923f1 Mon Sep 17 00:00:00 2001 From: spiff Date: Tue, 16 Jul 2013 14:34:04 +0200 -Subject: [PATCH 66/79] fixed: typo +Subject: [PATCH 66/81] fixed: typo --- language/English/strings.po | 2 +- @@ -8234,17 +8234,17 @@ index 382c963..bb17807 100755 1.8.4 -From 35f160e240780e3182cff100d86033d53ed87948 Mon Sep 17 00:00:00 2001 +From cb93cc14b59a3e108c8362cb547c13cd11726ba3 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 25 Jul 2013 17:18:13 +0200 -Subject: [PATCH 67/79] ActiveAE: slightly reduce buffer size +Subject: [PATCH 67/81] ActiveAE: slightly reduce buffer size --- xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 4 ++-- 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 7194945..3c2ec99 100644 +index fa2328f..a3a89a2 100644 --- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp +++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp @@ -30,8 +30,8 @@ @@ -8262,10 +8262,10 @@ index 7194945..3c2ec99 100644 1.8.4 -From 231fd3a7a3ace2e28e5f89ed82dad2463274079f Mon Sep 17 00:00:00 2001 +From 589377e73679a15f43d058b2d8f3bd7f1a45d5d1 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sun, 4 Aug 2013 10:11:16 +0200 -Subject: [PATCH 68/79] Revert "vdpau: comment some features that will be added +Subject: [PATCH 68/81] Revert "vdpau: comment some features that will be added later" This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. @@ -8274,7 +8274,7 @@ This reverts commit e00b4f65864d623ab4d2e9e5c06db138e661f1cf. 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -index 73c9b50..1ac0978 100644 +index 57bb704..55f17e5 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -1084,8 +1084,7 @@ int CDecoder::Decode(AVCodecContext *avctx, AVFrame *pFrame) @@ -8321,10 +8321,10 @@ index 73c9b50..1ac0978 100644 1.8.4 -From 82ef507245686fae7204edc40a1e24eb4c2a484b Mon Sep 17 00:00:00 2001 +From 0a3f4de2fe555447da8f19c3771c00ec50e8d77a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:01:40 +0200 -Subject: [PATCH 69/79] X11: fix keysyms +Subject: [PATCH 69/81] X11: fix keysyms --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8347,10 +8347,10 @@ index e4ca56d..b20130c 100644 1.8.4 -From a69eaa48d12dfc43babd1f1b4e000622135e7977 Mon Sep 17 00:00:00 2001 +From a81056f08c3fa88a7c8e1ffde922af78e16c4bfc Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Fri, 9 Aug 2013 18:42:36 +0200 -Subject: [PATCH 70/79] X11: fix keysym for non-IM +Subject: [PATCH 70/81] X11: fix keysym for non-IM --- xbmc/windowing/WinEventsX11.cpp | 2 +- @@ -8373,10 +8373,10 @@ index b20130c..a38890c 100644 1.8.4 -From 38e7da7bb2245eb3f3bb88c8bba289cd100c0cba Mon Sep 17 00:00:00 2001 +From 4c892f925d93822e88f3510d085ab6667ad8be1a Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 11:18:16 +0200 -Subject: [PATCH 71/79] add some missing multi media keys +Subject: [PATCH 71/81] add some missing multi media keys --- system/keymaps/keyboard.xml | 3 +++ @@ -8431,10 +8431,10 @@ index ee6bb69..364b45a 100644 1.8.4 -From 594c4bc4173da8c6c9c3c973cb037e275a0c494a Mon Sep 17 00:00:00 2001 +From 77e543ca803a84202a6a2f71602e087abf99f5d2 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 10 Aug 2013 15:53:45 +0200 -Subject: [PATCH 72/79] X11: squash multi +Subject: [PATCH 72/81] X11: squash multi --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8457,10 +8457,10 @@ index e74f2b0..480efb3 100644 1.8.4 -From fe2f0fa9ee2ae337066f8bba00dc383311372e5a Mon Sep 17 00:00:00 2001 +From 9ef6bf6d697d70e25f8ca438240c684a0a70a57c Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 3 Sep 2013 20:46:17 +0200 -Subject: [PATCH 73/79] X11: do not poll default monitor +Subject: [PATCH 73/81] X11: do not poll default monitor --- xbmc/windowing/X11/WinSystemX11.cpp | 2 +- @@ -8483,10 +8483,10 @@ index 480efb3..dd04357 100644 1.8.4 -From 52581c2959288fb4567b3cf9ea12ad81be19357b Mon Sep 17 00:00:00 2001 +From 72094b2a1fd57bbbc3ee614c9349f3c6ef092105 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:28 +0100 -Subject: [PATCH 74/79] X11: fix broken monitor switching +Subject: [PATCH 74/81] X11: fix broken monitor switching --- system/settings/settings.xml | 1 - @@ -8494,7 +8494,7 @@ Subject: [PATCH 74/79] 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 5118f4f..ad98bcb 100644 +index b67541a..509b680 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -2041,7 +2041,6 @@ @@ -8589,10 +8589,10 @@ index 46895d2..c495bb0 100644 1.8.4 -From 5a59a7d29c1cdd91ca93f99f6de3a12062c635e2 Mon Sep 17 00:00:00 2001 +From 61fcb749c570ec9e343a508700b7f86ce5d5426d Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Tue, 29 Oct 2013 20:57:59 +0100 -Subject: [PATCH 75/79] X11: remove polling for connected outputs, use xrr +Subject: [PATCH 75/81] X11: remove polling for connected outputs, use xrr events --- @@ -8893,10 +8893,10 @@ index f0d22bb..03bccc9 100644 1.8.4 -From 7596d2468a416f8a542c4379904f6539ae3fcab6 Mon Sep 17 00:00:00 2001 +From 592ba5ae5d4e76b173dba2f37417fd5a267b94d9 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 09:37:13 +0100 -Subject: [PATCH 76/79] X11: remove grabbing of keyboard and mouse +Subject: [PATCH 76/81] X11: remove grabbing of keyboard and mouse --- xbmc/windowing/WinEventsX11.cpp | 4 ---- @@ -9014,26 +9014,22 @@ index 03bccc9..1b8bbcb 100644 1.8.4 -From 73a91630fd2b2f293013301d69abfc1c3dee7c1e Mon Sep 17 00:00:00 2001 +From 32a586b6c388019fdd3cd97bf48b1d241545b4f4 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 10:46:40 +0100 -Subject: [PATCH 77/79] X11: set ExposureMask on gl window, fixes not updated +Subject: [PATCH 77/81] X11: set ExposureMask on gl window, fixes not updated areas --- - xbmc/windowing/X11/WinSystemX11.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) + xbmc/windowing/X11/WinSystemX11.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 6b5aa09..1a67943 100644 +index 6b5aa09..1e01fd5 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -881,10 +881,12 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std: - InputOutput, vi->visual, - mask, &swa); +@@ -883,8 +883,8 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std: -+ XSelectInput(m_dpy, m_mainWindow, swa.event_mask); -+ swa.override_redirect = False; swa.border_pixel = 0; - swa.event_mask = 0; @@ -9047,10 +9043,10 @@ index 6b5aa09..1a67943 100644 1.8.4 -From 1e9f2f47dbe047fb550a9ef30a1e26c3b92af0b2 Mon Sep 17 00:00:00 2001 +From 8de3683a6d13a19de7384b61d06be32b7f106340 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Thu, 31 Oct 2013 11:25:19 +0100 -Subject: [PATCH 78/79] X11: drop shortcuts, have WM do this +Subject: [PATCH 78/81] X11: drop shortcuts, have WM do this --- xbmc/windowing/WinEventsX11.cpp | 21 --------------------- @@ -9112,3 +9108,248 @@ index 6429291..4334d21 100644 1.8.4 +From f734e589173750b7ccf17bbbe8da1dbbf857bc94 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Thu, 7 Nov 2013 15:02:00 +0100 +Subject: [PATCH 79/81] X11: adapt to new settings + +--- + system/settings/settings.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/system/settings/settings.xml b/system/settings/settings.xml +index 509b680..2f9cdfd 100644 +--- a/system/settings/settings.xml ++++ b/system/settings/settings.xml +@@ -2001,6 +2001,7 @@ + HAS_GLX + 0 + false ++ + + + 0 +-- +1.8.4 + + +From cc32653bdedb63a81c27c8ba7650b2235f2a4774 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Fri, 8 Nov 2013 18:15:13 +0100 +Subject: [PATCH 80/81] AE: fix toggle passthrough - PCM + +--- + xbmc/Application.cpp | 6 +++--- + xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp +index 76bb1bf..3471bb5 100644 +--- a/xbmc/Application.cpp ++++ b/xbmc/Application.cpp +@@ -1602,6 +1602,9 @@ void CApplication::OnSettingChanged(const CSetting *setting) + g_windowManager.SendMessage(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_WINDOW_RESIZE); + else if (StringUtils::StartsWithNoCase(settingId, "audiooutput.")) + { ++ // AE is master of audio settings and needs to be informed first ++ CAEFactory::OnSettingsChange(settingId); ++ + if (settingId == "audiooutput.guisoundmode") + { + CAEFactory::SetSoundMode(((CSettingInt*)setting)->GetValue()); +@@ -1611,10 +1614,7 @@ void CApplication::OnSettingChanged(const CSetting *setting) + else if (settingId == "audiooutput.passthrough") + { + CApplicationMessenger::Get().MediaRestart(false); +- return; + } +- +- CAEFactory::OnSettingsChange(settingId); + } + else if (StringUtils::EqualsNoCase(settingId, "musicplayer.replaygaintype")) + m_replayGainSettings.iType = ((CSettingInt*)setting)->GetValue(); +diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +index 5d0f2ef..3222eb3 100644 +--- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp ++++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +@@ -274,7 +274,7 @@ void CGUIDialogAudioSubtitleSettings::OnSettingChanged(SettingInfo &setting) + } + else if (setting.id == AUDIO_SETTINGS_DIGITAL_ANALOG) + { +- CSettings::Get().SetBool("audiooutput.passthrough", !m_outputmode); ++ CSettings::Get().SetBool("audiooutput.passthrough", m_outputmode); + + EnableSettings(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, true); + EnableSettings(AUDIO_SETTINGS_VOLUME, !g_application.m_pPlayer->IsPassthrough()); +-- +1.8.4 + + +From a9debb52ab6c4cc08f705f5d89be07ed75629a78 Mon Sep 17 00:00:00 2001 +From: Rainer Hochecker +Date: Sat, 9 Nov 2013 12:20:05 +0100 +Subject: [PATCH 81/81] vdpau: move cropping of top and bottom lines to + renderer + +--- + xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 27 ++++++---------- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 45 +++++++------------------- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h | 1 - + 3 files changed, 21 insertions(+), 52 deletions(-) + +diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +index e562102..e752b53 100644 +--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp ++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +@@ -1610,7 +1610,6 @@ void CLinuxRendererGL::RenderVDPAU(int index, int field) + + // make sure we know the correct texture size + GetPlaneTextureSize(plane); +- CalculateTextureSourceRects(index, 1); + + // Try some clamping or wrapping + glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); +@@ -1657,10 +1656,10 @@ void CLinuxRendererGL::RenderVDPAU(int index, int field) + } + else + { +- glTexCoord2f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y); glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y, 0.0f, 0.0f); +- glTexCoord2f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y); glVertex4f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y, 1.0f, 0.0f); +- glTexCoord2f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y); glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y, 1.0f, 1.0f); +- glTexCoord2f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y); glVertex4f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y, 0.0f, 1.0f); ++ glTexCoord2f(plane.rect.x1, plane.rect.y1); glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y, 0.0f, 0.0f); ++ glTexCoord2f(plane.rect.x2, plane.rect.y1); glVertex4f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y, 1.0f, 0.0f); ++ glTexCoord2f(plane.rect.x2, plane.rect.y2); glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y, 1.0f, 1.0f); ++ glTexCoord2f(plane.rect.x1, plane.rect.y2); glVertex4f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y, 0.0f, 1.0f); + } + glEnd(); + VerifyGLState(); +@@ -2398,23 +2397,17 @@ bool CLinuxRendererGL::UploadVDPAUTexture(int index) + + plane.id = vdpau->texture[0]; + +- plane.rect = m_sourceRect; +- plane.width = im.width; +- plane.height = im.height; +- +- plane.height /= plane.pixpertex_y; +- plane.rect.y1 /= plane.pixpertex_y; +- plane.rect.y2 /= plane.pixpertex_y; +- plane.width /= plane.pixpertex_x; +- plane.rect.x1 /= plane.pixpertex_x; +- plane.rect.x2 /= plane.pixpertex_x; ++ plane.rect.x1 = vdpau->crop.x1; ++ plane.rect.x2 = vdpau->crop.x2; ++ plane.rect.y1 = vdpau->crop.y1; ++ plane.rect.y2 = vdpau->crop.y2; ++ plane.texheight = vdpau->texHeight; ++ plane.texwidth = vdpau->texWidth; + + if (m_textureTarget == GL_TEXTURE_2D) + { +- plane.height /= plane.texheight; + plane.rect.y1 /= plane.texheight; + plane.rect.y2 /= plane.texheight; +- plane.width /= plane.texwidth; + plane.rect.x1 /= plane.texwidth; + plane.rect.x2 /= plane.texwidth; + } +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +index 55f17e5..aa1e1f4 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +@@ -1681,11 +1681,6 @@ void CMixer::CreateVdpauMixer() + &m_videoMixer); + CheckStatus(vdp_st, __LINE__); + +- // create 3 pitches of black lines needed for clipping top +- // and bottom lines when de-interlacing +- m_BlackBar = new uint32_t[3*m_config.outWidth]; +- memset(m_BlackBar, 0, 3*m_config.outWidth*sizeof(uint32_t)); +- + } + + void CMixer::InitCSCMatrix(int Width) +@@ -2240,8 +2235,6 @@ void CMixer::Uninit() + m_outputSurfaces.pop(); + } + m_config.context->GetProcs().vdp_video_mixer_destroy(m_videoMixer); +- +- delete [] m_BlackBar; + } + + void CMixer::Flush() +@@ -2373,6 +2366,11 @@ void CMixer::InitCycle() + m_processPicture.outputSurface = m_outputSurfaces.front(); + m_mixerInput[1].DVDPic.iWidth = m_config.outWidth; + m_mixerInput[1].DVDPic.iHeight = m_config.outHeight; ++ if (m_mixerfield != VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME) ++ { ++ m_mixerInput[1].DVDPic.iHeight -= 6; ++ m_mixerInput[1].DVDPic.iDisplayHeight -= 6; ++ } + } + else + { +@@ -2507,32 +2505,6 @@ void CMixer::ProcessPicture() + 0, + NULL); + CheckStatus(vdp_st, __LINE__); +- +- if (m_mixerfield != VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME) +- { +- // in order to clip top and bottom lines when de-interlacing +- // we black those lines as a work around for not working +- // background colour using the mixer +- // pixel perfect is preferred over overscanning or zooming +- +- VdpRect clipRect = destRect; +- clipRect.y1 = clipRect.y0 + 2; +- uint32_t *data[] = {m_BlackBar}; +- uint32_t pitches[] = {destRect.x1}; +- vdp_st = m_config.context->GetProcs().vdp_output_surface_put_bits_native(m_processPicture.outputSurface, +- (void**)data, +- pitches, +- &clipRect); +- CheckStatus(vdp_st, __LINE__); +- +- clipRect = destRect; +- clipRect.y0 = clipRect.y1 - 2; +- vdp_st = m_config.context->GetProcs().vdp_output_surface_put_bits_native(m_processPicture.outputSurface, +- (void**)data, +- pitches, +- &clipRect); +- CheckStatus(vdp_st, __LINE__); +- } + } + + +@@ -3063,7 +3035,12 @@ CVdpauRenderPicture* COutput::ProcessMixerPicture() + GLMapSurfaces(); + retPic->sourceIdx = procPic.outputSurface; + retPic->texture[0] = m_bufferPool.glOutputSurfaceMap[procPic.outputSurface].texture[0]; +- retPic->crop = CRect(0,0,0,0); ++ retPic->texWidth = m_config.outWidth; ++ retPic->texHeight = m_config.outHeight; ++ retPic->crop.x1 = 0; ++ retPic->crop.y1 = (m_config.outHeight - retPic->DVDPic.iHeight) / 2; ++ retPic->crop.x2 = m_config.outWidth; ++ retPic->crop.y2 = m_config.outHeight - retPic->crop.y1; + } + else + { +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h +index abe8da2..526127e 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h +@@ -331,7 +331,6 @@ class CMixer : private CThread + int m_Deint; + int m_Upscale; + unsigned int m_ColorMatrix : 4; +- uint32_t *m_BlackBar; + VdpVideoMixerPictureStructure m_mixerfield; + int m_mixerstep; + int m_mixersteps; +-- +1.8.4 + diff --git a/packages/mediacenter/xbmc/system.d/xbmc.service b/packages/mediacenter/xbmc/system.d/xbmc.service index 2bfd79307b..b36d040d00 100644 --- a/packages/mediacenter/xbmc/system.d/xbmc.service +++ b/packages/mediacenter/xbmc/system.d/xbmc.service @@ -10,8 +10,6 @@ Environment=HOME=/storage EnvironmentFile=-/run/openelec/xbmc.conf EnvironmentFile=-/run/openelec/debug/xbmc.conf ExecStart=/bin/sh -c ". /etc/profile; exec /usr/lib/xbmc/xbmc.bin --standalone -fs $XBMC_ARGS $XBMC_DEBUG" -# keep KillMode=process unless there is no good reason to switch to cgroup -KillMode=process TimeoutStopSec=10 Restart=always RestartSec=2