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

xbmc: update to xbmc-13-4540f80

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-04-18 14:57:58 +02:00
parent b9ebd0b3cc
commit 97a50403fe
6 changed files with 28 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-theme-Confluence/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="13-0a5b020"
PKG_VERSION="13-4540f80"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

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

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="13-0a5b020"
PKG_VERSION="13-4540f80"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

30
packages/mediacenter/xbmc/patches/xbmc-999.02-AML-XB9295c3f-05-use-udevil-to-umount.-escape-mountpath.patch → packages/mediacenter/xbmc/patches/xbmc-104-use-udevil-to-umount.patch
View File

@ -1,39 +1,39 @@
From 023acdbbe7b3766e3e1bf509e92d967903aee680 Mon Sep 17 00:00:00 2001
From 855160db446fe0059f072b207d53c15ba18d952f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 31 Aug 2013 18:19:43 +0300
Subject: [PATCH] use udevil to umount. escape mountpath
Date: Thu, 17 Apr 2014 12:12:50 +0300
Subject: [PATCH] use udevil to umount
---
xbmc/linux/PosixMountProvider.cpp | 2 +-
xbmc/storage/linux/UDevProvider.cpp | 2 +-
xbmc/linux/PosixMountProvider.cpp | 2 +-
xbmc/storage/linux/UDevProvider.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
index bbf47fa..2004b44 100644
index 2339709..7001563 100644
--- a/xbmc/linux/PosixMountProvider.cpp
+++ b/xbmc/linux/PosixMountProvider.cpp
@@ -130,7 +130,7 @@ bool CPosixMountProvider::Eject(CStdString mountpath)
@@ -131,7 +131,7 @@ bool CPosixMountProvider::Eject(CStdString mountpath)
{
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
- std::string cmd = "umount " + mountpath;
- std::string cmd = "umount \"" + mountpath + "\"";
+ std::string cmd = "udevil umount \"" + mountpath + "\"";
system(cmd.c_str());
int status = system(cmd.c_str());
return true;
if (status == 0)
diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
index e9c86ab..2f3a5ea 100644
index 73aa408..8bd02b6 100644
--- a/xbmc/storage/linux/UDevProvider.cpp
+++ b/xbmc/storage/linux/UDevProvider.cpp
@@ -183,7 +183,7 @@ bool CUDevProvider::Eject(CStdString mountpath)
{
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
- std::string cmd = "umount " + mountpath;
- std::string cmd = "umount \"" + mountpath + "\"";
+ std::string cmd = "udevil umount \"" + mountpath + "\"";
system(cmd.c_str());
int status = system(cmd.c_str());
return true;
if (status == 0)
--
1.7.2.5
1.9.1

24
packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta-fixes-b3b79dd.patch
View File

@ -8294,16 +8294,16 @@ index b20130c..a38890c 100644
1.9.1
From f6fb3317cae4a96300b8c761c582410911d12f1f Mon Sep 17 00:00:00 2001
From ea94f4df86043896ad7ae622411aba08bfb1b80d Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 10 Aug 2013 11:18:16 +0200
Subject: [PATCH 69/96] add some missing multi media keys
Subject: [PATCH] add some missing multi media keys
---
system/keymaps/keyboard.xml | 3 +++
xbmc/input/XBMC_keytable.cpp | 4 ++++
xbmc/input/XBMC_vkeys.h | 3 +++
3 files changed, 10 insertions(+)
xbmc/input/XBMC_vkeys.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 45682a2..01f7904 100644
@ -8320,10 +8320,10 @@ index 45682a2..01f7904 100644
<launch_media_select>XBMC.ActivateWindow(MyMusic)</launch_media_select>
<launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp
index b807897..30bad46 100644
index 53b9dce..834cccb 100644
--- a/xbmc/input/XBMC_keytable.cpp
+++ b/xbmc/input/XBMC_keytable.cpp
@@ -182,6 +182,10 @@ static const XBMCKEYTABLE XBMCKeyTable[] =
@@ -184,6 +184,10 @@ static const XBMCKEYTABLE XBMCKeyTable[] =
, { XBMCK_LAUNCH_MEDIA_CENTER, 0, 0, XBMCVK_LAUNCH_MEDIA_CENTER, "launch_media_center" }
, { XBMCK_PLAY, 0, 0, XBMCVK_MEDIA_PLAY_PAUSE, "play_pause" }
, { XBMCK_STOP, 0, 0, XBMCVK_MEDIA_STOP, "stop" }
@ -8335,16 +8335,14 @@ index b807897..30bad46 100644
// Function keys
, { XBMCK_F1, 0, 0, XBMCVK_F1, "f1"}
diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h
index ee6bb69..364b45a 100644
index 00437db..981c62a 100644
--- a/xbmc/input/XBMC_vkeys.h
+++ b/xbmc/input/XBMC_vkeys.h
@@ -188,6 +188,9 @@ typedef enum {
XBMCVK_LAUNCH_APP2 = 0xC1,
XBMCVK_LAUNCH_FILE_BROWSER = 0xC2,
@@ -190,6 +190,7 @@ typedef enum {
XBMCVK_LAUNCH_MEDIA_CENTER = 0xC3,
+ XBMCVK_MEDIA_RECORD = 0xC4,
+ XBMCVK_MEDIA_REWIND = 0xC5,
+ XBMCVK_MEDIA_FASTFORWARD = 0xC6,
XBMCVK_MEDIA_REWIND = 0xC4,
XBMCVK_MEDIA_FASTFORWARD = 0xC5,
+ XBMCVK_MEDIA_RECORD = 0xC6,
XBMCVK_LCONTROL = 0xD0,
XBMCVK_RCONTROL = 0xD1,

66
packages/mediacenter/xbmc/patches/xbmc-999.01-AML-XB9295c3f-04-fixed-context-menu-remove-safely-selection.patch
View File

@ -1,66 +0,0 @@
From 35400b9a93e5c2c9aa6dc389736af293fc623a5b Mon Sep 17 00:00:00 2001
From: davilla <davilla@4pi.com>
Date: Thu, 3 Jan 2013 11:20:22 -0500
Subject: [PATCH] [aml] fixed context menu 'remove safely' selection
---
xbmc/linux/PosixMountProvider.cpp | 10 ++++++++++
xbmc/linux/PosixMountProvider.h | 2 +-
xbmc/storage/linux/UDevProvider.cpp | 7 ++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
index 2420491..27d639e 100644
--- a/xbmc/linux/PosixMountProvider.cpp
+++ b/xbmc/linux/PosixMountProvider.cpp
@@ -127,6 +127,16 @@ void CPosixMountProvider::GetDrives(VECSOURCES &drives)
return result;
}
+bool CPosixMountProvider::Eject(CStdString mountpath)
+{
+ // just go ahead and try to umount the disk
+ // if it does umount, life is good, if not, no loss.
+ std::string cmd = "umount " + mountpath;
+ system(cmd.c_str());
+
+ return true;
+}
+
bool CPosixMountProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
{
VECSOURCES drives;
diff --git a/xbmc/linux/PosixMountProvider.h b/xbmc/linux/PosixMountProvider.h
index da0506c..02ff302 100644
--- a/xbmc/linux/PosixMountProvider.h
+++ b/xbmc/linux/PosixMountProvider.h
@@ -34,7 +34,7 @@ class CPosixMountProvider : public IStorageProvider
virtual std::vector<CStdString> GetDiskUsage();
- virtual bool Eject(CStdString mountpath) { return false; }
+ virtual bool Eject(CStdString mountpath);
virtual bool PumpDriveChangeEvents(IStorageEventsCallback *callback);
private:
diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp
index 21b6b50..d9e6a4f 100644
--- a/xbmc/storage/linux/UDevProvider.cpp
+++ b/xbmc/storage/linux/UDevProvider.cpp
@@ -179,7 +179,12 @@ void CUDevProvider::GetRemovableDrives(VECSOURCES &removableDrives)
bool CUDevProvider::Eject(CStdString mountpath)
{
- return false;
+ // just go ahead and try to umount the disk
+ // if it does umount, life is good, if not, no loss.
+ std::string cmd = "umount " + mountpath;
+ system(cmd.c_str());
+
+ return true;
}
std::vector<CStdString> CUDevProvider::GetDiskUsage()
--
1.8.4

59
packages/mediacenter/xbmc/patches/xbmc-999.80.009-PR4518.patch
View File

@ -1,59 +0,0 @@
From f3070359e2114b14b3d7097d2fe35ca1e788bc02 Mon Sep 17 00:00:00 2001
From: Oleg Oshmyan <chortos@inbox.lv>
Date: Fri, 4 Apr 2014 22:05:00 +0300
Subject: [PATCH 1/2] overlays: don't reduce ASS texture width unnecessarily
Fixes OpenELEC/OpenELEC.tv#3059 on GitHub, where an ASS subtitle
texture could become too narrow to fit subtitle bitmaps in full,
causing them to be inappropriately clipped. This issue has become
obvious lately due to changes in libass that make it output wider
(but fewer) images than it used to.
---
xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
index 72478ab..45861b8 100644
--- a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
+++ b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
@@ -205,8 +205,8 @@ bool convert_quad(ASS_Image* images, SQuads& quads)
if (quads.count == 0)
return false;
- while(quads.size_x > (int)g_Windowing.GetMaxTextureSize())
- quads.size_x /= 2;
+ if (quads.size_x > (int)g_Windowing.GetMaxTextureSize())
+ quads.size_x = g_Windowing.GetMaxTextureSize();
int curr_x = 0;
int curr_y = 0;
--
1.9.1
From 87e0250eaa5103f39054d678920dc42a7b7979c3 Mon Sep 17 00:00:00 2001
From: Oleg Oshmyan <chortos@inbox.lv>
Date: Fri, 4 Apr 2014 22:39:18 +0300
Subject: [PATCH 2/2] overlays: include padding in initial ASS texture width
computation
---
xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
index 45861b8..ef473e4 100644
--- a/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
+++ b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp
@@ -198,7 +198,7 @@ bool convert_quad(ASS_Image* images, SQuads& quads)
if((img->color & 0xff) == 0xff || img->w == 0 || img->h == 0)
continue;
- quads.size_x += img->w;
+ quads.size_x += img->w + 1;
quads.count++;
}
--
1.9.1