xbmc-pvr: update to xbmc-pvr-992cf35 (beta 3)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-02-08 06:25:09 +01:00
parent 5c608110e5
commit ced5bfdd2d
20 changed files with 2 additions and 7590 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-pvr-theme-Confluence"
PKG_VERSION="cbe2cf3"
PKG_VERSION="992cf35"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-pvr"
PKG_VERSION="cbe2cf3"
PKG_VERSION="992cf35"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,13 +0,0 @@
diff -Naur xbmc-9389dc8/xbmc/settings/GUISettings.cpp xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp
--- xbmc-9389dc8/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:05.267139356 +0200
+++ xbmc-9389dc8.patch/xbmc/settings/GUISettings.cpp 2011-09-01 23:34:52.098765331 +0200
@@ -423,7 +423,8 @@
AddString(vs, "videoscreen.testpattern",226,"", BUTTON_CONTROL_STANDARD);
#endif
#if defined(_LINUX) && !defined(__APPLE__)
- AddBool(NULL, "videoscreen.haslcd", 4501, false);
+ AddSeparator(vs, "videoscreen.sep2");
+ AddBool(vs, "videoscreen.haslcd", 4501, false);
#endif
CSettingsCategory* ao = AddCategory(4, "audiooutput", 772);

View File

@ -1,52 +0,0 @@
diff -Naur xbmc-pvr-3513480/system/Lircmap.xml xbmc-pvr-3513480.patch/system/Lircmap.xml
--- xbmc-pvr-3513480/system/Lircmap.xml 2011-04-25 02:36:33.000000000 +0200
+++ xbmc-pvr-3513480.patch/system/Lircmap.xml 2011-04-25 05:31:39.632429078 +0200
@@ -409,4 +409,48 @@
<yellow>KEY_YELLOW</yellow>
<blue>KEY_BLUE</blue>
</remote>
+ <remote device="mediacenter">
+ <pause>pause</pause>
+ <stop>stop</stop>
+ <forward>fwd</forward>
+ <reverse>rew</reverse>
+ <left>left</left>
+ <right>right</right>
+ <up>up</up>
+ <down>down</down>
+ <select>ok</select>
+ <pageplus>ch+</pageplus>
+ <pageminus>ch-</pageminus>
+ <back>back</back>
+ <menu>clear</menu>
+ <title>play</title>
+ <info>info</info>
+ <skipplus>next</skipplus>
+ <skipminus>prev</skipminus>
+ <display>teletext</display>
+ <start>ehome</start>
+ <record>rec</record>
+ <volumeplus>vol+</volumeplus>
+ <volumeminus>vol-</volumeminus>
+ <mute>mute</mute>
+ <power>power</power>
+ <myvideo>video</myvideo>
+ <mymusic>music</mymusic>
+ <mypictures>pictures</mypictures>
+ <mytv>tv</mytv>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+ <mytv>red</mytv>
+ <mymusic>green</mymusic>
+ <mypictures>yellow</mypictures>
+ <myvideo>blue</myvideo>
+ </remote>
</lircmap>

View File

@ -1,38 +0,0 @@
diff -Naur xbmc-f76c547/xbmc/windowing/X11/WinSystemX11.cpp xbmc-f76c547.patch/xbmc/windowing/X11/WinSystemX11.cpp
--- xbmc-f76c547/xbmc/windowing/X11/WinSystemX11.cpp 2012-02-06 15:19:03.037732518 +0100
+++ xbmc-f76c547.patch/xbmc/windowing/X11/WinSystemX11.cpp 2012-02-06 15:18:37.545260709 +0100
@@ -55,6 +55,8 @@
m_bWasFullScreenBeforeMinimize = false;
m_dpyLostTime = 0;
m_internalModeSwitch = false;
+
+ XSetErrorHandler(XErrorHandler);
}
CWinSystemX11::~CWinSystemX11()
@@ -596,4 +598,14 @@
m_resources.erase(i);
}
+int CWinSystemX11::XErrorHandler(Display* dpy, XErrorEvent* error)
+{
+ char buf[1024];
+ XGetErrorText(error->display, error->error_code, buf, sizeof(buf));
+ CLog::Log(LOGERROR, "CWinSystemX11::XErrorHandler: %s, type:%i, serial:%lu, error_code:%i, request_code:%i minor_code:%i",
+ buf, error->type, error->serial, (int)error->error_code, (int)error->request_code, (int)error->minor_code);
+
+ return 0;
+}
+
#endif
diff -Naur xbmc-f76c547/xbmc/windowing/X11/WinSystemX11.h xbmc-f76c547.patch/xbmc/windowing/X11/WinSystemX11.h
--- xbmc-f76c547/xbmc/windowing/X11/WinSystemX11.h 2012-02-06 15:19:03.038732537 +0100
+++ xbmc-f76c547.patch/xbmc/windowing/X11/WinSystemX11.h 2012-02-06 15:17:16.253756180 +0100
@@ -84,6 +84,7 @@
private:
bool IsSuitableVisual(XVisualInfo *vInfo);
+ static int XErrorHandler(Display* dpy, XErrorEvent* error);
CStopWatch m_screensaverReset;
};