diff --git a/packages/linux-drivers/dvbhdhomerun/meta b/packages/linux-drivers/dvbhdhomerun/meta index c64c40ce5a3..af55830e4f4 100644 --- a/packages/linux-drivers/dvbhdhomerun/meta +++ b/packages/linux-drivers/dvbhdhomerun/meta @@ -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" diff --git a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch similarity index 60% rename from packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch index 60f1a492f69..d93002d43fe 100644 --- a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch +++ b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch @@ -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"; + } diff --git a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch similarity index 78% rename from packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch index e81954c8090..9a926b9960c 100644 --- a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch +++ b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch @@ -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;