From 799ea5bb77819a71472962d747495806a5e65b8b Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Wed, 6 Jun 2012 08:46:35 +0200 Subject: [PATCH] hdhomerun: dvbhdhomerun upgraded to 0.0.10 --- packages/3rdparty/driver/dvbhdhomerun/meta | 2 +- ...> dvbhdhomerun-0.0.10-001-conf_file.patch} | 0 ...dvbhdhomerun-0.0.10-002-auto_detect.patch} | 10 +++---- packages/3rdparty/lib/libhdhomerun/build | 20 +++++++++++++ packages/3rdparty/lib/libhdhomerun/rename | 20 +++++++++++++ .../addons/driver/hdhomerun/changelog.txt | 3 ++ .../hdhomerun/config/dvbhdhomerun.sample | 29 ++++++++++++------- packages/addons/driver/hdhomerun/meta | 2 +- .../hdhomerun/source/bin/userspace-driver.sh | 12 +++++++- packages/linux-drivers/hdhomerun-driver/meta | 2 +- 10 files changed, 81 insertions(+), 19 deletions(-) rename packages/3rdparty/driver/dvbhdhomerun/patches/{dvbhdhomerun-0.0.9-001-conf_file.patch => dvbhdhomerun-0.0.10-001-conf_file.patch} (100%) rename packages/3rdparty/driver/dvbhdhomerun/patches/{dvbhdhomerun-0.0.9-002-auto_detect.patch => dvbhdhomerun-0.0.10-002-auto_detect.patch} (70%) diff --git a/packages/3rdparty/driver/dvbhdhomerun/meta b/packages/3rdparty/driver/dvbhdhomerun/meta index 1e8fa8c630..e14b8578e7 100644 --- a/packages/3rdparty/driver/dvbhdhomerun/meta +++ b/packages/3rdparty/driver/dvbhdhomerun/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="dvbhdhomerun" -PKG_VERSION="0.0.9" +PKG_VERSION="0.0.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.9-001-conf_file.patch b/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch similarity index 100% rename from packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.9-001-conf_file.patch rename to packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-001-conf_file.patch diff --git a/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.9-002-auto_detect.patch b/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch similarity index 70% rename from packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.9-002-auto_detect.patch rename to packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch index 625fd4bf15..e81954c809 100644 --- a/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.9-002-auto_detect.patch +++ b/packages/3rdparty/driver/dvbhdhomerun/patches/dvbhdhomerun-0.0.10-002-auto_detect.patch @@ -1,10 +1,11 @@ -diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.9/userhdhomerun/hdhomerun_tuner.cpp ---- dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp 2011-03-06 21:00:01.000000000 +0100 -+++ dvbhdhomerun-0.0.9/userhdhomerun/hdhomerun_tuner.cpp 2011-12-21 09:12:03.000000000 +0100 -@@ -80,11 +80,29 @@ +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 +@@ -97,12 +97,28 @@ string type(tmp); LOG() << "Type of device: " << type << endl; if(type == "hdhomerun_dvbt") { +- LOG() << "Notice, setting to DVB-C!! Use /etc/dvbhdhomerun to change that." << endl; - m_type = HdhomerunTuner::DVBC; + m_type = HdhomerunTuner::DVBT; } @@ -28,7 +29,6 @@ diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun + LOG() << "Auto detecting tuner type set to \"" << type + << "\" based on auto detecting" << endl; + } -+ } else { ERR() << "get_model_str from HDHomeRun failed!" << endl; diff --git a/packages/3rdparty/lib/libhdhomerun/build b/packages/3rdparty/lib/libhdhomerun/build index 5c3fc562e1..22f274b3e9 100755 --- a/packages/3rdparty/lib/libhdhomerun/build +++ b/packages/3rdparty/lib/libhdhomerun/build @@ -1,5 +1,25 @@ #!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + . config/options $1 cd $PKG_BUILD diff --git a/packages/3rdparty/lib/libhdhomerun/rename b/packages/3rdparty/lib/libhdhomerun/rename index 82ea04c745..de995de2e0 100755 --- a/packages/3rdparty/lib/libhdhomerun/rename +++ b/packages/3rdparty/lib/libhdhomerun/rename @@ -1,5 +1,25 @@ #!/bin/sh +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + . config/options $1 cd $BUILD diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt index aebf4a085a..47d1ad8101 100644 --- a/packages/addons/driver/hdhomerun/changelog.txt +++ b/packages/addons/driver/hdhomerun/changelog.txt @@ -1,3 +1,6 @@ +2.1.2 +- dvbhdhomerun upgraded to 0.0.10 + 2.1.1 - rebuild for addon version 2.1 diff --git a/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample b/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample index b2d5c473df..9e6018ee6a 100644 --- a/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample +++ b/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample @@ -1,16 +1,25 @@ -# -# /tmp/dvbhdhomerun -# -# Types can any of: +# Remember to exchange the XXXXYYYY-Z with the serial number of your HDHomeRun +# tuner: + +# Auto detect tuner type is not possible in all cases, so you can force it # DVB-C # DVB-T # ATSC -# You can change the tuner type for each tuner on your HDHomeRun by -# exchanging the 1210E3DC-X with the serial number of your tuner: +[XXXXYYYY-0] +tuner_type=DVB-T -#[12109F6E-0] -#tuner_type=DVB-T +[XXXXYYYY-1] +tuner_type=DVB-C -#[12109F6E-1] -#tuner_type=DVB-T +# You can use a full name including tuner ID. Meaning the tuner will appear as +# "HDHomeRun DVB-C 1234EA3D-0" instead of just "HDHomeRun DVB-C" in for example +# TVHeadend. + +[XXXXYYYY-0] +use_full_name=true + +# You can disable certain tuners. As default all detected hdhomeruns are used + +[XXXXYYYY-2] +disable=true diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/meta index faa92a32ac..bc9d4b032c 100644 --- a/packages/addons/driver/hdhomerun/meta +++ b/packages/addons/driver/hdhomerun/meta @@ -20,7 +20,7 @@ PKG_NAME="hdhomerun" PKG_VERSION="2.0" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" diff --git a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh index 7f045918aa..a83d93b3a8 100755 --- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh +++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh @@ -37,14 +37,24 @@ if [ -z "$(pidof userhdhomerun)" ]; then ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun fi + # could be useful + if [ -f $ADDON_HOME/extra-wait.sh ]; then + sh $ADDON_HOME/extra-wait.sh + fi + # if not already added modprobe dvb_hdhomerun modprobe dvb_hdhomerun_fe + # could be useful + if [ -f $ADDON_HOME/extra-wait.sh ]; then + sh $ADDON_HOME/extra-wait.sh + fi + mkdir -p /var/log/ rm -f /var/log/dvbhdhomerun.log - export LD_LIBRARY_PATH=$ADDON_DIR/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=$ADDON_DIR/lib userhdhomerun -f # how much time should we wait? diff --git a/packages/linux-drivers/hdhomerun-driver/meta b/packages/linux-drivers/hdhomerun-driver/meta index 8851230080..c276c31678 100644 --- a/packages/linux-drivers/hdhomerun-driver/meta +++ b/packages/linux-drivers/hdhomerun-driver/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="hdhomerun-driver" -PKG_VERSION="0.0.9" +PKG_VERSION="0.0.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"