mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
xbmc: update to xbmc-14-0b1a6eb, update FM patch, replace pstate patch with PR5306
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
a35bd615c6
commit
0265c726d5
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="14-a29b21a"
|
||||
PKG_VERSION="14-0b1a6eb"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="14-a29b21a"
|
||||
PKG_VERSION="14-0b1a6eb"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,39 +0,0 @@
|
||||
From 7f2c28112179d6a1336dbc48f70bec927e2820f1 Mon Sep 17 00:00:00 2001
|
||||
From: fritsch <Peter.Fruehberger@gmail.com>
|
||||
Date: Sun, 24 Aug 2014 15:05:17 +0200
|
||||
Subject: [PATCH] PaP: Support DSD Format
|
||||
|
||||
---
|
||||
xbmc/cores/paplayer/CodecFactory.cpp | 2 ++
|
||||
xbmc/settings/AdvancedSettings.cpp | 2 +-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xbmc/cores/paplayer/CodecFactory.cpp b/xbmc/cores/paplayer/CodecFactory.cpp
|
||||
index 72750a0..f7a157e 100644
|
||||
--- a/xbmc/cores/paplayer/CodecFactory.cpp
|
||||
+++ b/xbmc/cores/paplayer/CodecFactory.cpp
|
||||
@@ -111,6 +111,8 @@ ICodec* CodecFactory::CreateCodec(const std::string& strFileType)
|
||||
return new DVDPlayerCodec();
|
||||
else if (fileType == "opus")
|
||||
return new DVDPlayerCodec();
|
||||
+ else if (fileType == "dff" || fileType == "dsf")
|
||||
+ return new DVDPlayerCodec();
|
||||
|
||||
return NULL;
|
||||
}
|
||||
diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
|
||||
index 5f3f2d8..4af3c7a 100644
|
||||
--- a/xbmc/settings/AdvancedSettings.cpp
|
||||
+++ b/xbmc/settings/AdvancedSettings.cpp
|
||||
@@ -387,7 +387,7 @@ void CAdvancedSettings::Initialize()
|
||||
m_databaseVideo.Reset();
|
||||
|
||||
m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.cbr|.rar|.dng|.nef|.cr2|.crw|.orf|.arw|.erf|.3fr|.dcr|.x3f|.mef|.raf|.mrw|.pef|.sr2|.rss";
|
||||
- m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.mod|.amf|.669|.dmf|.dsm|.far|.gdm|.imf|.it|.m15|.med|.okt|.s3m|.stm|.sfx|.ult|.uni|.xm|.sid|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.nsf|.spc|.gym|.adx|.dsp|.adp|.ymf|.ast|.afc|.hps|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.mid|.kar|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.cm3|.cms|.dlt|.brstm|.wtv|.mka|.tak|.opus";
|
||||
+ m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.mod|.amf|.669|.dmf|.dsm|.far|.gdm|.imf|.it|.m15|.med|.okt|.s3m|.stm|.sfx|.ult|.uni|.xm|.sid|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.nsf|.spc|.gym|.adx|.dsp|.adp|.ymf|.ast|.afc|.hps|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.mid|.kar|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.cm3|.cms|.dlt|.brstm|.wtv|.mka|.tak|.opus|.dff|.dsf";
|
||||
m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv";
|
||||
m_subtitlesExtensions = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.text|.ssa|.aqt|.jss|.ass|.idx|.ifo|.rar|.zip";
|
||||
m_discStubExtensions = ".disc";
|
||||
--
|
||||
2.0.4
|
||||
|
23
packages/mediacenter/xbmc/patches/xbmc-999.91-PR5306.patch
Normal file
23
packages/mediacenter/xbmc/patches/xbmc-999.91-PR5306.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From 0be29d9a6e30b1cf1c50e12a9dea28f7dce6f1f7 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Raue <stephan@openelec.tv>
|
||||
Date: Mon, 1 Sep 2014 03:16:37 +0200
|
||||
Subject: [PATCH] add support to read frequency output if using intel's pstate
|
||||
driver
|
||||
|
||||
---
|
||||
xbmc/utils/CPUInfo.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
|
||||
index 93ca784..31b27ba 100644
|
||||
--- a/xbmc/utils/CPUInfo.cpp
|
||||
+++ b/xbmc/utils/CPUInfo.cpp
|
||||
@@ -267,6 +267,8 @@ CCPUInfo::CCPUInfo(void)
|
||||
m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); // On Raspberry PIs
|
||||
|
||||
m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
|
||||
+ if (m_fCPUFreq == NULL)
|
||||
+ m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq", "r");
|
||||
if (!m_fCPUFreq)
|
||||
{
|
||||
m_cpuInfoForFreq = true;
|
@ -1,13 +0,0 @@
|
||||
diff -Naur xbmc-14-a29b21a/xbmc/utils/CPUInfo.cpp xbmc-14-a29b21a.patch/xbmc/utils/CPUInfo.cpp
|
||||
--- xbmc-14-a29b21a/xbmc/utils/CPUInfo.cpp 2014-08-24 17:41:38.000000000 +0200
|
||||
+++ xbmc-14-a29b21a.patch/xbmc/utils/CPUInfo.cpp 2014-08-29 23:32:55.958602554 +0200
|
||||
@@ -266,7 +266,8 @@
|
||||
m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); // On Raspberry PIs
|
||||
|
||||
m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
|
||||
-
|
||||
+ if (m_fCPUFreq == NULL)
|
||||
+ m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq", "r");
|
||||
|
||||
FILE* fCPUInfo = fopen("/proc/cpuinfo", "r");
|
||||
m_cpuCount = 0;
|
@ -8418,70 +8418,6 @@ index 01aafe3..5ab83a2 100644
|
||||
2.0.4
|
||||
|
||||
|
||||
From eb1f529be51c71cce01c09bce707fcb8464e2219 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Sat, 14 Dec 2013 16:55:05 +0000
|
||||
Subject: [PATCH 46/98] logging: Add microsecond timer to log messages
|
||||
|
||||
---
|
||||
xbmc/utils/log.cpp | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/xbmc/utils/log.cpp b/xbmc/utils/log.cpp
|
||||
index dd6ef26..8edf2fd 100644
|
||||
--- a/xbmc/utils/log.cpp
|
||||
+++ b/xbmc/utils/log.cpp
|
||||
@@ -32,6 +32,7 @@
|
||||
#elif defined(TARGET_WINDOWS)
|
||||
#include "win32/WIN32Util.h"
|
||||
#endif
|
||||
+#include "utils/TimeUtils.cpp"
|
||||
|
||||
#define critSec XBMC_GLOBAL_USE(CLog::CLogGlobals).critSec
|
||||
#define m_file XBMC_GLOBAL_USE(CLog::CLogGlobals).m_file
|
||||
@@ -64,7 +65,7 @@ void CLog::Close()
|
||||
|
||||
void CLog::Log(int loglevel, const char *format, ... )
|
||||
{
|
||||
- static const char* prefixFormat = "%02.2d:%02.2d:%02.2d T:%" PRIu64" %7s: ";
|
||||
+ static const char* prefixFormat = "%02.2d:%02.2d:%02.2d %10.6f T:%" PRIu64" %7s: ";
|
||||
CSingleLock waitLock(critSec);
|
||||
int extras = (loglevel >> LOGMASKBIT) << LOGMASKBIT;
|
||||
loglevel = loglevel & LOGMASK;
|
||||
@@ -90,6 +91,11 @@ void CLog::Log(int loglevel, const char *format, ... )
|
||||
strData = StringUtils::FormatV(format,va);
|
||||
va_end(va);
|
||||
|
||||
+
|
||||
+ struct timespec now;
|
||||
+ clock_gettime(CLOCK_MONOTONIC, &now);
|
||||
+ float Now = now.tv_sec + now.tv_nsec * 1e-9;
|
||||
+
|
||||
if (m_repeatLogLevel == loglevel && m_repeatLine == strData)
|
||||
{
|
||||
m_repeatCount++;
|
||||
@@ -100,7 +106,7 @@ void CLog::Log(int loglevel, const char *format, ... )
|
||||
strPrefix = StringUtils::Format(prefixFormat,
|
||||
time.wHour,
|
||||
time.wMinute,
|
||||
- time.wSecond,
|
||||
+ time.wSecond, Now,
|
||||
(uint64_t)CThread::GetCurrentThreadId(),
|
||||
levelNames[m_repeatLogLevel]);
|
||||
|
||||
@@ -129,7 +135,7 @@ void CLog::Log(int loglevel, const char *format, ... )
|
||||
strPrefix = StringUtils::Format(prefixFormat,
|
||||
time.wHour,
|
||||
time.wMinute,
|
||||
- time.wSecond,
|
||||
+ time.wSecond, Now,
|
||||
(uint64_t)CThread::GetCurrentThreadId(),
|
||||
levelNames[loglevel]);
|
||||
|
||||
--
|
||||
2.0.4
|
||||
|
||||
|
||||
From 6829c44375784e0ee43fb88901af699a283e09f9 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Marshall <jmarshall@xbmc.org>
|
||||
Date: Sat, 2 Nov 2013 23:49:17 +1300
|
||||
@ -11882,34 +11818,6 @@ index 2929a37..53873f6 100644
|
||||
2.0.4
|
||||
|
||||
|
||||
From 316d15895273f66fa2a39906b534fb59f770a9d7 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Mon, 16 Jun 2014 19:05:14 +0100
|
||||
Subject: [PATCH 65/98] sqlite: Bump to 3080500
|
||||
|
||||
---
|
||||
tools/depends/target/sqlite3/Makefile | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/depends/target/sqlite3/Makefile b/tools/depends/target/sqlite3/Makefile
|
||||
index 87f7eaa..8fe61e8 100644
|
||||
--- a/tools/depends/target/sqlite3/Makefile
|
||||
+++ b/tools/depends/target/sqlite3/Makefile
|
||||
@@ -3,7 +3,9 @@ DEPS= ../../Makefile.include Makefile
|
||||
|
||||
# lib name, version
|
||||
LIBNAME=sqlite
|
||||
-VERSION=3071000
|
||||
+VERSION=3080500
|
||||
+BASE_URL=https://www.sqlite.org/2014
|
||||
+
|
||||
SOURCE=$(LIBNAME)-autoconf-$(VERSION)
|
||||
ARCHIVE=$(SOURCE).tar.gz
|
||||
|
||||
--
|
||||
2.0.4
|
||||
|
||||
|
||||
From f4d8961a71c00b39e1e7fdf23c2fe3c56adf2a92 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Mon, 16 Jun 2014 19:06:00 +0100
|
||||
|
Loading…
x
Reference in New Issue
Block a user