jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2013-11-20 04:07:45 +01:00
commit 24ee98c9e8
8 changed files with 188 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-addon-xvdr/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-addon-xvdr"
PKG_VERSION="6c95579"
PKG_VERSION="f267086"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

29
packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch
View File

@ -1,29 +0,0 @@
From 240760878f5ffdddeaa5eccd8df23ace2c176004 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 15 Nov 2013 18:53:24 +0200
Subject: [PATCH] bump xbmc.gui
---
addons/library.xbmc.gui/libXBMC_gui.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/library.xbmc.gui/libXBMC_gui.h b/addons/library.xbmc.gui/libXBMC_gui.h
index dd916f9..f52ad4c 100644
--- a/addons/library.xbmc.gui/libXBMC_gui.h
+++ b/addons/library.xbmc.gui/libXBMC_gui.h
@@ -36,10 +36,10 @@ typedef void* GUIHANDLE;
#endif
/* current ADDONGUI API version */
-#define XBMC_GUI_API_VERSION "1.0.0"
+#define XBMC_GUI_API_VERSION "5.0.1"
/* min. ADDONGUI API version */
-#define XBMC_GUI_MIN_API_VERSION "1.0.0"
+#define XBMC_GUI_MIN_API_VERSION "5.0.1"
#define ADDON_ACTION_PREVIOUS_MENU 10
#define ADDON_ACTION_CLOSE_DIALOG 51
--
1.7.2.5

33
packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch
View File

@ -1,33 +0,0 @@
From 7c1bae9cc4819ed9148354fd878824b40bd7a6a5 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 6 Oct 2013 17:48:50 +0300
Subject: [PATCH] fix scrambled/hd channel scan
from wirbelscan:
#define SCAN_TV ( 1 << 0 )
#define SCAN_RADIO ( 1 << 1 )
#define SCAN_FTA ( 1 << 2 )
#define SCAN_SCRAMBLED ( 1 << 3 )
#define SCAN_HD ( 1 << 4 )
---
src/libxvdr/include/xvdr/dataset.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libxvdr/include/xvdr/dataset.h b/src/libxvdr/include/xvdr/dataset.h
index 53b0540..36d9a94 100644
--- a/src/libxvdr/include/xvdr/dataset.h
+++ b/src/libxvdr/include/xvdr/dataset.h
@@ -287,8 +287,8 @@ public:
FLAG_TV = 1,
FLAG_RADIO = 2,
FLAG_FTA = 4,
- FLAG_SCRAMBLED = 16,
- FLAG_HDTV = 32
+ FLAG_SCRAMBLED = 8,
+ FLAG_HDTV = 16
} Flags;
Verbosity verbosity;
--
1.7.2.5

113
packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch
View File

@ -1,113 +0,0 @@
From 92dbf9fe433197f107c7a88f026c032546553d64 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 11 Nov 2013 22:02:24 +0200
Subject: [PATCH] sync with xbmc. bump pvr api to 1.9.0
---
src/xvdr/XBMCAddon.cpp | 3 +++
src/xvdr/include/xbmc_pvr_dll.h | 23 +++++++++++++++++++++++
src/xvdr/include/xbmc_pvr_types.h | 12 +++++++++---
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/xvdr/XBMCAddon.cpp b/src/xvdr/XBMCAddon.cpp
index 58fff40..709b43c 100644
--- a/src/xvdr/XBMCAddon.cpp
+++ b/src/xvdr/XBMCAddon.cpp
@@ -902,4 +902,7 @@ const char * GetLiveStreamURL(const PVR_CHANNEL &channel) { return ""; }
unsigned int GetChannelSwitchDelay(void) { return 0; }
void SetSpeed(int speed) {};
+time_t GetPlayingTime() { return 0; }
+time_t GetBufferTimeStart() { return 0; }
+time_t GetBufferTimeEnd() { return 0; }
}
diff --git a/src/xvdr/include/xbmc_pvr_dll.h b/src/xvdr/include/xbmc_pvr_dll.h
index 39f52a0..50012b0 100644
--- a/src/xvdr/include/xbmc_pvr_dll.h
+++ b/src/xvdr/include/xbmc_pvr_dll.h
@@ -576,6 +576,25 @@ extern "C"
void SetSpeed(int speed);
/*!
+ * Get actual playing time from addon. With timeshift enabled this is
+ * different to live.
+ * @return time as UTC
+ */
+ time_t GetPlayingTime();
+
+ /*!
+ * Get time of oldest packet in timeshift buffer
+ * @return time as UTC
+ */
+ time_t GetBufferTimeStart();
+
+ /*!
+ * Get time of latest packet in timeshift buffer
+ * @return time as UTC
+ */
+ time_t GetBufferTimeEnd();
+
+ /*!
* Called by XBMC to assign the function pointers of this add-on to pClient.
* @param pClient The struct to assign the function pointers to.
*/
@@ -651,6 +670,10 @@ extern "C"
pClient->DemuxAbort = DemuxAbort;
pClient->DemuxFlush = DemuxFlush;
pClient->DemuxRead = DemuxRead;
+
+ pClient->GetPlayingTime = GetPlayingTime;
+ pClient->GetBufferTimeStart = GetBufferTimeStart;
+ pClient->GetBufferTimeEnd = GetBufferTimeEnd;
};
};
diff --git a/src/xvdr/include/xbmc_pvr_types.h b/src/xvdr/include/xbmc_pvr_types.h
index e8dd903..94e1a59 100644
--- a/src/xvdr/include/xbmc_pvr_types.h
+++ b/src/xvdr/include/xbmc_pvr_types.h
@@ -53,7 +53,7 @@ struct DemuxPacket;
#undef PRAGMA_PACK_BEGIN
#undef PRAGMA_PACK_END
-#if defined(__GNUC__) && !defined(__MINGW32__)
+#if defined(__GNUC__)
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
#define ATTRIBUTE_PACKED __attribute__ ((packed))
#define PRAGMA_PACK 0
@@ -75,10 +75,10 @@ struct DemuxPacket;
#define PVR_STREAM_MAX_STREAMS 20
/* current PVR API version */
-#define XBMC_PVR_API_VERSION "1.8.1"
+#define XBMC_PVR_API_VERSION "1.9.0"
/* min. PVR API version */
-#define XBMC_PVR_MIN_API_VERSION "1.8.0"
+#define XBMC_PVR_MIN_API_VERSION "1.9.0"
#ifdef __cplusplus
extern "C" {
@@ -194,6 +194,9 @@ extern "C" {
{
char strAdapterName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the adapter that's being used */
char strAdapterStatus[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) status of the adapter that's being used */
+ char strServiceName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current service */
+ char strProviderName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current service's provider */
+ char strMuxName[PVR_ADDON_NAME_STRING_LENGTH]; /*!< @brief (optional) name of the current mux */
int iSNR; /*!< @brief (optional) signal/noise ratio */
int iSignal; /*!< @brief (optional) signal strength */
long iBER; /*!< @brief (optional) bit error rate */
@@ -392,6 +395,9 @@ extern "C" {
bool (__cdecl* CanSeekStream)(void);
bool (__cdecl* SeekTime)(int, bool, double*);
void (__cdecl* SetSpeed)(int);
+ time_t (__cdecl* GetPlayingTime)(void);
+ time_t (__cdecl* GetBufferTimeStart)(void);
+ time_t (__cdecl* GetBufferTimeEnd)(void);
} PVRClient;
#ifdef __cplusplus
--
1.7.2.5

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

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13.alpha-f8b0614"
PKG_VERSION="13.alpha-cca24dd"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/package.mk
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="13.alpha-f8b0614"
PKG_VERSION="13.alpha-cca24dd"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

297
packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-97fecf6.patch
View File

@ -1,4 +1,4 @@
From 7c83ec63dcfd6ee12249583b5125774611a9aafb Mon Sep 17 00:00:00 2001
From 5ff426ea570a0afd057fbb3f31a5d89c82ed217e Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:34:39 +0200
Subject: [PATCH 01/92] videoplayer: adapt lateness detection and dropping to
@ -582,7 +582,7 @@ index f8ad541..186e271 100644
1.8.4
From 1b941747a4a526ee08576fd3ca177972ef3b2852 Mon Sep 17 00:00:00 2001
From 4a58ee99c0ffc012df8fd4545e45743e56438852 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Sep 2012 16:05:21 +0200
Subject: [PATCH 02/92] video player: present correct pts to user for a/v sync
@ -653,7 +653,7 @@ index 186e271..59c7f09 100644
1.8.4
From 00b96de3b0ed33def258a8ec67e89ec4506e5b7d Mon Sep 17 00:00:00 2001
From 30d65751db8ca7579b1ba0e66e0708bd23fac489 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 16 Feb 2013 18:25:53 +0100
Subject: [PATCH 03/92] videoplayer: some rework and documentation
@ -767,7 +767,7 @@ index 587ea4b..27a61bd 100644
1.8.4
From 97b024d24869b0fcf8f114a5d5ab0c2137fa7855 Mon Sep 17 00:00:00 2001
From 19294091af8c83bb3aeff3ffd1d542449ca04c0c Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 1 Jun 2013 11:21:19 +0200
Subject: [PATCH 04/92] renderer: bump buffers to 5
@ -793,7 +793,7 @@ index a61d3cf..df5fe0e 100644
1.8.4
From 6d0e581e2aeca8de3f0d9fcc8ca89e1b1a2f1183 Mon Sep 17 00:00:00 2001
From e08fe026a8f4929b8be1c9e537eccc214736a61c Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:41:31 +0200
Subject: [PATCH 05/92] videoplayer: update frametime, it might change due to
@ -820,7 +820,7 @@ index 27a61bd..8e772e3 100644
1.8.4
From d6d3683e5846eefca72469e6e833aa6cad1411ad Mon Sep 17 00:00:00 2001
From add7ae4a09e28a38a9680f64d3c253be1ce5606e Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:43:06 +0200
Subject: [PATCH 06/92] videoplayer: give streams with invalid fps a chance for
@ -847,7 +847,7 @@ index 8e772e3..150a796 100644
1.8.4
From 3033d0426ff3b89e5de2ebd67bdea57c49e5902b Mon Sep 17 00:00:00 2001
From 061f199d713158352253c29cb663127f7809b17d Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 28 May 2012 10:49:05 +0200
Subject: [PATCH 07/92] dvdplayer: allow rewinding at end of stream, do a seek
@ -858,10 +858,10 @@ Subject: [PATCH 07/92] 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 1dbc732..8d19ae5 100644
index e73fcd8..269b517 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1658,7 +1658,7 @@ void CDVDPlayer::HandlePlaySpeed()
@@ -1659,7 +1659,7 @@ void CDVDPlayer::HandlePlaySpeed()
}
else if (m_CurrentVideo.id >= 0
@ -870,7 +870,7 @@ index 1dbc732..8d19ae5 100644
&& m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts()
&& m_SpeedState.lasttime != GetTime())
{
@@ -2323,6 +2323,12 @@ void CDVDPlayer::HandleMessages()
@@ -2324,6 +2324,12 @@ void CDVDPlayer::HandleMessages()
pvrinputstream->Pause( speed == 0 );
}
@ -887,7 +887,7 @@ index 1dbc732..8d19ae5 100644
1.8.4
From 43bac89dd92306689f8e443871c7aabbb819c2a4 Mon Sep 17 00:00:00 2001
From 37fd7f332f74a5778dc00111c5127c0d878c9dd8 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:22:05 +0200
Subject: [PATCH 08/92] X11: ditch SDL for video and window events
@ -2427,7 +2427,7 @@ index b1464d0..34b912f 100644
1.8.4
From 8123e23755ac41cee6a85a23541f515e96111911 Mon Sep 17 00:00:00 2001
From e02aac41d670ee5732def8e7dbcb920692d37c42 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:24:22 +0200
Subject: [PATCH 09/92] X11: Add xbmc icon
@ -2620,7 +2620,7 @@ index 34b912f..352e90e 100644
1.8.4
From e621dacd4415597fe05fe761ad7f1f7ad2bb2573 Mon Sep 17 00:00:00 2001
From dbf791b807c839d593e5e576ff81676a71091a56 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 14:11:26 +0200
Subject: [PATCH 10/92] X11: add SDL joystick until we have a better solution
@ -2677,7 +2677,7 @@ index ad58aad..6f57a87 100644
1.8.4
From 4b83733ab3fc1aff345ef55492438f4869d01ad8 Mon Sep 17 00:00:00 2001
From 2221530b83c6c02ec2d52005756997530a46abfe Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 12:35:55 +0200
Subject: [PATCH 11/92] X11: factor out code handling device reset notification
@ -2743,7 +2743,7 @@ index 352e90e..3f91b9b 100644
1.8.4
From 12a8d5e5c48203c4f8bd5eec98da9ce77b33e75c Mon Sep 17 00:00:00 2001
From b7ac287cd50a1e25777b396e7e98e9bcb331b655 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 15:02:00 +0200
Subject: [PATCH 12/92] X11: move xrandr events to WinEventsX11
@ -2890,7 +2890,7 @@ index 304dac8..16b13aa 100644
1.8.4
From d8f16fce9f7caebabf5b78f4cc55e77029bf1c8e Mon Sep 17 00:00:00 2001
From 7785126438ea2c9a390b7ac4829d7b19a7bc13a2 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 12 Apr 2012 15:43:56 +0200
Subject: [PATCH 13/92] xrandr: remove method RestoreState
@ -2972,7 +2972,7 @@ index 0aec487..00b49dc 100644
1.8.4
From 4e6456ed36ef12da877a64d1ba591ff7b689057d Mon Sep 17 00:00:00 2001
From 73fecc6e2060cb8ef366278af56ec4f0698993b6 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 20 May 2012 13:17:10 +0200
Subject: [PATCH 14/92] xrandr: observe orientation
@ -3190,7 +3190,7 @@ index 00b49dc..508604d 100644
1.8.4
From 1899b79d09125a7c955824a3e1c335bf179708c0 Mon Sep 17 00:00:00 2001
From 69aaeac0dfab4b66121d534c94bb111545858fe2 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:54:15 +0200
Subject: [PATCH 15/92] xrandr: allow getting info for multiple screen's
@ -3368,7 +3368,7 @@ index 508604d..d37838a 100644
1.8.4
From 7d1d81a68f9025f08b0f2e0491c0a905a101cfe7 Mon Sep 17 00:00:00 2001
From d92af36e43ee6bfcba717e66ba5a0f899e307f36 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:44:00 +0200
Subject: [PATCH 16/92] X11: fix multi-head setups
@ -3386,7 +3386,7 @@ Subject: [PATCH 16/92] X11: fix multi-head setups
9 files changed, 227 insertions(+), 113 deletions(-)
diff --git a/language/English/strings.po b/language/English/strings.po
index 15cee63..a02eb9a 100755
index 93d0c3c..38b4ee0 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -1019,7 +1019,9 @@ msgctxt "#245"
@ -4130,7 +4130,7 @@ index 4175aab..94584ab 100644
1.8.4
From 0d4804977c61f433e62d93465e56ba0b609e4716 Mon Sep 17 00:00:00 2001
From 19a000a30eec03f0dcd52b9ede831867bdb7d52f Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:36:32 +0200
Subject: [PATCH 17/92] X11: remove all DefaultScreen and RootWindow macros
@ -4185,10 +4185,10 @@ index 94584ab..2bcaf52 100644
virtual void ResetOSScreensaver();
virtual bool EnableFrameLimiter();
diff --git a/xbmc/windowing/X11/WinSystemX11GL.cpp b/xbmc/windowing/X11/WinSystemX11GL.cpp
index fc25077..2f65d06 100644
index 6383754..21e7dc5 100644
--- a/xbmc/windowing/X11/WinSystemX11GL.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GL.cpp
@@ -204,7 +204,7 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
@@ -167,7 +167,7 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
return false;
m_glxext = " ";
@ -4201,7 +4201,7 @@ index fc25077..2f65d06 100644
1.8.4
From 8dec342e773ddbc1ad052e63f5983cc01bc015ab Mon Sep 17 00:00:00 2001
From d0a0965588bca352e1887c7c3975843ea2438108 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 11:45:22 +0200
Subject: [PATCH 18/92] X11: remove all DefaultScreen and RootWindow macros
@ -4276,7 +4276,7 @@ index 0b3950a..ca43b5a 100644
1.8.4
From 66b1c8115a403644ffbedc41f254165e4d9b63ae Mon Sep 17 00:00:00 2001
From c6e13110f01a47fc553b673a3e91b0b7da559f54 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 20 Jun 2012 17:37:11 +0200
Subject: [PATCH 19/92] X11: recreate gl context after output has changed
@ -4389,7 +4389,7 @@ index 2bcaf52..9666cc3 100644
private:
bool IsSuitableVisual(XVisualInfo *vInfo);
diff --git a/xbmc/windowing/X11/WinSystemX11GL.cpp b/xbmc/windowing/X11/WinSystemX11GL.cpp
index 2f65d06..d0a8c41 100644
index 21e7dc5..8e68d5d 100644
--- a/xbmc/windowing/X11/WinSystemX11GL.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GL.cpp
@@ -24,6 +24,7 @@
@ -4400,7 +4400,7 @@ index 2f65d06..d0a8c41 100644
CWinSystemX11GL::CWinSystemX11GL()
{
@@ -246,17 +247,25 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
@@ -197,17 +198,25 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
bool CWinSystemX11GL::ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop)
{
@ -4430,7 +4430,7 @@ index 2f65d06..d0a8c41 100644
1.8.4
From 672e85e5b77623f76b015f19f03057a958cfe30f Mon Sep 17 00:00:00 2001
From 1274177c6062bb26d6ea135e43da436d93d444c9 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:06:25 +0200
Subject: [PATCH 20/92] X11: hook video reference clock in windowing
@ -4638,7 +4638,7 @@ index dd65a1b..afd71fc 100644
1.8.4
From 5e603c55da3018fa246f972557c06794f98112f7 Mon Sep 17 00:00:00 2001
From 5620d7869f2091454468236189ae7b415485abe5 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 21 Jun 2012 17:26:51 +0200
Subject: [PATCH 21/92] X11: fix video calibrations
@ -4733,7 +4733,7 @@ index 9666cc3..5b52d6c 100644
1.8.4
From f30df42affa5bf150f2422bed8c100919a25474a Mon Sep 17 00:00:00 2001
From a8e1f3c8a61a423c843229e1ba4c04eb4c972325 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:00:26 +0200
Subject: [PATCH 22/92] X11: deactivate screen saver on startup
@ -4806,7 +4806,7 @@ index 5b52d6c..b2bd5a0 100644
1.8.4
From 45b9c62367d457637406477fc2e7b5ead909690e Mon Sep 17 00:00:00 2001
From edaf85ba8ae73c8e32660a2ae6d1b09d20891114 Mon Sep 17 00:00:00 2001
From: FernetMenta <fernetmenta@online.de>
Date: Thu, 5 Jul 2012 12:10:09 +0200
Subject: [PATCH 23/92] X11: change method of going full-screen
@ -4853,7 +4853,7 @@ index b76b229..869baa8 100644
1.8.4
From 3869297eeada951fa33d781292b2f10488a8dfbf Mon Sep 17 00:00:00 2001
From 3bc0c3a79ca91ae4b2f8e101ee84ae42c91799c1 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Jun 2012 19:12:39 +0200
Subject: [PATCH 24/92] X11: reset key repeat and key modifier on focus lost
@ -4888,7 +4888,7 @@ index d98f12f..743aca9 100644
1.8.4
From 0c7e65fea1396e399bdf3d71227854ca39e7974b Mon Sep 17 00:00:00 2001
From f2521d532bfa52baa23c4e661f850ff441bb8f4e Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:18:46 +0200
Subject: [PATCH 25/92] X11: replace custom utf8 to unicode with charset
@ -5108,7 +5108,7 @@ index a412f32..9a8a912 100644
1.8.4
From eacbcae155191cc0bc7a1dcee4e2dd8402c74c0d Mon Sep 17 00:00:00 2001
From d8f9047e378d2c8fa0cab20c9a618cce72cb75d6 Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@xbmc.org>
Date: Thu, 5 Jul 2012 14:23:54 +0200
Subject: [PATCH 26/92] X11: fixed invalid usage of sizeof() (squash into x11
@ -5175,7 +5175,7 @@ index 9a8a912..c69169c 100644
1.8.4
From dd7e65472fc49198919bb51a27d8594d0f8228a1 Mon Sep 17 00:00:00 2001
From 565ee9b037cce936ecb84800b212a3648de95c99 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 9 Jun 2012 18:23:53 +0200
Subject: [PATCH 27/92] add missing keys to xbmc keytable
@ -5201,7 +5201,7 @@ index d57f4d3..b807897 100644
1.8.4
From 92cbb623bd9531d6cc53a2f0e18e8a4cd89360cb Mon Sep 17 00:00:00 2001
From a014bf53b349e6fe4cb75b34beb1f3d66f1ac2d2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 16 Mar 2012 15:57:51 +0100
Subject: [PATCH 28/92] videorefclock: temp deactivate of nv settings
@ -5227,7 +5227,7 @@ index 0ddf102..3ae7107 100644
1.8.4
From e2b66607041f2630696f7cbef67bcaff89f5b11c Mon Sep 17 00:00:00 2001
From 73748933f9603f3765a73660ddbb2d0c1ed7f51b Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 09:09:09 +0200
Subject: [PATCH 29/92] videorefclock: ask graphics context for refresh rate
@ -5261,7 +5261,7 @@ index 3ae7107..27bebde 100644
1.8.4
From 36cb11f348921504d40ac606554358faee7ee9c4 Mon Sep 17 00:00:00 2001
From a9f9309cd5dca73bfb8f1c1da826d048246dd761 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 9 Jul 2012 14:00:18 +0200
Subject: [PATCH 30/92] X11: fix icon texture after
@ -5372,7 +5372,7 @@ index 869baa8..bfe3797 100644
1.8.4
From 5879efc79500fa50e9c85393188e9ca40035e948 Mon Sep 17 00:00:00 2001
From e1bf2f57c15ffe0114749a8424934204fa0f8234 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 10 Jul 2012 11:14:12 +0200
Subject: [PATCH 31/92] X11: check for window manager
@ -5496,7 +5496,7 @@ index b2bd5a0..3e62cd8 100644
1.8.4
From bb79e2526f213bb628f8becb4f7bd0b59bf2bfb1 Mon Sep 17 00:00:00 2001
From 44e153b4505eabc7ff1f0a7592429362ca6f3280 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 12 Jul 2012 11:11:47 +0200
Subject: [PATCH 32/92] X11: dont set window on xrandr if no mode available
@ -5536,7 +5536,7 @@ index af82061..4f33c68 100644
1.8.4
From 8236c47102e3fd22078c60531d5134aff012646a Mon Sep 17 00:00:00 2001
From 5749e7766f18bcb02b631a05290f7daa2a291684 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 26 Jul 2012 09:34:28 +0200
Subject: [PATCH 33/92] X11: fix crash after a resolution change on startup
@ -5563,7 +5563,7 @@ index 4f33c68..bc4e963 100644
1.8.4
From 2c9a25af19c28196c6006e96d5bd1635b65e39a5 Mon Sep 17 00:00:00 2001
From 8833e554a6e2b344452c188971f94da89a52c931 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 15 Sep 2012 18:27:29 +0200
Subject: [PATCH 34/92] X11: lock graphics context in NotifyXRREvent
@ -5589,7 +5589,7 @@ index bc4e963..57a8d20 100644
1.8.4
From e72f7f8a32fa5fda136adf91c9af39f2ce0236df Mon Sep 17 00:00:00 2001
From d15b5c8da759c765c0647e7a745610d4f6004f91 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 23 Aug 2012 19:39:49 +0200
Subject: [PATCH 35/92] ffmpeg: add av_find_default_stream_index to interface
@ -5638,7 +5638,7 @@ index 0016c0b..3514856 100644
1.8.4
From b7bdbee4fe2dfbb663096501d1ea234b3b3879f7 Mon Sep 17 00:00:00 2001
From 370f89ef0f1c91d39bdb8a6695712c3cfe0636b6 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 20 Aug 2012 16:06:39 +0200
Subject: [PATCH 36/92] dvdplayer: observe pts counter overflow
@ -5928,7 +5928,7 @@ index aef5ab1..35abbdf 100644
1.8.4
From 63ba44ed53374b4703a219936f34f9c75b86157f Mon Sep 17 00:00:00 2001
From 20c24811be5170b80adfcc13502c81ea7a6c02c3 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 2 Oct 2012 13:02:10 +0200
Subject: [PATCH 37/92] dvdplayer: avoid short screen flicker caused by
@ -5964,7 +5964,7 @@ index 150a796..beffbe9 100644
1.8.4
From dd602cb6a6a93e9ad33331b0f844f223c94fd9b4 Mon Sep 17 00:00:00 2001
From df8f064ea4054721fbe4fd54d3aeb27df527c7a3 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 11 Oct 2012 12:05:50 +0200
Subject: [PATCH 38/92] vdpau: advanced settings for auto deinterlacing
@ -6033,7 +6033,7 @@ index 7d16957..bb70f3e 100644
1.8.4
From 3892f36a30931488a5ccc0d785f4b1724cbcca5e Mon Sep 17 00:00:00 2001
From 3c85356ed0b5209585b26f3f7296207105641973 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 2 Nov 2012 13:20:03 +0100
Subject: [PATCH 39/92] player: fix rewind
@ -6084,10 +6084,10 @@ index 2ea8b8f..e8274f9 100644
class CDVDMsgPlayerSeekChapter : public CDVDMsg
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 8d19ae5..385c1c2 100644
index 269b517..a780228 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1659,11 +1659,13 @@ void CDVDPlayer::HandlePlaySpeed()
@@ -1660,11 +1660,13 @@ void CDVDPlayer::HandlePlaySpeed()
}
else if (m_CurrentVideo.id >= 0
&& (m_CurrentVideo.inited == true || GetPlaySpeed() < 0) // allow rewind at end of file
@ -6102,7 +6102,7 @@ index 8d19ae5..385c1c2 100644
// check how much off clock video is when ff/rw:ing
// a problem here is that seeking isn't very accurate
// and since the clock will be resynced after seek
@@ -1682,7 +1684,7 @@ void CDVDPlayer::HandlePlaySpeed()
@@ -1683,7 +1685,7 @@ void CDVDPlayer::HandlePlaySpeed()
{
CLog::Log(LOGDEBUG, "CDVDPlayer::Process - Seeking to catch up");
int64_t iTime = (int64_t)DVD_TIME_TO_MSEC(m_clock.GetClock() + m_State.time_offset + 500000.0 * m_playSpeed / DVD_PLAYSPEED_NORMAL);
@ -6111,7 +6111,7 @@ index 8d19ae5..385c1c2 100644
}
}
}
@@ -2168,7 +2170,7 @@ void CDVDPlayer::HandleMessages()
@@ -2169,7 +2171,7 @@ void CDVDPlayer::HandleMessages()
else
m_StateInput.dts = start;
@ -6120,7 +6120,7 @@ index 8d19ae5..385c1c2 100644
}
else
CLog::Log(LOGWARNING, "error while seeking");
@@ -2308,9 +2310,10 @@ void CDVDPlayer::HandleMessages()
@@ -2309,9 +2311,10 @@ void CDVDPlayer::HandleMessages()
double offset;
offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp;
offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL;
@ -6132,7 +6132,7 @@ index 8d19ae5..385c1c2 100644
m_State.timestamp = CDVDClock::GetAbsoluteClock();
}
@@ -2326,7 +2329,8 @@ void CDVDPlayer::HandleMessages()
@@ -2327,7 +2330,8 @@ void CDVDPlayer::HandleMessages()
// do a seek after rewind, clock is not in sync with current pts
if (m_playSpeed < 0 && speed >= 0)
{
@ -6142,7 +6142,7 @@ index 8d19ae5..385c1c2 100644
}
// if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE
@@ -3317,7 +3321,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers)
@@ -3318,7 +3322,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers)
return true;
}
@ -6151,7 +6151,7 @@ index 8d19ae5..385c1c2 100644
{
double startpts;
if(accurate)
@@ -3329,19 +3333,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
@@ -3330,19 +3334,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
if(startpts != DVD_NOPTS_VALUE)
startpts -= m_offset_pts;
@ -6179,7 +6179,7 @@ index 8d19ae5..385c1c2 100644
m_CurrentTeletext.dts = DVD_NOPTS_VALUE;
m_CurrentTeletext.startpts = startpts;
@@ -3385,7 +3393,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
@@ -3386,7 +3394,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate)
m_CurrentTeletext.started = false;
}
@ -6251,7 +6251,7 @@ index 59c7f09..65dea76 100644
1.8.4
From 8cc7fc21ff37e72e214dc71abf93578353e5b16e Mon Sep 17 00:00:00 2001
From eff1fa5b5cde95efa29a1c73e064182d99a6bbdb Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 23 Nov 2012 17:41:12 +0100
Subject: [PATCH 40/92] xrandr: fix query for multiple screens
@ -6295,7 +6295,7 @@ index 4685413..e610150 100644
1.8.4
From 9a9be0c6828c611ec7c723cda805529c185890ad Mon Sep 17 00:00:00 2001
From e46aef20823b8eddbe6c5f0a910350f6e1c50782 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 2 Dec 2012 15:46:55 +0100
Subject: [PATCH 41/92] X11: add debug log to print out refresh after xrr event
@ -6325,7 +6325,7 @@ index 57a8d20..a237dc0 100644
1.8.4
From 123fda72360d5f63412ddda6d82e76ae7402934a Mon Sep 17 00:00:00 2001
From 6b1204d09589c5ae18a0bc51fc99a0c2d22c8ebe Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Tue, 11 Dec 2012 11:08:13 +0100
Subject: [PATCH 42/92] X11: dont call XCloseDisplay on shutdown, it crashes
@ -6353,7 +6353,7 @@ index a237dc0..ab660b1 100644
1.8.4
From d46b1fab118b3e4871987a0bebbef6403dd44d92 Mon Sep 17 00:00:00 2001
From b758c0d0663879bb2c9e966fe02174693efa3ef4 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 43/92] x11: support for multiple x screens
@ -6379,7 +6379,7 @@ index e610150..5c53574 100644
1.8.4
From 9e452d507ae779b85c87cc20f5e684e490134905 Mon Sep 17 00:00:00 2001
From 24e029479f9cafe7e3a5764e67f4d1ad146ed375 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 24 Dec 2012 16:02:42 +0100
Subject: [PATCH 44/92] pvr: increase changes counter of stream on stream
@ -6416,7 +6416,7 @@ index b96d520..df89f6f 100644
1.8.4
From 2a5423bede4f60b0257edc3b8300231872976a3f Mon Sep 17 00:00:00 2001
From 496b60b677424c52c50f44e9621f036a55ab421f Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 17 Jan 2013 16:03:22 +0100
Subject: [PATCH 45/92] X11: add keymapping for XF86XK_Sleep
@ -6441,7 +6441,7 @@ index a62521f..263cb5a 100644
1.8.4
From 3c23c41f56b1e4bafeb55ddec238274501fc5611 Mon Sep 17 00:00:00 2001
From 87ffb8f33a43804f421b3247550e1c82e936a0ad Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Mon, 21 Jan 2013 09:00:19 +0100
Subject: [PATCH 46/92] X11: remove toggle full screen after resume
@ -6470,7 +6470,7 @@ index 590a887..35b5a21 100644
1.8.4
From 65bb7ad64c717342afb6d2934aa5bb18075badf2 Mon Sep 17 00:00:00 2001
From 82078aab73c998c5f26523d7b0006985b01947d2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 23 Jan 2013 17:03:02 +0100
Subject: [PATCH 47/92] xrandr: set screen on mode change command
@ -6496,7 +6496,7 @@ index 5c53574..4355ef7 100644
1.8.4
From 8924b0b65b4fcfb055c6af201aee09b3863bd790 Mon Sep 17 00:00:00 2001
From 288ecdff37e2966345a72c371bbd92c3106b978a Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Wed, 23 Jan 2013 17:03:39 +0100
Subject: [PATCH 48/92] X11: recreate glx context when output changes
@ -6550,7 +6550,7 @@ index 3e62cd8..2a1fb41 100644
1.8.4
From 66f1ee95ec858c0534fb56283c90f032cb16bf91 Mon Sep 17 00:00:00 2001
From 933decda7c4200e64fe46d181963bfcfae20bae7 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Fri, 14 Dec 2012 14:19:15 +0100
Subject: [PATCH 49/92] pvr: do not show selection dialog for a single menu
@ -6591,7 +6591,7 @@ index 5b5706e..2eda43d 100644
1.8.4
From 946e6bbde5a45edc94f98f5e3ad8af5d78812d31 Mon Sep 17 00:00:00 2001
From 0377ba88321e2fb8b96c63d18343208b675cfd8c Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 3 Feb 2013 08:17:16 +0100
Subject: [PATCH 50/92] X11: use default screen parameters if no output
@ -6698,7 +6698,7 @@ index 4329a22..2adf8a0 100644
1.8.4
From d424e027c1f557396d3cdc347c4bc79affd3bfcf Mon Sep 17 00:00:00 2001
From f18865ec378b07e62f254327c709171153bbf387 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 23 Mar 2013 15:13:32 +0100
Subject: [PATCH 51/92] X11: create parent window
@ -6967,7 +6967,7 @@ index 2a1fb41..e8993f1 100644
1.8.4
From 03dc02bed564f2f937889fa9dc8261f0936ba6d5 Mon Sep 17 00:00:00 2001
From 122aa334600e67788656b6b25551b0722f1e1b06 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 24 Mar 2013 12:30:12 +0100
Subject: [PATCH 52/92] X11: use system key repeat rate instead of hardcoded
@ -7172,7 +7172,7 @@ index c69169c..6429291 100644
1.8.4
From ebd5036b0cb9f80749aae62d2978beb207be2d44 Mon Sep 17 00:00:00 2001
From ba7a69a13707c20dafac74ce74e9ea5c15e96fc3 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 24 Mar 2013 16:04:48 +0100
Subject: [PATCH 53/92] linux: use CLOCK_MONOTONIC_RAW as this is not subject
@ -7213,7 +7213,7 @@ index c06b8c5..4390d2e 100644
1.8.4
From 45e8e8f9bab9250c168303fd25e19754bed88791 Mon Sep 17 00:00:00 2001
From bb78b9e7fef52c6b2143abbc12c4edd299685fe2 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Mar 2013 15:18:53 +0100
Subject: [PATCH 54/92] OMXPlayer: some caching fixes for pvr
@ -7223,10 +7223,10 @@ Subject: [PATCH 54/92] OMXPlayer: some caching fixes for pvr
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
index c926ee3..0a51e8f 100644
index 9638188..7928b25 100644
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
@@ -2565,7 +2565,8 @@ void COMXPlayer::HandleMessages()
@@ -2566,7 +2566,8 @@ void COMXPlayer::HandleMessages()
m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), (speed < 0), true, false, false, true));
m_playSpeed = speed;
@ -7240,7 +7240,7 @@ index c926ee3..0a51e8f 100644
1.8.4
From f155a8234eaa9ff6d2a24e9ef8f15c4040081ccc Mon Sep 17 00:00:00 2001
From 0ab1e9dd5bfc9418fa51d8ef126b64a63b63a577 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Thu, 28 Mar 2013 20:50:59 +0100
Subject: [PATCH 55/92] fix incorrect display of fps when dr kicks in
@ -7270,7 +7270,7 @@ index f701be0..886cedd 100644
1.8.4
From fd9c475361cd318c69529c6ad4375a738b6df146 Mon Sep 17 00:00:00 2001
From 9983db31b2fb0ad3f9b3270a97f16fabfcac8af8 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sat, 13 Apr 2013 08:32:06 +0200
Subject: [PATCH 56/92] X11: fix mouse coverage
@ -7339,7 +7339,7 @@ index e8993f1..5cccfb7 100644
1.8.4
From 0768c32d1910374ba22c75753f5bcbcc17096a25 Mon Sep 17 00:00:00 2001
From 59cdc2a1c2702e3104fbf205db8a0408fbe2bf23 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Wed, 8 May 2013 13:14:58 +0200
Subject: [PATCH 57/92] X11: fix incorrectly used screen num in desktop
@ -7377,7 +7377,7 @@ index 2acb36d..101ba98 100644
1.8.4
From d3f853e6b4ce999a158ee911413a7ea4d108548e Mon Sep 17 00:00:00 2001
From c598e88ae1a12d6b642b5e345acfc2fadb993617 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 9 May 2013 12:07:09 +0200
Subject: [PATCH 58/92] X11: do not overwrite user selected monitor with
@ -7505,7 +7505,7 @@ index 5cccfb7..1b658e2 100644
1.8.4
From 14ef818d6b18b4b66afaba0fb43941adfc8c8bfc Mon Sep 17 00:00:00 2001
From 77199a47bc988db6d444da508241fa23e4be8839 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 12 May 2013 10:50:30 +0200
Subject: [PATCH 59/92] xrandr: add turn on/off to wrapper
@ -7674,7 +7674,7 @@ index d37838a..059062f 100644
1.8.4
From 664214f891d3e86b3cc289973e7af5ee57767380 Mon Sep 17 00:00:00 2001
From bbedf29d35f966f8ee679326262ec3a792f685b4 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 19 May 2013 12:55:35 +0200
Subject: [PATCH 60/92] xrandr: add GetPreferredMode to wrapper
@ -7734,7 +7734,7 @@ index 059062f..ab7cc63 100644
1.8.4
From 5ed2befb7525112306ba92e7b83da1fac5a2dc13 Mon Sep 17 00:00:00 2001
From f76add7695c42bf131dff1d5e7064536fc210c4b Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 11 May 2013 17:12:12 +0200
Subject: [PATCH 61/92] X11: multi-head improvement - poll for desired output
@ -7752,7 +7752,7 @@ Subject: [PATCH 61/92] X11: multi-head improvement - poll for desired output
8 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/language/English/strings.po b/language/English/strings.po
index a02eb9a..eb63f11 100755
index 38b4ee0..cacd3f1 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -6464,7 +6464,7 @@ msgctxt "#14071"
@ -8018,7 +8018,7 @@ index 62003f5..8525ede 100644
1.8.4
From da3ac4fe6c53765ae0266bb2ea9646f7879759d9 Mon Sep 17 00:00:00 2001
From f7abdf8af4a0d8553dbb1620bb77112c2b76b1de Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Wed, 15 May 2013 09:14:34 +0200
Subject: [PATCH 62/92] X11: ignore mouse move event form other windows
@ -8053,7 +8053,7 @@ index 908c8b6..938ad26 100644
1.8.4
From a1a3f92e7907318b96931242c070db069bf06527 Mon Sep 17 00:00:00 2001
From cbde025ef332c6819528f0926b4ef0d413aab5b1 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 11 Jun 2013 16:20:29 +0200
Subject: [PATCH 63/92] renderer: allow some lateness within vblank interval
@ -8116,7 +8116,7 @@ index 949c652b..d84ff6c 100644
1.8.4
From 0996b9485c66c6b915d1ccf82d180720bddb292d Mon Sep 17 00:00:00 2001
From 0f704d8a0ccd5f3213768c346008588a12519831 Mon Sep 17 00:00:00 2001
From: xbmc <fernetmenta@online.de>
Date: Sun, 16 Jun 2013 13:22:58 +0200
Subject: [PATCH 64/92] X11: another fix for mouse coverage
@ -8152,7 +8152,7 @@ index 938ad26..e4ca56d 100644
1.8.4
From e23bfb6ea51cd198801ebfcc0b9bb52748143729 Mon Sep 17 00:00:00 2001
From f374b744a343953edff935fc3d2845e5db05491b Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 5 Jul 2013 12:14:00 +0200
Subject: [PATCH 65/92] X11: set windows class name
@ -8197,7 +8197,7 @@ index b3fe5102..df5fe9b 100644
1.8.4
From 2cef61fd79b7009c2998082f5b30ae663205cd0f Mon Sep 17 00:00:00 2001
From 3f31ad40a5e1cb2192fb502bbc97f973c2641cb9 Mon Sep 17 00:00:00 2001
From: spiff <spiff@xbmc.org>
Date: Tue, 16 Jul 2013 14:34:04 +0200
Subject: [PATCH 66/92] fixed: typo
@ -8207,7 +8207,7 @@ Subject: [PATCH 66/92] fixed: typo
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/language/English/strings.po b/language/English/strings.po
index eb63f11..d21ea31 100755
index cacd3f1..f2d726c 100755
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -6598,7 +6598,7 @@ msgstr ""
@ -8223,7 +8223,7 @@ index eb63f11..d21ea31 100755
1.8.4
From fbd5b549a0a8d35c67a5433f03ebf1d9450ff276 Mon Sep 17 00:00:00 2001
From 66bb18e06a5a0d460a70aa88317225b4488b3c56 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 25 Jul 2013 17:18:13 +0200
Subject: [PATCH 67/92] ActiveAE: slightly reduce buffer size
@ -8251,7 +8251,7 @@ index 20fd56e..7c07eec 100644
1.8.4
From 488fc12e9fb6d05adc5036f0befbb90b8caa5f7c Mon Sep 17 00:00:00 2001
From bde86e96843803fec4c60ee84c846bdd29f423b7 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 4 Aug 2013 10:11:16 +0200
Subject: [PATCH 68/92] Revert "vdpau: comment some features that will be added
@ -8310,7 +8310,7 @@ index 57bb704..55f17e5 100644
1.8.4
From 10838a10a60f9ebe3c43355e82ea41dfe570a30b Mon Sep 17 00:00:00 2001
From bfc58b21773bf89fbcb75f70e664a57bb9ebfe88 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 9 Aug 2013 18:01:40 +0200
Subject: [PATCH 69/92] X11: fix keysyms
@ -8336,7 +8336,7 @@ index e4ca56d..b20130c 100644
1.8.4
From 731c3968e9a2bb6532d4b60449b7b772422a2d30 Mon Sep 17 00:00:00 2001
From 3d7eab774e6d5b01a11249560b88d5fc62d2aead Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Fri, 9 Aug 2013 18:42:36 +0200
Subject: [PATCH 70/92] X11: fix keysym for non-IM
@ -8362,7 +8362,7 @@ index b20130c..a38890c 100644
1.8.4
From b8ce7dffce7461b031ed0c7bd71463390036f522 Mon Sep 17 00:00:00 2001
From ecaa4df5a6348f88426f0b6bb0f51df5cad1a8f4 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 10 Aug 2013 11:18:16 +0200
Subject: [PATCH 71/92] add some missing multi media keys
@ -8420,7 +8420,7 @@ index ee6bb69..364b45a 100644
1.8.4
From 5ee9de3b4c30e6dd864d8e5dab6211d57fb79021 Mon Sep 17 00:00:00 2001
From 96738d7161b1676168155c72dcbca999a8f9fb92 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 10 Aug 2013 15:53:45 +0200
Subject: [PATCH 72/92] X11: squash multi
@ -8446,7 +8446,7 @@ index df5fe9b..d8e04d6 100644
1.8.4
From 003e2fbfdf641afaa4c0355cfc755ad1f611f1c7 Mon Sep 17 00:00:00 2001
From 776b1b2496e0238550b0ce4ff0e2774f36d61e16 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 3 Sep 2013 20:46:17 +0200
Subject: [PATCH 73/92] X11: do not poll default monitor
@ -8472,7 +8472,7 @@ index d8e04d6..01f5272 100644
1.8.4
From 75ec097d9f69ef5be2a9f0532d248067a83390aa Mon Sep 17 00:00:00 2001
From 4b8090bc0993595d00ba294cd09b4eacd6e9c246 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 29 Oct 2013 20:57:28 +0100
Subject: [PATCH 74/92] X11: fix broken monitor switching
@ -8578,7 +8578,7 @@ index 40bc3b3..1663836 100644
1.8.4
From 82b404aa18bba2465e7d25936cae953b11c19ab7 Mon Sep 17 00:00:00 2001
From 8b16af7549f335fef8f26600ae6d379ef8735baf Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Tue, 29 Oct 2013 20:57:59 +0100
Subject: [PATCH 75/92] X11: remove polling for connected outputs, use xrr
@ -8882,7 +8882,7 @@ index 7ec5be4..14622cb 100644
1.8.4
From dc430db96bd2b53e3e09b97692e3539e22bf41ff Mon Sep 17 00:00:00 2001
From fec8bc28dd5fa1de7e44ba6af7eb9ed70ca32995 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 31 Oct 2013 09:37:13 +0100
Subject: [PATCH 76/92] X11: remove grabbing of keyboard and mouse
@ -9003,7 +9003,7 @@ index 14622cb..d1c8729 100644
1.8.4
From 8deaacb9e959e3a5cc12c030c158a7304f54a444 Mon Sep 17 00:00:00 2001
From 17bbd954bb88c1dfc843e428d0c0b986aa633192 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 31 Oct 2013 10:46:40 +0100
Subject: [PATCH 77/92] X11: set ExposureMask on gl window, fixes not updated
@ -9032,7 +9032,7 @@ index 695b352..e55583c 100644
1.8.4
From e470d347c529fe996db35b777e1ef022fcba378a Mon Sep 17 00:00:00 2001
From 81c235b59a3430703f86d97bf7b80335845f0bd4 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 31 Oct 2013 11:25:19 +0100
Subject: [PATCH 78/92] X11: drop shortcuts, have WM do this
@ -9097,7 +9097,7 @@ index 6429291..4334d21 100644
1.8.4
From 40097fd1984f97775dd89c5e0e8d99af172714d7 Mon Sep 17 00:00:00 2001
From 81bf11a8f222435b0142284fb97f939dcb7e140f Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 7 Nov 2013 15:02:00 +0100
Subject: [PATCH 79/92] X11: adapt to new settings
@ -9122,7 +9122,7 @@ index a6428cd..5e6a312 100644
1.8.4
From 6457913ab9bdb2ab9d2c4e886c9a0814516cb4b4 Mon Sep 17 00:00:00 2001
From b6daba9a44866e1fe419a3bad213063df9775194 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 9 Nov 2013 12:20:05 +0100
Subject: [PATCH 80/92] vdpau: move cropping of top and bottom lines to
@ -9319,7 +9319,7 @@ index abe8da2..2dd3c28 100644
1.8.4
From d545dc2b48ae6ab577b62702cb649bf89cf15172 Mon Sep 17 00:00:00 2001
From e7d3ded4f51268a7c4991e6d52f1c619380f593a Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 14 Nov 2013 09:28:24 +0100
Subject: [PATCH 81/92] X11: adapt to changes in cstdstring
@ -9370,7 +9370,7 @@ index 8525ede..c94f2e3 100644
1.8.4
From 54ea16df1ad828b35744eb60ead157fca680ee77 Mon Sep 17 00:00:00 2001
From 070df53f2088e98e147fc9f0c4c62f70921ea40e Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 14 Nov 2013 18:50:57 +0100
Subject: [PATCH 82/92] dvdplayer: fix failed to get stream message, lookup
@ -9381,7 +9381,7 @@ Subject: [PATCH 82/92] dvdplayer: fix failed to get stream message, lookup
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
index 385c1c2..0844ee1 100644
index a780228..f400689 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -110,7 +110,7 @@ void CSelectionStreams::Clear(StreamType type, StreamSource source)
@ -9397,7 +9397,7 @@ index 385c1c2..0844ee1 100644
1.8.4
From 162adb80bbd65bccc0ae533cadf4b8e5ae1ad068 Mon Sep 17 00:00:00 2001
From 7617cf2992bc38725cf9246e8942592be1244883 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 14 Nov 2013 19:22:01 +0100
Subject: [PATCH 83/92] omxplayer: fix failed to get stream message
@ -9407,7 +9407,7 @@ Subject: [PATCH 83/92] omxplayer: fix failed to get stream message
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/omxplayer/OMXPlayer.cpp b/xbmc/cores/omxplayer/OMXPlayer.cpp
index 0a51e8f..9e50617 100644
index 7928b25..1023956 100644
--- a/xbmc/cores/omxplayer/OMXPlayer.cpp
+++ b/xbmc/cores/omxplayer/OMXPlayer.cpp
@@ -341,7 +341,7 @@ bool COMXSelectionStreams::Get(StreamType type, CDemuxStream::EFlags flag, OMXSe
@ -9423,7 +9423,7 @@ index 0a51e8f..9e50617 100644
1.8.4
From a5d7f1d30a681ed96e28568ac26f26afa11062e9 Mon Sep 17 00:00:00 2001
From 79183df293ac95e5ea6210bd45e56df4e63d70d2 Mon Sep 17 00:00:00 2001
From: Marcel Groothuis <margro.xbmc@gmail.com>
Date: Fri, 8 Nov 2013 21:49:13 +0100
Subject: [PATCH 84/92] ffmpeg demuxer: faster channel change for PVR addons
@ -9694,7 +9694,7 @@ index ca689d0..081219b 100644
1.8.4
From b5912bb3895da563bae59b4f717f376b6d81c2e1 Mon Sep 17 00:00:00 2001
From 5d6a2e35ee1aa4650fe31b27b39dfeccb37f021f Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sun, 10 Nov 2013 10:13:06 +0100
Subject: [PATCH 85/92] ffmpeg demuxer: refactoring for fast channel change
@ -9894,7 +9894,7 @@ index 309f554..e89022a 100644
1.8.4
From adbefdeb016916850ef17abeaaa3f62481220265 Mon Sep 17 00:00:00 2001
From 213e5f2343c61c8002fc809df4af9c0df10f271f Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Wed, 13 Nov 2013 08:53:04 +0100
Subject: [PATCH 86/92] ffmpeg demuxer: reduce time for finding stream info
@ -10117,7 +10117,7 @@ index e89022a..acde9a8 100644
1.8.4
From 14d11c27a3f73db5c69d46040e823630f1626654 Mon Sep 17 00:00:00 2001
From 61c1dd17934be76d8a0340d358b485ac69bb8d15 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Thu, 14 Nov 2013 20:35:04 +0100
Subject: [PATCH 87/92] ffmoeg demuxer: make sure we start video with an
@ -10187,10 +10187,10 @@ index acde9a8..9ec0877 100644
1.8.4
From b62125cabcd716530de6b92918c16df221126d17 Mon Sep 17 00:00:00 2001
From e60a5315d428a36de56e6e3f0cbf3225b8e8afa6 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 16 Nov 2013 16:30:20 +0100
Subject: [PATCH 91/92] ffmpeg demuxer: short anylyze time for mpegts, squash
Subject: [PATCH 88/92] ffmpeg demuxer: short anylyze time for mpegts, squash
me
---
@ -10231,3 +10231,76 @@ index aba9b6c..456c1c0 100644
m_program = 0;
--
1.8.4
From dd7972d58f33fd987484a1c3c88345f2bd9f7b80 Mon Sep 17 00:00:00 2001
From: Marcel Groothuis <margro.xbmc@gmail.com>
Date: Sun, 17 Nov 2013 17:40:40 +0100
Subject: [PATCH 89/92] Fixed: compilation against external ffmpeg
---
lib/DllAvCodec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index 3500670..cfffe2d 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -109,12 +109,12 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
::avcodec_register_all();
}
virtual void avcodec_flush_buffers(AVCodecContext *avctx) { ::avcodec_flush_buffers(avctx); }
- virtual int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
+ virtual int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
{
CSingleLock lock(DllAvCodec::m_critSection);
return ::avcodec_open2(avctx, codec, options);
}
- virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
+ virtual int avcodec_open2_dont_call(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; }
virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); }
virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); }
--
1.8.4
From 0d932918fb343ae4ab9188fe10c6c84e1bed9e69 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 18 Nov 2013 17:44:31 +0100
Subject: [PATCH 91/92] ActiveAE: correct time of buffered samples by resample
ratio
---
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp | 2 +-
xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index 0a353f9..64506ce 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -99,7 +99,7 @@ float CEngineStats::GetDelay(CActiveAEStream *stream)
if (delay < 0)
delay = 0.0;
- delay += stream->m_bufferedTime;
+ delay += stream->m_bufferedTime / stream->m_streamResampleRatio;
return delay;
}
diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp
index d5b01ea..9914e9e 100644
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp
@@ -56,6 +56,7 @@
m_leftoverBuffer = new uint8_t[m_format.m_frameSize];
m_leftoverBytes = 0;
m_forceResampler = false;
+ m_streamResampleRatio = 1.0;
}
CActiveAEStream::~CActiveAEStream()
--
1.8.4

31
packages/mediacenter/xbmc/patches/xbmc-995.02-fm-fix.patch
View File

@ -1,31 +0,0 @@
From d0950a72afe9eb62048084b3444dafa480ffd76b Mon Sep 17 00:00:00 2001
From: Marcel Groothuis <margro.xbmc@gmail.com>
Date: Sun, 17 Nov 2013 17:40:40 +0100
Subject: [PATCH] Fixed: compilation against external ffmpeg
---
lib/DllAvCodec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h
index 3500670..cfffe2d 100644
--- a/lib/DllAvCodec.h
+++ b/lib/DllAvCodec.h
@@ -109,12 +109,12 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface
::avcodec_register_all();
}
virtual void avcodec_flush_buffers(AVCodecContext *avctx) { ::avcodec_flush_buffers(avctx); }
- virtual int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)
+ virtual int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
{
CSingleLock lock(DllAvCodec::m_critSection);
return ::avcodec_open2(avctx, codec, options);
}
- virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
+ virtual int avcodec_open2_dont_call(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; }
virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; }
virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); }
virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); }
--
1.8.4