mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
5baaad9e49
@ -36,6 +36,10 @@
|
||||
TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe linux \
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
|
||||
mkdir -p $INSTALL/usr/share/terminfo/s
|
||||
TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe screen \
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
|
||||
mkdir -p $INSTALL/usr/share/terminfo/v
|
||||
TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
@ -45,5 +49,3 @@
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm-color \
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \
|
||||
$PKG_BUILD/misc/terminfo.src
|
||||
|
@ -19,12 +19,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvbhdhomerun"
|
||||
PKG_VERSION="20130121"
|
||||
PKG_VERSION="0.0.15"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/"
|
||||
PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
# PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||
PKG_URL="$SOURCEFORGE_SRC/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux libhdhomerun"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0.0.9/userhdhomerun/conf_inifile.cpp
|
||||
--- dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp 2011-03-06 21:00:01.000000000 +0100
|
||||
+++ dvbhdhomerun-0.0.9/userhdhomerun/conf_inifile.cpp 2011-12-20 23:21:46.000000000 +0100
|
||||
@@ -8,6 +8,37 @@
|
||||
diff -uNr dvbhdhomerun-0.0.15-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0.0.15/userhdhomerun/conf_inifile.cpp
|
||||
--- dvbhdhomerun-0.0.15-orig/userhdhomerun/conf_inifile.cpp 2013-02-17 22:37:34.000000000 +0100
|
||||
+++ dvbhdhomerun-0.0.15/userhdhomerun/conf_inifile.cpp 2013-03-02 10:23:46.000000000 +0100
|
||||
@@ -8,6 +8,38 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -35,17 +35,18 @@ diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0.
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
bool ConfIniFile::OpenIniFile(const string& _filename)
|
||||
{
|
||||
ifstream conffile;
|
||||
@@ -15,7 +46,8 @@
|
||||
if(conffile.is_open()) {
|
||||
string line;
|
||||
string section;
|
||||
- while(getline(conffile, line)) {
|
||||
+ //while(getline(conffile, line)) {
|
||||
+ while(safeGetline(conffile, line)) {
|
||||
if(line.empty()) {
|
||||
//LOG() << " ignore, empty";
|
||||
}
|
||||
m_sectionKeyValue.clear();
|
||||
@@ -17,7 +49,8 @@
|
||||
if(conffile.is_open()) {
|
||||
string line;
|
||||
string section;
|
||||
- while(getline(conffile, line)) {
|
||||
+ //while(getline(conffile, line)) {
|
||||
+ while(safeGetline(conffile, line)) {
|
||||
if(line.empty()) {
|
||||
//LOG() << " ignore, empty";
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
diff -uNr dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp
|
||||
--- dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp 2012-04-28 18:05:40.000000000 +0200
|
||||
+++ dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp 2012-06-05 13:21:16.000000000 +0200
|
||||
diff -uNr dvbhdhomerun-0.0.15-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.15/userhdhomerun/hdhomerun_tuner.cpp
|
||||
--- dvbhdhomerun-0.0.15-orig/userhdhomerun/hdhomerun_tuner.cpp 2013-02-17 22:37:34.000000000 +0100
|
||||
+++ dvbhdhomerun-0.0.15/userhdhomerun/hdhomerun_tuner.cpp 2013-03-02 10:25:15.000000000 +0100
|
||||
@@ -97,12 +97,28 @@
|
||||
string type(tmp);
|
||||
LOG() << "Type of device: " << type << endl;
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vboxguest"
|
||||
PKG_VERSION="4.2.6"
|
||||
PKG_VERSION="4.2.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -26,5 +26,21 @@
|
||||
PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] '
|
||||
export PS1
|
||||
|
||||
TERM="linux"
|
||||
case "$TERM" in
|
||||
|
||||
# Do nothing when TERM already set (e.g. by SSH) and known
|
||||
(linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color)
|
||||
;;
|
||||
|
||||
# Default to "linux" when unset
|
||||
("")
|
||||
TERM="linux"
|
||||
;;
|
||||
|
||||
# Default to "xterm" when unknown
|
||||
(*)
|
||||
TERM="xterm"
|
||||
;;
|
||||
|
||||
esac
|
||||
export TERM
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-virtualbox"
|
||||
PKG_VERSION="4.2.6"
|
||||
PKG_VERSION="4.2.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="OSS"
|
||||
|
Loading…
x
Reference in New Issue
Block a user