jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

Browse Source
This commit is contained in:
Stephan Raue 2013-03-08 16:12:38 +01:00
commit e15d9ba5a5
17 changed files with 134 additions and 1554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-pvr-addons/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="96774c4"
PKG_VERSION="590f862"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.0.3"
PKG_VERSION="12.0.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/build
View File

@ -237,7 +237,7 @@ fi
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
# dont build parallel
MAKEFLAGS=-j1
# MAKEFLAGS=-j1
export PYTHON_VERSION="2.7"
export PYTHON_CPPFLAGS="-I$SYSROOT_PREFIX/usr/include/python$PYTHON_VERSION"

2
packages/mediacenter/xbmc/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.3"
PKG_VERSION="12.0.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

174
packages/mediacenter/xbmc/patches/xbmc-995.01-xvba_support-1ea917e.patch → packages/mediacenter/xbmc/patches.x86/xbmc-995.01-xvba_support-912b6ed.patch
View File

@ -1,4 +1,4 @@
From bfd49543c49747236d401df4351767d584f756ac Mon Sep 17 00:00:00 2001
From c111752701bb2447a833ef1768e912c87d9bbf65 Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Sun, 4 Nov 2012 14:05:52 +0100
Subject: [PATCH 01/73] configure: add --enable-pvraddons-with-dependencies
@ -48,7 +48,7 @@ index 4769315..350d960 100644
1.7.10
From dc83e2351e8bf8e904102782ea489d2c8caa2802 Mon Sep 17 00:00:00 2001
From 86fb17f786cf9efacaa84f64188975312ef4ec6a Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:03:31 +0200
Subject: [PATCH 02/73] VideoRenerers: add buffering
@ -71,10 +71,10 @@ Subject: [PATCH 02/73] VideoRenerers: add buffering
14 files changed, 380 insertions(+), 93 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index c6f0a14..18e6310 100644
index 15f1233..7ed09ee 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2367,7 +2367,10 @@ void CApplication::Render()
@@ -2371,7 +2371,10 @@ void CApplication::Render()
m_lastFrameTime = XbmcThreads::SystemClockMillis();
if (flip)
@ -905,7 +905,7 @@ index 7fe6bb2..34ff8d0 100644
OVERLAY::CRenderer m_overlays;
diff --git a/xbmc/cores/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoRenderers/WinRenderer.cpp
index 7842089..6e4433c 100644
index f1d0768..f0f5b2d 100644
--- a/xbmc/cores/VideoRenderers/WinRenderer.cpp
+++ b/xbmc/cores/VideoRenderers/WinRenderer.cpp
@@ -253,12 +253,12 @@ int CWinRenderer::NextYV12Texture()
@ -1034,7 +1034,7 @@ index 3008c25..a4bb1ba 100644
1.7.10
From dacc0167c993efa6ac884fd3c439fc5f0c823934 Mon Sep 17 00:00:00 2001
From efb0e5d9a372d2c4a6c7fcb9bd74369a8a910cd0 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 10:49:09 +0200
Subject: [PATCH 03/73] linuxrenderer: delete all textures on reconfigure
@ -1060,7 +1060,7 @@ index b32a7ea..a2dc2be 100644
1.7.10
From 226539d21ba940ea8add89417df7102302c7ba79 Mon Sep 17 00:00:00 2001
From 140768ac0a1b909ed0c0821a1dfdf6df8717a64b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:17:33 +0200
Subject: [PATCH 04/73] drop frame counter in application, ask render manager
@ -1074,10 +1074,10 @@ Subject: [PATCH 04/73] drop frame counter in application, ask render manager
4 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 18e6310..9a7b900 100644
index 7ed09ee..b623250 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -415,8 +415,6 @@
@@ -419,8 +419,6 @@
#endif
m_currentStack = new CFileItemList;
@ -1086,7 +1086,7 @@ index 18e6310..9a7b900 100644
m_bPresentFrame = false;
m_bPlatformDirectories = true;
@@ -2227,28 +2225,18 @@ float CApplication::GetDimScreenSaverLevel() const
@@ -2231,28 +2229,18 @@ float CApplication::GetDimScreenSaverLevel() const
bool CApplication::WaitFrame(unsigned int timeout)
{
@ -1120,7 +1120,7 @@ index 18e6310..9a7b900 100644
}
void CApplication::Render()
@@ -2268,7 +2256,6 @@ void CApplication::Render()
@@ -2272,7 +2260,6 @@ void CApplication::Render()
int vsync_mode = g_guiSettings.GetInt("videoscreen.vsync");
@ -1128,7 +1128,7 @@ index 18e6310..9a7b900 100644
bool hasRendered = false;
bool limitFrames = false;
unsigned int singleFrameTime = 10; // default limit 100 fps
@@ -2282,13 +2269,10 @@ void CApplication::Render()
@@ -2286,13 +2273,10 @@ void CApplication::Render()
m_bPresentFrame = false;
if (!extPlayerActive && g_graphicsContext.IsFullScreenVideo() && !IsPaused())
{
@ -1146,7 +1146,7 @@ index 18e6310..9a7b900 100644
hasRendered = true;
}
else
@@ -2312,8 +2296,6 @@ void CApplication::Render()
@@ -2316,8 +2300,6 @@ void CApplication::Render()
else if (lowfps)
singleFrameTime = 200; // 5 fps, <=200 ms latency to wake up
}
@ -1155,7 +1155,7 @@ index 18e6310..9a7b900 100644
}
}
@@ -2377,13 +2359,6 @@ void CApplication::Render()
@@ -2381,13 +2363,6 @@ void CApplication::Render()
g_renderManager.UpdateResolution();
g_renderManager.ManageCaptures();
@ -1169,7 +1169,7 @@ index 18e6310..9a7b900 100644
}
void CApplication::SetStandAlone(bool value)
@@ -5638,12 +5613,6 @@ bool CApplication::SwitchToFullScreen()
@@ -5646,12 +5621,6 @@ bool CApplication::SwitchToFullScreen()
// See if we're playing a video, and are in GUI mode
if ( IsPlayingVideo() && g_windowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO)
{
@ -1182,7 +1182,7 @@ index 18e6310..9a7b900 100644
// then switch to fullscreen mode
g_windowManager.ActivateWindow(WINDOW_FULLSCREEN_VIDEO);
return true;
@@ -5876,7 +5845,6 @@ bool CApplication::IsCurrentThread() const
@@ -5884,7 +5853,6 @@ bool CApplication::IsCurrentThread() const
bool CApplication::IsPresentFrame()
{
@ -1242,7 +1242,7 @@ index 34ff8d0..288175e 100644
1.7.10
From 0f81843cb7279f3b99607551967354ff30e15e4d Mon Sep 17 00:00:00 2001
From ba3a2cb07d319dc1e2fbb56c272744d0a7cbc772 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:34:39 +0200
Subject: [PATCH 05/73] videoplayer: adopt lateness detection and dropping to
@ -1784,7 +1784,7 @@ index fe7e12c..4913712 100644
1.7.10
From 4bc6ff77b121468020578f9d393e8aaae1a419f6 Mon Sep 17 00:00:00 2001
From 18bb11c657eca56a2454b15ec558b6e6b126a52b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:41:31 +0200
Subject: [PATCH 06/73] videoplayer: update frametime, it might change due to
@ -1811,7 +1811,7 @@ index 93908a7..4675556 100644
1.7.10
From 723a731d68b9360f9804e8711255afa62c4ce34d Mon Sep 17 00:00:00 2001
From 0f3e41aa9f5f61baad9558606ff9ccacf3ef5192 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:43:06 +0200
Subject: [PATCH 07/73] videoplayer: give streams with invalid fps a chance
@ -1838,7 +1838,7 @@ index 4675556..2ef6358 100644
1.7.10
From 60c955c30cdfcf361396e47fc92a1e1883b085fe Mon Sep 17 00:00:00 2001
From 5ea05eef35600708fa58ba121e32245d09cd491e Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:49:05 +0200
Subject: [PATCH 08/73] dvdplayer: allow rewinding at end of stream, do a seek
@ -1878,7 +1878,7 @@ index 315d64a..6fcb6b3 100644
1.7.10
From 8d237cf023501560fc394679819463034a209413 Mon Sep 17 00:00:00 2001
From d42b9a3ed15f855f9e4aecaae176f8aeeb4b8da2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Sep 2012 16:05:21 +0200
Subject: [PATCH 09/73] video player: present correct pts to user for a/v sync
@ -1972,7 +1972,7 @@ index 4913712..509d5f7 100644
1.7.10
From 04a6a8b4ca29c17da6bbb9591685922b2f6f1442 Mon Sep 17 00:00:00 2001
From fba7871aacd8c0b7cac5eafdc4d3da5d3724cf79 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 11:02:29 +0200
Subject: [PATCH 10/73] vaapi: adopt to buffering in renderer
@ -2033,7 +2033,7 @@ index 863edc4..417cbc0 100644
1.7.10
From 4d237410264bbff9c4ac373de498f80ecb15f7a3 Mon Sep 17 00:00:00 2001
From b8f4a9b323ceea4950624525c88339fb2a23ebe7 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 7 Apr 2012 09:19:00 +0200
Subject: [PATCH 11/73] vdpau: redesign
@ -8196,7 +8196,7 @@ index e7af3cb..2dd8a9f 100644
1.7.10
From c088467d9d0955051a510dadbddb270ddc3e3c20 Mon Sep 17 00:00:00 2001
From ee1ed2c835620021278e38a6e7be94cfde073a78 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 25 Sep 2012 12:14:15 +0200
Subject: [PATCH 12/73] linuxrenderer: drop method RenderMultiPass
@ -8249,7 +8249,7 @@ index 3218cd5..afc78c2 100644
1.7.10
From 0de3939247a63509e6bfab2e77c298eaa28aa29c Mon Sep 17 00:00:00 2001
From 267f61079ae6a4f77fb5c068eecb0d1aeddd0337 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 25 Sep 2012 13:20:47 +0200
Subject: [PATCH 13/73] linuxrenderer: implement progressive weave for vdpau
@ -8380,7 +8380,7 @@ index afc78c2..2fc34ae 100644
1.7.10
From c12380f4b9c9c2671bfd1ebd3e29ba7cd83ac95e Mon Sep 17 00:00:00 2001
From 4c76478000f03a2460c407a66a779b2232c186c5 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:22:05 +0200
Subject: [PATCH 14/73] X11: ditch SDL for video and window events
@ -8399,10 +8399,10 @@ Subject: [PATCH 14/73] 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 9a7b900..fc8e721 100644
index b623250..3a1d6a1 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -790,7 +790,7 @@ bool CApplication::CreateGUI()
@@ -794,7 +794,7 @@ bool CApplication::CreateGUI()
uint32_t sdlFlags = 0;
@ -9867,7 +9867,7 @@ index 2dd8a9f..9616d17 100644
1.7.10
From 58fa894afaffbc990ee1ab87ff55db30e36ab2c2 Mon Sep 17 00:00:00 2001
From 9fc77631a47445e67b587d3c2d967c8415ef1601 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:24:22 +0200
Subject: [PATCH 15/73] X11: Add xbmc icon
@ -10059,7 +10059,7 @@ index 9616d17..debf714 100644
1.7.10
From cad2ac7f357906f10f100a038ff28e83a69c68e8 Mon Sep 17 00:00:00 2001
From 86a25b3b4355259720f5f54f6fe5650710873911 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 14:11:26 +0200
Subject: [PATCH 16/73] X11: add SDL joystick until we have a better solution
@ -10116,7 +10116,7 @@ index 24477ae..2ec86a8 100644
1.7.10
From fdefd4cf296518f31ad1165268fccd651e08dd3c Mon Sep 17 00:00:00 2001
From 992db82a2cc2d9e8af6388f67e8a2890c7742726 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 12:35:55 +0200
Subject: [PATCH 17/73] X11: factor out code handling device reset
@ -10183,7 +10183,7 @@ index debf714..8c28e3f 100644
1.7.10
From 9a409794d1eb8ee0c4b0b1124dea7dd30af32c06 Mon Sep 17 00:00:00 2001
From d6f428a5369ef66336e3f7f07e2dedfc0d1d8f7f Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:02:00 +0200
Subject: [PATCH 18/73] X11: move xrandr events to WinEventsX11
@ -10330,7 +10330,7 @@ index 70557d0..1cce843 100644
1.7.10
From 1dc579a2d5c608cfd4f799971759d18cbd2957e5 Mon Sep 17 00:00:00 2001
From daf0f02f96f6a640c06b50a0823e1f1858027c85 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 12 Apr 2012 15:43:56 +0200
Subject: [PATCH 19/73] xrandr: remove method RestoreState
@ -10412,7 +10412,7 @@ index 2a269d0..5b64633 100644
1.7.10
From 4a6f0e986fc27b356041a4b1bb989e0e594c8aa7 Mon Sep 17 00:00:00 2001
From e8b72dbf152bb1a2ff380d604e0fd9bbd7451994 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 13:17:10 +0200
Subject: [PATCH 20/73] xrandr: observe orientation
@ -10584,7 +10584,7 @@ index 5b64633..618bd68 100644
1.7.10
From 97e5811e05a4ecde7249b2f76283729ff300fda9 Mon Sep 17 00:00:00 2001
From a89e12b3ac29d108c32a554e93cb94f1cb2afc75 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:54:15 +0200
Subject: [PATCH 21/73] xrandr: allow getting info for multiple screen's
@ -10762,7 +10762,7 @@ index 618bd68..0824af5 100644
1.7.10
From 2b379b9ce21b6d61b44b647b79ef3587dbbcf0ec Mon Sep 17 00:00:00 2001
From 748512b3692f1f4cec63082dd9dc4d996277d44a Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:44:00 +0200
Subject: [PATCH 22/73] X11: fix multi-head setups
@ -11497,7 +11497,7 @@ index 93cf5db..71034fc 100644
1.7.10
From 2a747f13a0a50dea0883d0d3c701ef290235a99b Mon Sep 17 00:00:00 2001
From fcc6a223fdca36b95327dab99758255e7be0e69e Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:36:32 +0200
Subject: [PATCH 23/73] X11: remove all DefaultScreen and RootWindow macros
@ -11568,7 +11568,7 @@ index f858f88..d192697 100644
1.7.10
From cf018ebbf1eae8f5ae2914ef347aac5f963c0d71 Mon Sep 17 00:00:00 2001
From 019079003538369000d57b26a534a68f61ad6256 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:45:22 +0200
Subject: [PATCH 24/73] X11: remove all DefaultScreen and RootWindow macros
@ -11643,7 +11643,7 @@ index 9785fe7..0004e07 100644
1.7.10
From 5d8bfcd52e5a189515629c15c73434ef6c6bcc88 Mon Sep 17 00:00:00 2001
From 770cdec440e330d23629cc70153a5a05c3ddf9b7 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 20 Jun 2012 17:37:11 +0200
Subject: [PATCH 25/73] X11: recreate gl context after output has changed
@ -11797,7 +11797,7 @@ index d192697..0f2d1d2 100644
1.7.10
From bd9a29b7661c75152174959f9f269f32c13a658b Mon Sep 17 00:00:00 2001
From 097d10727fc8e75a3976850782d3e8da74482140 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:06:25 +0200
Subject: [PATCH 26/73] X11: hook video reference clock in windowing
@ -12005,7 +12005,7 @@ index dcc4f09..7eb6317 100644
1.7.10
From 702f79eab647ec68030c99d6113976f3c602e87c Mon Sep 17 00:00:00 2001
From 88e10ce5f4b4172129dd258b91ee4d7b6a6ecaec Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 21 Jun 2012 17:26:51 +0200
Subject: [PATCH 27/73] X11: fix video calibrations
@ -12113,7 +12113,7 @@ index cc28f56..c046c86 100644
1.7.10
From 07920e322c9770ebb99becd104ebce0789c502fa Mon Sep 17 00:00:00 2001
From 96ccf3d52796fdba75d37a18e9b514814657f332 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:00:26 +0200
Subject: [PATCH 28/73] X11: deactivate screen saver on startup
@ -12186,7 +12186,7 @@ index c046c86..e953d2d 100644
1.7.10
From 835bcc9c7fd477012492ffc4cad2bdd9ce506064 Mon Sep 17 00:00:00 2001
From 305cd979dbf8226fa8826f410172f3df8caa4811 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:10:09 +0200
Subject: [PATCH 29/73] X11: change method of going full-screen
@ -12233,7 +12233,7 @@ index b3e7ab5..91f92c1 100644
1.7.10
From e2442797ff82b3ed8053f1a6422863ffce9cbe5f Mon Sep 17 00:00:00 2001
From ded35a8abe03367f8b316106e2062c1d0a44fc02 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Jun 2012 19:12:39 +0200
Subject: [PATCH 30/73] X11: reset key repeat and key modifier on focus lost
@ -12268,7 +12268,7 @@ index 6c22358..d86205d 100644
1.7.10
From 77a22163a7f611e9183b7cd0b817fc51a42d45de Mon Sep 17 00:00:00 2001
From ef601448e65346a8c7746cb1c470269a66f9afa0 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:18:46 +0200
Subject: [PATCH 31/73] X11: replace custom utf8 to unicode with charset
@ -12488,7 +12488,7 @@ index 6100933..72955ad 100644
1.7.10
From e060b3197bbac54b79b604bbbf9a8e86257980f5 Mon Sep 17 00:00:00 2001
From 3d9931214dc45ed6442e39f2576175d90879e413 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:23:54 +0200
Subject: [PATCH 32/73] X11: fixed invalid usage of sizeof() (squash into x11
@ -12555,7 +12555,7 @@ index 72955ad..102a076 100644
1.7.10
From c52af3ba68292f08331cbbbc940dfcea838a2f44 Mon Sep 17 00:00:00 2001
From 8b292cf47d12a0e8e1c980e9187074f5da30582e Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 9 Jun 2012 18:23:53 +0200
Subject: [PATCH 33/73] add missing keys to xbmc keytable
@ -12581,7 +12581,7 @@ index aaf65ba..9d7922f 100644
1.7.10
From 25587ee807eca2fc9dde4528e3fc930b337e38b0 Mon Sep 17 00:00:00 2001
From 285cb8393ff2c80aef5b0f8fd6f32cb24160fa66 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 16 Mar 2012 15:57:51 +0100
Subject: [PATCH 34/73] videorefclock: temp deactivate of nv settings
@ -12607,7 +12607,7 @@ index fa8e35a..85e36c7 100644
1.7.10
From 4f8a95de09408321e2df3da891536c314fe3b4d2 Mon Sep 17 00:00:00 2001
From f9326bbe9799df7e48baedd4c29a5084cc7f291d Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 09:09:09 +0200
Subject: [PATCH 35/73] videorefclock: ask graphics context for refresh rate
@ -12641,7 +12641,7 @@ index 85e36c7..8209163 100644
1.7.10
From 85d81f0c933cb0a75c2c21de86b4065e3db86002 Mon Sep 17 00:00:00 2001
From 335cfdabc94f26144a021484bef565280fdb468c Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 9 Jul 2012 14:00:18 +0200
Subject: [PATCH 36/73] X11: fix icon texture after
@ -12752,7 +12752,7 @@ index 91f92c1..174ccef 100644
1.7.10
From 111c2f8fd0f6b698fbff0fda6dc6c17ce3644626 Mon Sep 17 00:00:00 2001
From b88e65666f467ccd3ab90a2cdc9cf90f32676667 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 10 Jul 2012 11:14:12 +0200
Subject: [PATCH 37/73] X11: check for window manager
@ -12876,7 +12876,7 @@ index e953d2d..0b7c10a 100644
1.7.10
From f1051e1991e5ef5d83ce428b841ac365082042ec Mon Sep 17 00:00:00 2001
From d69db585a0877699a1b21701a024c5a02cea9084 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 12 Jul 2012 11:11:47 +0200
Subject: [PATCH 38/73] X11: dont set window on xrandr if no mode available
@ -12916,7 +12916,7 @@ index 4f1ae26..c11ea89 100644
1.7.10
From 83b9c33e88077d957884ee22316c218e570dc3d5 Mon Sep 17 00:00:00 2001
From 9144abbbea8aeaae193fe5d35029d8796874093d Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 26 Jul 2012 09:34:28 +0200
Subject: [PATCH 39/73] X11: fix crash after a resolution change on startup
@ -12943,7 +12943,7 @@ index c11ea89..0bd72d4 100644
1.7.10
From b8956ed57f1b683ae79d7306c7461a31c894e9a9 Mon Sep 17 00:00:00 2001
From f7b05be0696cbda0d145deb7155d409fe7f25932 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 15 Sep 2012 18:27:29 +0200
Subject: [PATCH 40/73] X11: lock graphics context in NotifyXRREvent
@ -12969,7 +12969,7 @@ index 0bd72d4..ef83133 100644
1.7.10
From aed5d244b81b1a0b171b7fea3b332decafc96c56 Mon Sep 17 00:00:00 2001
From bc501e4a04225ce1ac7eadb90fc926ba156e46f5 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 8 Oct 2011 16:45:13 +0200
Subject: [PATCH 41/73] ffmpeg: add xvba hwaccel
@ -13839,7 +13839,7 @@ index f0d9c01..0f8cf7b 100644
1.7.10
From 922cada27e255bc3f685b700c2ffa4a146f87624 Mon Sep 17 00:00:00 2001
From 1502daa2e3432e56b5c7a156754fda9d1a804f91 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 12 Apr 2012 12:09:31 +0200
Subject: [PATCH 42/73] xvba: add decoder
@ -17289,7 +17289,7 @@ index f25d10d..f6b1ea4 100644
1.7.10
From 517eda0bf58a6376a82839ab92e51b97c143edf1 Mon Sep 17 00:00:00 2001
From 5b47c760839742a585f5e1aa3f6275eb283ae564 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 23 Aug 2012 19:39:49 +0200
Subject: [PATCH 43/73] ffmpeg: add av_find_default_stream_index to interface
@ -17338,7 +17338,7 @@ index 9bda3f3..bf31fcb 100644
1.7.10
From 23be471842ae9ea7bd62c18261a5e96a11045d04 Mon Sep 17 00:00:00 2001
From 2a600a0e3acac4f668f10f81a430f2b1d24d2243 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 16:06:39 +0200
Subject: [PATCH 44/73] dvdplayer: observe pts counter overflow
@ -17627,7 +17627,7 @@ index 2b5f2e8..e0acf29 100644
1.7.10
From 66382788a903f99ba317e972ba0445fc68320750 Mon Sep 17 00:00:00 2001
From 64e55ac8d4fb589f337daba53ada52d6a8d3abf0 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 13:02:10 +0200
Subject: [PATCH 45/73] dvdplayer: avoid short screen flicker caused by
@ -17663,7 +17663,7 @@ index e5e71f3..8b02d81 100644
1.7.10
From 04f4521c1938a7ac17acd59f3bd6be59c7ba8184 Mon Sep 17 00:00:00 2001
From 3dff64b607a88901b4bad7439c39b9133b01ed00 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 16 Jun 2012 12:46:30 +0200
Subject: [PATCH 46/73] xvba: do not use vaapi if xvba is present
@ -17696,7 +17696,7 @@ index a2b9195..43a05b3 100644
1.7.10
From a133b7fa119e859ec50b9f05a33de984105234f3 Mon Sep 17 00:00:00 2001
From 3c5e2eb61270b516341c1846722f5df42ba27eec Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 12:05:50 +0200
Subject: [PATCH 47/73] vdpau: advanced settings for auto deinterlacing
@ -17765,7 +17765,7 @@ index 72718e5..aaa4702 100644
1.7.10
From 62540aeaa356823bd34e9367ac39eef23a6e4ce4 Mon Sep 17 00:00:00 2001
From 4ecb573a4578240c76d47edfa071a2872285c0ef Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 13:01:08 +0200
Subject: [PATCH 48/73] dvdplayer: correct determination if video is playing
@ -17801,7 +17801,7 @@ index 6fcb6b3..f76691d 100644
1.7.10
From 5a093bbd60d1ca47ed7c5e4639f28dafc1b565c1 Mon Sep 17 00:00:00 2001
From 18112c69378d18c498e5f9e0a0ca2db262be6120 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 14 Oct 2012 13:46:54 +0200
Subject: [PATCH 49/73] rendermanager: fix stuttering in non full-screen mode,
@ -17830,7 +17830,7 @@ index 0506823..b141c80 100644
1.7.10
From d0597caa2c922575efdf081d719d5665c626ffec Mon Sep 17 00:00:00 2001
From 5488ba31ed2039da5186e4e6e26c16bfae6a7cb2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 14 Oct 2012 17:54:02 +0200
Subject: [PATCH 50/73] rendermanager: forgot to set flip event if buffering
@ -17876,7 +17876,7 @@ index b141c80..9290f80 100644
1.7.10
From c485392afa608bfbcf903fa53a9dd824258c96dd Mon Sep 17 00:00:00 2001
From 3ac9979f74f43b629ea9391243697ed4168b290b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 26 Oct 2012 15:30:22 +0200
Subject: [PATCH 51/73] vdpau: fix small mem leak
@ -17902,7 +17902,7 @@ index d95797b..fec4b88 100644
1.7.10
From 9d7228a84013e409149d7b05d34545d1bdf06e27 Mon Sep 17 00:00:00 2001
From 5c6e31de5b357022878c46c94885f34e62ba9a66 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 29 Oct 2012 18:25:56 +0100
Subject: [PATCH 52/73] xvba: do not render if there is no valid texture
@ -17939,7 +17939,7 @@ index ec3606a..7c3adcb 100644
1.7.10
From 85be082db41b27cdd3824b8360dc021e17a84c22 Mon Sep 17 00:00:00 2001
From 49267751b5b4d0315c0ff850c06c2c465cd0d2a5 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 2 Nov 2012 13:20:03 +0100
Subject: [PATCH 53/73] player: fix rewind
@ -18187,7 +18187,7 @@ index 509d5f7..7cddda7 100644
1.7.10
From 024ecda241754f02ad985fab9116e33b06b8d174 Mon Sep 17 00:00:00 2001
From 42907b5fc097d5b1d9cbc3941fee44af7b5ad95a Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Fri, 2 Nov 2012 17:56:12 +0100
Subject: [PATCH 54/73] xvba: do not create decoder for surfaces larger than
@ -18227,7 +18227,7 @@ index e8e376a..b73c48a 100644
1.7.10
From 98ebb0d0232cf4a7ea2082f9f16e210a39e983e8 Mon Sep 17 00:00:00 2001
From 8aacdb77cd98243077ecf2d3f7195233dcc38c15 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Sun, 4 Nov 2012 16:24:10 +0100
Subject: [PATCH 55/73] xvba: add string for available decoders - we are
@ -18257,7 +18257,7 @@ index 0cea7a9..6fb74b7 100644
1.7.10
From 84e701f7db6603a2942611d5c74ba645c625ec0d Mon Sep 17 00:00:00 2001
From fe452b364c738733b949b3c7f09a6fb8fe228978 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Thu, 22 Nov 2012 21:32:21 +0100
Subject: [PATCH 56/73] xvba: revisit Artefacts. There are more broken video
@ -18294,7 +18294,7 @@ index a077442..87af687 100644
1.7.10
From afd776e3e90a1787ce4c3392266d70368de4e164 Mon Sep 17 00:00:00 2001
From c7b995f8d10dc0171f80a4d604c5cbf0e6520a59 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 23 Nov 2012 09:42:02 +0100
Subject: [PATCH 57/73] xvba: reactivate accidently disabled
@ -18321,7 +18321,7 @@ index b73c48a..47ff25f 100644
1.7.10
From 37576c15f9e3a0c2dce593e9d9cb5a7863845de7 Mon Sep 17 00:00:00 2001
From 2e4d9701752aa760c2cc5b8ca9b247ec476026e2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 23 Nov 2012 17:41:12 +0100
Subject: [PATCH 58/73] xrandr: fix query for multiple screens
@ -18365,7 +18365,7 @@ index cc933b9..533e03d 100644
1.7.10
From bd5d572c69ee254beedb5e9339831652943ea8b4 Mon Sep 17 00:00:00 2001
From c39f8e5141d6e176f1edb0eb510fa54976915654 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Dec 2012 15:46:55 +0100
Subject: [PATCH 59/73] X11: add debug log to print out refresh after xrr
@ -18396,7 +18396,7 @@ index ef83133..76c6362 100644
1.7.10
From d418ae1053a3842eb3e6a3bbd84666a5ee3defe2 Mon Sep 17 00:00:00 2001
From 181697e9001e0568ff06098d0f2223fc4c0d8f51 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 11 Dec 2012 11:08:13 +0100
Subject: [PATCH 60/73] X11: dont call XCloseDisplay on shutdown, it crashes
@ -18424,7 +18424,7 @@ index 76c6362..e4e25b2 100644
1.7.10
From 3b700401e9aace50b5ce6c5d7ba2a2e33bb5217f Mon Sep 17 00:00:00 2001
From 87d87db6cd67fc7f7f7afa88f089eafaac1b9605 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 12 Dec 2012 09:52:17 +0100
Subject: [PATCH 61/73] vdpau: make interop gl default and remove setting,
@ -18582,7 +18582,7 @@ index 3c19a06..b9f18e4 100644
1.7.10
From a060312a4e236858bf3c9a97d663c5643796b649 Mon Sep 17 00:00:00 2001
From d468e959e2d7d888e02db3848542b5a203e007c3 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 12 Dec 2012 18:34:47 +0100
Subject: [PATCH 62/73] vdpau: drop studio level conversion
@ -18768,7 +18768,7 @@ index a4bd524..67aeec9 100644
1.7.10
From 6d03704ce1cbc7d09d684da1ced478b2b59c0b35 Mon Sep 17 00:00:00 2001
From 672e2f03b5b8d133ebfa87e0ebf20fd9f3fb0beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= <gregory.coutant@gmail.com>
Date: Wed, 12 Dec 2012 19:49:47 +0100
Subject: [PATCH 63/73] x11: support for multiple x screens
@ -18794,7 +18794,7 @@ index 533e03d..7a16488 100644
1.7.10
From 597c8449084e1e5ebfebfb31db570f7826d06517 Mon Sep 17 00:00:00 2001
From c0f54dac42fba2a522ab4f43f3f20a11a3bace3b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 12 Dec 2012 20:28:49 +0100
Subject: [PATCH 64/73] vdpau: observe ffmpeg tags for color space
@ -18901,7 +18901,7 @@ index 4d1559c..471ad68 100644
1.7.10
From 3f9308d76025ef1e31923fa9a06587f75c00f870 Mon Sep 17 00:00:00 2001
From 82584e21f05fb275853f9baca72a65b6ff0672ff Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 20 Dec 2012 19:35:38 +0100
Subject: [PATCH 65/73] fix compile error after recent change
@ -18927,7 +18927,7 @@ index b9f18e4..cacb32a 100644
1.7.10
From 213792b2678760d42740d581a1ee71e186a31c4d Mon Sep 17 00:00:00 2001
From 514833b80006796c7985e37e414137e50a0c0d43 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 24 Dec 2012 16:02:42 +0100
Subject: [PATCH 66/73] pvr: increase changes counter of stream on stream
@ -18965,7 +18965,7 @@ index 8c984f6..034e545 100644
1.7.10
From e810d3bd68e89e800fba217e88184c2df0fe4040 Mon Sep 17 00:00:00 2001
From 118041f574fa106e74e7a8ef26243ea4225643b5 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 17 Jan 2013 16:03:22 +0100
Subject: [PATCH 67/73] X11: add keymapping for XF86XK_Sleep
@ -18990,7 +18990,7 @@ index c31877e..ed31c04 100644
1.7.10
From 2cb807b2f801f06723cde1bdd636550c08fc08ab Mon Sep 17 00:00:00 2001
From adce338a8fef2247a878e52c34c8a38d2788beb3 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Sat, 12 Jan 2013 13:03:50 +0100
Subject: [PATCH 68/73] dvdplayer: Allow multithread decoding for hi10p
@ -19098,7 +19098,7 @@ index aaa4702..863e4f3 100644
1.7.10
From 5e52fa15742e1300ac394738ead4ca2792c4812c Mon Sep 17 00:00:00 2001
From a4824bb077abbf61dcc123f70e4bd78a021de2eb Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 21 Jan 2013 09:00:19 +0100
Subject: [PATCH 69/73] X11: remove toggle full screen after resume
@ -19127,7 +19127,7 @@ index a5534c9..7e2ddc6 100644
1.7.10
From e8f3e20dfb3bde4434e2aea69b34e22ba1859a31 Mon Sep 17 00:00:00 2001
From db652deb4330ab7b7f3cc83a55359e910fc2caec Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 23 Jan 2013 17:03:02 +0100
Subject: [PATCH 70/73] xrandr: set screen on mode change command
@ -19153,7 +19153,7 @@ index 7a16488..6531ba3 100644
1.7.10
From f229dba603070e1f0528d395c9d5d63f9044ae6e Mon Sep 17 00:00:00 2001
From 81a1c20546aec833174595a86db363dd058b43b4 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 23 Jan 2013 17:03:39 +0100
Subject: [PATCH 71/73] X11: recreate glx context when output changes
@ -19207,7 +19207,7 @@ index 0b7c10a..33b1739 100644
1.7.10
From ae08a23a2f4fd78139e2ebca8a4a87ab619feb0b Mon Sep 17 00:00:00 2001
From 30eaf88e0a66baab5a3a18add429d295e4a272fb Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 27 Jan 2013 12:10:19 +0100
Subject: [PATCH 72/73] vdpau: switch off de-interlacing on ff
@ -19236,7 +19236,7 @@ index 8858614..3e21d9d 100644
1.7.10
From 1ea917e026e8c5df15de6ce6276cba9e58d09d3d Mon Sep 17 00:00:00 2001
From 912b6ede1258d68c0f7cc7e57201bf1b50ae3fa7 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 2 Feb 2013 13:17:09 +0100
Subject: [PATCH 73/73] vdpau: fix mp4 part2 decoding, activate by default

0
packages/mediacenter/xbmc/patches/xbmc-995.50-disable-alt-tab.patch → packages/mediacenter/xbmc/patches.x86/xbmc-995.10-disable-alt-tab.patch
View File

0
packages/mediacenter/xbmc/patches/xbmc-995.51-remove-windowed-display-mode.patch → packages/mediacenter/xbmc/patches/xbmc-990.00-remove-windowed-display-mode.patch
View File

309
packages/mediacenter/xbmc/patches/xbmc-990.16-PR2353.patch
View File

@ -1,309 +0,0 @@
From 0a2c144355ed750e61fadabe2dde185a76064f0a Mon Sep 17 00:00:00 2001
From: montellese <montellese@xbmc.org>
Date: Fri, 1 Mar 2013 17:53:54 +0100
Subject: [PATCH] websocket: fix inability to handle multiple queued websocket
frames/messages (fixes #13848)
---
xbmc/network/TCPServer.cpp | 31 +++---
xbmc/network/websocket/WebSocket.cpp | 174 +++++++++++++++++++---------------
xbmc/network/websocket/WebSocket.h | 2 +-
3 files changed, 114 insertions(+), 93 deletions(-)
diff --git a/xbmc/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp
index 2d9fde0..e4b5984 100644
--- a/xbmc/network/TCPServer.cpp
+++ b/xbmc/network/TCPServer.cpp
@@ -654,23 +654,28 @@ void CTCPServer::CWebSocketClient::Send(const char *data, unsigned int size)
void CTCPServer::CWebSocketClient::PushBuffer(CTCPServer *host, const char *buffer, int length)
{
bool send;
- const CWebSocketMessage *msg;
- if ((msg = m_websocket->Handle(buffer, length, send)) != NULL && msg->IsComplete())
+ const CWebSocketMessage *msg = NULL;
+ size_t len = length;
+ do
{
- std::vector<const CWebSocketFrame *> frames = msg->GetFrames();
- if (send)
- {
- for (unsigned int index = 0; index < frames.size(); index++)
- Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength());
- }
- else
+ if ((msg = m_websocket->Handle(buffer, len, send)) != NULL && msg->IsComplete())
{
- for (unsigned int index = 0; index < frames.size(); index++)
- CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength());
- }
+ std::vector<const CWebSocketFrame *> frames = msg->GetFrames();
+ if (send)
+ {
+ for (unsigned int index = 0; index < frames.size(); index++)
+ Send(frames.at(index)->GetFrameData(), (unsigned int)frames.at(index)->GetFrameLength());
+ }
+ else
+ {
+ for (unsigned int index = 0; index < frames.size(); index++)
+ CTCPClient::PushBuffer(host, frames.at(index)->GetApplicationData(), (int)frames.at(index)->GetLength());
+ }
- delete msg;
+ delete msg;
+ }
}
+ while (len > 0 && msg != NULL);
if (m_websocket->GetState() == WebSocketStateClosed)
Disconnect();
diff --git a/xbmc/network/websocket/WebSocket.cpp b/xbmc/network/websocket/WebSocket.cpp
index 94e7ab0..5008073 100644
--- a/xbmc/network/websocket/WebSocket.cpp
+++ b/xbmc/network/websocket/WebSocket.cpp
@@ -80,11 +80,11 @@
// Get the MASK flag
m_masked = ((m_data[1] & MASK_MASK) == MASK_MASK);
- // Get the playload length
+ // Get the payload length
m_length = (uint64_t)(m_data[1] & MASK_LENGTH);
- if ((m_length <= 125 && length < m_length + LENGTH_MIN) ||
- (m_length == 126 && length < LENGTH_MIN + 2) ||
- (m_length == 127 && length < LENGTH_MIN + 8))
+ if ((m_length <= 125 && m_lengthFrame < m_length + LENGTH_MIN) ||
+ (m_length == 126 && m_lengthFrame < LENGTH_MIN + 2) ||
+ (m_length == 127 && m_lengthFrame < LENGTH_MIN + 8))
{
CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
reset();
@@ -110,7 +110,7 @@
offset = 8;
}
- if (length < LENGTH_MIN + offset + m_length)
+ if (m_lengthFrame < LENGTH_MIN + offset + m_length)
{
CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
reset();
@@ -124,12 +124,8 @@
offset += 4;
}
- if (length != LENGTH_MIN + offset + m_length)
- {
- CLog::Log(LOGINFO, "WebSocket: Frame with invalid length received");
- reset();
- return;
- }
+ if (m_lengthFrame != LENGTH_MIN + offset + m_length)
+ m_lengthFrame = LENGTH_MIN + offset + m_length;
// Get application data
if (m_length > 0)
@@ -305,102 +301,122 @@ void CWebSocketMessage::Clear()
m_frames.clear();
}
-const CWebSocketMessage* CWebSocket::Handle(const char *buffer, size_t length, bool &send)
+const CWebSocketMessage* CWebSocket::Handle(const char* &buffer, size_t &length, bool &send)
{
send = false;
- switch (m_state)
+ while (length > 0)
{
- case WebSocketStateConnected:
+ switch (m_state)
{
- CWebSocketFrame *frame = GetFrame(buffer, length);
- if (!frame->IsValid())
+ case WebSocketStateConnected:
{
- CLog::Log(LOGINFO, "WebSocket: Invalid frame received");
- delete frame;
- return NULL;
- }
-
- if (frame->IsControlFrame())
- {
- if (!frame->IsFinal())
+ CWebSocketFrame *frame = GetFrame(buffer, length);
+ if (!frame->IsValid())
{
+ CLog::Log(LOGINFO, "WebSocket: Invalid frame received");
delete frame;
return NULL;
}
- CWebSocketMessage *msg = NULL;
- switch (frame->GetOpcode())
+ // adjust the length and the buffer values
+ length -= frame->GetFrameLength();
+ buffer += frame->GetFrameLength();
+
+ if (frame->IsControlFrame())
{
- case WebSocketPing:
- msg = GetMessage();
- if (msg != NULL)
- msg->AddFrame(Pong(frame->GetApplicationData()));
- break;
+ if (!frame->IsFinal())
+ {
+ delete frame;
+ return NULL;
+ }
+
+ CWebSocketMessage *msg = NULL;
+ switch (frame->GetOpcode())
+ {
+ case WebSocketPing:
+ msg = GetMessage();
+ if (msg != NULL)
+ msg->AddFrame(Pong(frame->GetApplicationData()));
+ break;
- case WebSocketConnectionClose:
- CLog::Log(LOGINFO, "WebSocket: connection closed by client");
-
- msg = GetMessage();
- if (msg != NULL)
- msg->AddFrame(Close());
-
- m_state = WebSocketStateClosed;
- break;
-
- case WebSocketContinuationFrame:
- case WebSocketTextFrame:
- case WebSocketBinaryFrame:
- case WebSocketPong:
- case WebSocketUnknownFrame:
- default:
- break;
+ case WebSocketConnectionClose:
+ CLog::Log(LOGINFO, "WebSocket: connection closed by client");
+
+ msg = GetMessage();
+ if (msg != NULL)
+ msg->AddFrame(Close());
+
+ m_state = WebSocketStateClosed;
+ break;
+
+ case WebSocketContinuationFrame:
+ case WebSocketTextFrame:
+ case WebSocketBinaryFrame:
+ case WebSocketPong:
+ case WebSocketUnknownFrame:
+ default:
+ break;
+ }
+
+ delete frame;
+
+ if (msg != NULL)
+ send = true;
+
+ return msg;
}
- delete frame;
+ if (m_message == NULL && (m_message = GetMessage()) == NULL)
+ {
+ CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message");
+ delete frame;
+ return NULL;
+ }
- if (msg != NULL)
- send = true;
+ m_message->AddFrame(frame);
+ if (!m_message->IsComplete())
+ {
+ if (length > 0)
+ continue;
+ else
+ return NULL;
+ }
+ CWebSocketMessage *msg = m_message;
+ m_message = NULL;
return msg;
}
- if (m_message == NULL && (m_message = GetMessage()) == NULL)
+ case WebSocketStateClosing:
{
- CLog::Log(LOGINFO, "WebSocket: Could not allocate a new websocket message");
- delete frame;
- return NULL;
- }
+ CWebSocketFrame *frame = GetFrame(buffer, length);
- m_message->AddFrame(frame);
- if (!m_message->IsComplete())
- return NULL;
+ if (frame->IsValid())
+ {
+ // adjust the length and the buffer values
+ length -= frame->GetFrameLength();
+ buffer += frame->GetFrameLength();
+ }
- CWebSocketMessage *msg = m_message;
- m_message = NULL;
- return msg;
- }
+ if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose)
+ {
+ CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)");
+ delete frame;
+ return NULL;
+ }
- case WebSocketStateClosing:
- {
- CWebSocketFrame *frame = GetFrame(buffer, length);
- if (!frame->IsValid() || frame->GetOpcode() == WebSocketConnectionClose)
- {
- CLog::Log(LOGINFO, "WebSocket: Invalid or unexpected frame received (only closing handshake expected)");
- delete frame;
+ m_state = WebSocketStateClosed;
return NULL;
}
- m_state = WebSocketStateClosed;
- return NULL;
+ case WebSocketStateNotConnected:
+ case WebSocketStateClosed:
+ case WebSocketStateHandshaking:
+ default:
+ CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state");
+ return NULL;
}
-
- case WebSocketStateNotConnected:
- case WebSocketStateClosed:
- case WebSocketStateHandshaking:
- default:
- CLog::Log(LOGINFO, "WebSocket: No frame expected in the current state");
- return NULL;
}
return NULL;
diff --git a/xbmc/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h
index bbfaa89..e0d3cae 100644
--- a/xbmc/network/websocket/WebSocket.h
+++ b/xbmc/network/websocket/WebSocket.h
@@ -122,7 +122,7 @@ class CWebSocket
WebSocketState GetState() { return m_state; }
virtual bool Handshake(const char* data, size_t length, std::string &response) = 0;
- virtual const CWebSocketMessage* Handle(const char *buffer, size_t length, bool &send);
+ virtual const CWebSocketMessage* Handle(const char* &buffer, size_t &length, bool &send);
virtual const CWebSocketMessage* Send(WebSocketFrameOpcode opcode, const char* data = NULL, uint32_t length = 0);
virtual const CWebSocketFrame* Ping(const char* data = NULL) const = 0;
virtual const CWebSocketFrame* Pong(const char* data = NULL) const = 0;
--
1.7.10

64
packages/mediacenter/xbmc/patches/xbmc-995.09-revert-rpi-fixes.patch
View File

@ -1,64 +0,0 @@
diff -Naur xbmc-12.0.2/xbmc/cores/omxplayer/OMXPlayerVideo.cpp xbmc-12.0.2.patch/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
--- xbmc-12.0.2/xbmc/cores/omxplayer/OMXPlayerVideo.cpp 2013-02-19 19:04:39.000000000 +0100
+++ xbmc-12.0.2.patch/xbmc/cores/omxplayer/OMXPlayerVideo.cpp 2013-02-22 18:18:47.298296862 +0100
@@ -124,7 +124,6 @@
m_started = false;
m_stalled = m_messageQueue.GetPacketCount(CDVDMsg::DEMUXER_PACKET) == 0;
m_autosync = 1;
- m_iSleepEndTime = DVD_NOPTS_VALUE;
m_audio_count = m_av_clock->HasAudio();
@@ -453,23 +452,13 @@
m_dropbase = 0.0f;
#endif
- // DVDPlayer sleeps until m_iSleepEndTime here before calling FlipPage.
- // Video playback in asynchronous in OMXPlayer, so we don't want to do that here, as it prevents the video fifo from being kept full.
- // So, we keep track of when FlipPage would have been called on DVDPlayer and return early if it is not time.
- // m_iSleepEndTime == DVD_NOPTS_VALUE means we are not waiting to call FlipPage, otherwise it is the time we want to call FlipPage
- if (m_iSleepEndTime == DVD_NOPTS_VALUE) {
- m_iSleepEndTime = iCurrentClock + iSleepTime;
- }
-
- if (!CThread::m_bStop && m_av_clock->GetAbsoluteClock(false) < m_iSleepEndTime + DVD_MSEC_TO_TIME(500))
- return;
-
double pts_media = m_av_clock->OMXMediaTime(false, false);
ProcessOverlays(iGroupId, pts_media);
- g_renderManager.FlipPage(CThread::m_bStop, m_iSleepEndTime / DVD_TIME_BASE, -1, FS_NONE);
+ while(!CThread::m_bStop && m_av_clock->GetAbsoluteClock(false) < (iCurrentClock + iSleepTime + DVD_MSEC_TO_TIME(500)) )
+ Sleep(1);
- m_iSleepEndTime = DVD_NOPTS_VALUE;
+ g_renderManager.FlipPage(CThread::m_bStop, (iCurrentClock + iSleepTime) / DVD_TIME_BASE, -1, FS_NONE);
//m_av_clock->WaitAbsoluteClock((iCurrentClock + iSleepTime));
}
@@ -580,14 +569,12 @@
m_av_clock->OMXReset(false);
m_av_clock->UnLock();
m_started = false;
- m_iSleepEndTime = DVD_NOPTS_VALUE;
}
else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (COMXPlayerVideo::Flush())
{
CLog::Log(LOGDEBUG, "COMXPlayerVideo - CDVDMsg::GENERAL_FLUSH");
m_stalled = true;
m_started = false;
- m_iSleepEndTime = DVD_NOPTS_VALUE;
m_av_clock->Lock();
m_av_clock->OMXStop(false);
m_omxVideo.Reset();
diff -Naur xbmc-12.0.2/xbmc/cores/omxplayer/OMXPlayerVideo.h xbmc-12.0.2.patch/xbmc/cores/omxplayer/OMXPlayerVideo.h
--- xbmc-12.0.2/xbmc/cores/omxplayer/OMXPlayerVideo.h 2013-02-19 19:04:39.000000000 +0100
+++ xbmc-12.0.2.patch/xbmc/cores/omxplayer/OMXPlayerVideo.h 2013-02-22 18:18:44.166310881 +0100
@@ -49,7 +49,6 @@
bool m_open;
CDVDStreamInfo m_hints;
double m_iCurrentPts;
- double m_iSleepEndTime;
OMXClock *m_av_clock;
COMXVideo m_omxVideo;
float m_fFrameRate;

1079
packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch
View File

File diff suppressed because it is too large Load Diff

32
packages/mediacenter/xbmc/unpack Executable file
View File

@ -0,0 +1,32 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
echo "### Applying architecture based patches ###"
if [ ! $TARGET_ARCH = arm ]; then
for patch in `ls $PKG_DIR/patches.x86`; do
cat $PKG_DIR/patches.x86/$patch | patch -d \
`echo $PKG_BUILD | cut -f1 -d\ ` -p1
done
fi

4
projects/ARCTIC_MC/linux/linux.x86_64.conf
View File

@ -457,12 +457,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_POWERNOW_K8 is not set
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_X86_P4_CLOCKMOD=y
#
# shared options
#
# CONFIG_X86_SPEEDSTEP_LIB is not set
CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y

4
projects/Generic/linux/linux.i386.conf
View File

@ -502,7 +502,7 @@ CONFIG_X86_POWERNOW_K8=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SPEEDSTEP_ICH is not set
# CONFIG_X86_SPEEDSTEP_SMI is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_X86_P4_CLOCKMOD=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_LONGRUN is not set
# CONFIG_X86_LONGHAUL is not set
@ -511,7 +511,7 @@ CONFIG_X86_POWERNOW_K8=y
#
# shared options
#
# CONFIG_X86_SPEEDSTEP_LIB is not set
CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y

4
projects/Generic_OSS/linux/linux.i386.conf
View File

@ -502,7 +502,7 @@ CONFIG_X86_POWERNOW_K8=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SPEEDSTEP_ICH is not set
# CONFIG_X86_SPEEDSTEP_SMI is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_X86_P4_CLOCKMOD=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_LONGRUN is not set
# CONFIG_X86_LONGHAUL is not set
@ -511,7 +511,7 @@ CONFIG_X86_POWERNOW_K8=y
#
# shared options
#
# CONFIG_X86_SPEEDSTEP_LIB is not set
CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y

4
projects/ION/linux/linux.i386.conf
View File

@ -498,7 +498,7 @@ CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_SPEEDSTEP_ICH is not set
# CONFIG_X86_SPEEDSTEP_SMI is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_X86_P4_CLOCKMOD=y
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
# CONFIG_X86_LONGRUN is not set
# CONFIG_X86_LONGHAUL is not set
@ -507,7 +507,7 @@ CONFIG_X86_ACPI_CPUFREQ=y
#
# shared options
#
# CONFIG_X86_SPEEDSTEP_LIB is not set
CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y

4
projects/ION/linux/linux.x86_64.conf
View File

@ -457,12 +457,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_POWERNOW_K8 is not set
# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
# CONFIG_X86_P4_CLOCKMOD is not set
CONFIG_X86_P4_CLOCKMOD=y
#
# shared options
#
# CONFIG_X86_SPEEDSTEP_LIB is not set
CONFIG_X86_SPEEDSTEP_LIB=y
CONFIG_CPU_IDLE=y
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y

2
tools/mkpkg/mkpkg_xbmc-frodo
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.3"
PKG_VERSION="12.0.4"
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
DEST_DIR="$PKG_NAME-frodo"