config/version: set version to 3.1.0

Signed-off-by: Stephan Raue <stephan@openelec.tv>

CONTRIBUTING.md

@@ -0,0 +1,93 @@
+## Questions about OpenELEC?
+
+To get your questions answered, please ask in the OpenELEC [Forum] or on IRC: #openelec on freenode.net or [webchat] 
+
+Do not open an issue.
+
+## Issue Reports
+
+If you are at all unsure whether it's a bug in OpenELEC or a problem with something
+else, post in the OpenELEC [Forum] instead. If it turns out that it is a bug, an issue
+can always bee opend later.
+
+If you are sure that it's a bug in OpenELEC and you have not found a [similar issue], open a new [issue]
+and try to answer the following questions:
+- What did you do?
+- What did you expect to happen?
+- What happened instead?
+
+It is also importent to provide logs for debugging.
+A zip file can be found in the [logfiles] samba share, this will contain all the logs needed.
+
+Make sure to specify which version of OpenELEC you are using.
+- OpenELEC version
+- OpenELEC build
+- OpenELEC arch
+
+Please don't paste log messages in the issue reports or issue comments use [sprunge.us](http://sprunge.us) instead
+
+Feature requests are great, but they usually end up lying around the issue
+tracker indefinitely. Sending a pull request is a much better way of getting a
+particular feature into OpenELEC.
+
+## Pull Requests
+
+- **Create topic branches**. Don't ask us to pull from your master branch.
+
+- **One pull request per feature**. If you want to do more than one thing, send
+  multiple pull requests.
+
+- **Send coherent history**. Make sure each individual commit in your pull
+  request is meaningful. If you had to make multiple intermediate commits while
+  developing, please squash them before sending them to us.
+
+Please follow this process; it's the best way to get your work included in the project:
+
+- [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+```bash
+   # clone your fork of the repo into the current directory in terminal
+   git clone git@github.com:<your username>/OpenELEC.tv.git
+   # navigate to the newly cloned directory
+   cd OpenELEC.tv
+   # assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/OpenELEC/OpenELEC.tv.git
+   ```
+
+- If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   # fetch upstream changes
+   git fetch upstream
+   # make sure you are on your 'master' branch
+   git checkout master
+   # merge upstream changes
+   git merge upstream/master
+   ```
+
+- Create a new topic branch to contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+- Commit your changes in logical chunks. or your pull request is unlikely
+   be merged into the main project. Use git's
+   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   feature to tidy up your commits before making them public.
+
+- Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+- [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
+    clear title and description.
+
+[Forum]: http://openelec.tv/forum
+[issue]: https://github.com/OpenELEC/OpenELEC.tv/issues
+[webchat]: http://openelec.tv/support/chat
+[logfiles]: http://wiki.openelec.tv/index.php?title=OpenELEC_FAQ#Support_Logs
+[similar issue]: https://github.com/OpenELEC/OpenELEC.tv/search?&ref=cmdform&type=Issues

README.md

@@ -14,7 +14,7 @@ providing cutting edge hardware support to deliver a set-top box experience.
 
 **Installation**
 
-* Please read INSTALL for instructions on how to install.
+* Please read the instructions in our wiki (http://wiki.openelec.tv/index.php?title=Installation) on how to install.
 
 **Known issues**
 

config/addon/addon.xml

@@ -17,6 +17,9 @@
     <description>
 @PKG_LONGDESC@
     </description>
+    <disclaimer>
+@PKG_DISCLAIMER@
+    </disclaimer>
     <platform>all</platform>
   </extension>
 </addon>

config/functions

@@ -56,7 +56,7 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  ls -d $ROOT/$BUILD/linux-[0-9]*
+  ls -d $ROOT/$BUILD/linux-*
 }
 
 tolower(){
@@ -169,6 +169,11 @@ strip_linker_plugin() {
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
+strip_gold() {
+  # strip out usage from GOLD linker
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
+}
+
 fix_module_depends() {
   # modify .modinfo section in kernel module to depends on other required modules
   local MODULE="$1"
@@ -233,7 +238,7 @@ dashes="==========================="
 show_config() {
   dashes="==========================="
   config_message="$config_message\n $dashes$dashes$dashes"
-  config_message="$config_message\n Configuration for $DISTRONAME"
+  config_message="$config_message\n Configuration for $DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "unofficial"))"
   config_message="$config_message\n $dashes$dashes$dashes"
 
   # Build options
@@ -247,6 +252,7 @@ show_config() {
   config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
   config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
+  config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
 
   # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"
@@ -272,7 +278,7 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Broadcom CrystalHD Decoder:\t\t $CRYSTALHD"
-  config_message="$config_message\n - OpenMAX Support (provider):\t\t $OPENMAX_SUPPORT ($OPENMAX)"
+  config_message="$config_message\n - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
   config_message="$config_message\n - VAAPI Support:\t\t\t $VAAPI"
   config_message="$config_message\n - VDPAU Support:\t\t\t $VDPAU"
   config_message="$config_message\n - XVBA Support:\t\t\t $XVBA"
@@ -341,7 +347,6 @@ if [ "$BOOTLOADER" = "u-boot" ]; then
 fi
   config_message="$config_message\n - UDisks support:\t\t\t $UDISKS"
   config_message="$config_message\n - UPower support:\t\t\t $UPOWER"
-  config_message="$config_message\n - Update support:\t\t\t $UPDATE_SUPPORT"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
 
   # Misc. Filesystems

config/graphic

@@ -20,12 +20,6 @@ if [ "$SDL_SUPPORT" = no ]; then
   JOYSTICK_SUPPORT="no"
 fi
 
-if [ "$OPENMAX" = no ]; then
-  OPENMAX_SUPPORT="no"
-else
-  OPENMAX_SUPPORT="yes"
-fi
-
 if [ "$OPENGL_SUPPORT" = no ]; then
   XBMC_SCR_RSXS="no"
   XBMC_VIS_PROJECTM="no"
@@ -34,7 +28,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = "all" ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware virtualbox"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx fglrx-legacy nvidia vmware virtualbox"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do

config/optimize

@@ -29,6 +29,10 @@ if [ "$LTO_SUPPORT" = yes ];then
   LD_OPTIM="$LD_OPTIM -flto"
 fi
 
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi
+
 if [ "$DEBUG" = yes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"

config/version

@@ -1,9 +1,9 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="3.1.0"
 
 # OS_VERSION: OS Version
-  OS_VERSION="3.0"
+  OS_VERSION="3.2"
 
 # ADDON_VERSION: Addon version
-  ADDON_VERSION="3.0"
+  ADDON_VERSION="3.1"
 

packages/3rdparty/download/CouchPotatoServer/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="CouchPotatoServer"
-PKG_VERSION="a49a00a"
+PKG_VERSION="5c0d8a7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/Headphones/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="Headphones"
-PKG_VERSION="263272c"
+PKG_VERSION="452cf15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SABnzbd/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://sabnzbd.org/"
 PKG_URL="$SOURCEFORGE_SRC/sabnzbdplus/sabnzbdplus/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}-src.tar.gz"
 PKG_DEPENDS="Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
-PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline"
+PKG_BUILD_DEPENDS="toolchain Python Cheetah pyOpenSSL yenc unrar unzip par2cmdline configobj"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/downloadmanager"
 PKG_SHORTDESC="SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can."

packages/3rdparty/download/SickBeard/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="SickBeard"
-PKG_VERSION="4e57625"
+PKG_VERSION="fb37d33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch

@@ -1,8 +1,8 @@
 diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
-index 826cf0a..02f14af 100755
+index 2144a0f..703c99e 100755
 --- a/data/interfaces/default/config_notifications.tmpl
 +++ b/data/interfaces/default/config_notifications.tmpl
-@@ -547,45 +547,6 @@
+@@ -639,45 +639,6 @@
  
                  <div class="component-group clearfix">
                      <div class="component-group-desc">
@@ -12,7 +12,7 @@ index 826cf0a..02f14af 100755
 -                    </div>
 -                    <fieldset class="component-group-list">
 -                        <div class="field-pair">
--                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# /> 
+-                            <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
 -                            <label class="clearfix" for="use_libnotify">
 -                                <span class="component-title">Enable</span>
 -                                <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
@@ -21,7 +21,7 @@ index 826cf0a..02f14af 100755
 -
 -                        <div id="content_use_libnotify">
 -                            <div class="field-pair">
--                                <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# /> 
+-                                <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
 -                                <label class="clearfix" for="libnotify_notify_onsnatch">
 -                                    <span class="component-title">Notify on Snatch</span>
 -                                    <span class="component-desc">Send notification when we start a download?</span>
@@ -62,10 +62,10 @@ index fb38f17..4ead36f 100644
                                  <li class="divider"></li>
                                  <li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
 diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
-index 20f0dfc..b0bf6a6 100644
+index da9ff7f..36b608e 100644
 --- a/sickbeard/webserve.py
 +++ b/sickbeard/webserve.py
-@@ -609,7 +609,6 @@ class History:
+@@ -613,7 +613,6 @@ class History:
  
  
  ConfigMenu = [

packages/3rdparty/lib/ccid/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="ccid"
-PKG_VERSION="1.4.8"
+PKG_VERSION="1.4.10"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/ccid.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3768/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"

packages/3rdparty/lib/cxxtools/build

@@ -32,7 +32,9 @@ mkdir -p .build-host && cd .build-host
             --build=$HOST_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
             --disable-static \
-            --enable-shared
+            --enable-shared \
+            --disable-demos \
+            --disable-unittest
 
 make
 make install
@@ -41,12 +43,18 @@ cd ..
 
 setup_toolchain target
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 mkdir -p .build-target && cd .build-target
 ../configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared
+            --enable-static \
+            --disable-shared \
+            --disable-demos \
+            --disable-unittest
 
 $MAKEINSTALL

packages/3rdparty/lib/cxxtools/patches/cxxtools-2.1.1-arm.patch

@@ -0,0 +1,278 @@
+diff --git a/src/bin/formatter.cpp b/src/bin/formatter.cpp
+index 020475e..516d145 100644
+--- a/src/bin/formatter.cpp
++++ b/src/bin/formatter.cpp
+@@ -218,7 +218,7 @@ void Formatter::addValueString(const std::string& name, const std::string& type,
+ 
+     if (type == "int")
+     {
+-        if (value.size() > 0 && (value[0] == L'-' || value[0] == L'+'))
++        if (value.size() > 0 && ( (int) value[0] == (int) L'-' || (int) value[0] == (int) L'+'))
+         {
+             int64_t v = convert<int64_t>(value);
+             printInt(*_out, v, name);
+diff --git a/src/csvparser.cpp b/src/csvparser.cpp
+index f9ee8dd..9d57dc8 100644
+--- a/src/csvparser.cpp
++++ b/src/csvparser.cpp
+@@ -76,23 +76,23 @@ void CsvParser::begin(DeserializerBase& handler)
+ 
+ void CsvParser::advance(Char ch)
+ {
+-    if (ch == L'\n')
++    if ( (int) ch == (int) L'\n')
+         ++_lineNo;
+ 
+     switch (_state)
+     {
+         case state_detectDelim:
+-            if (isalnum(ch) || ch == L'_' || ch == ' ')
++            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) ' ')
+             {
+                 _titles.back() += ch.narrow();
+             }
+-            else if (ch == L'\n' || ch == L'\r')
++            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _noColumns = 1;
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+-            else if (ch == L'\'' || ch == L'"')
++            else if ( (int) ch == (int) L'\'' || (int) ch == (int) L'"')
+             {
+                 _quote = ch;
+                 _state = state_detectDelim_q;
+@@ -119,17 +119,17 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_detectDelim_postq:
+-            if (isalnum(ch) || ch == L'_' || ch == L'\'' || ch == L'"' || ch == L' ')
++            if (isalnum(ch) || (int) ch == (int) L'_' || (int) ch == (int) L'\'' || (int) ch == (int) L'"' || (int) ch == (int) L' ')
+             {
+                 std::ostringstream msg;
+                 msg << "invalid character '" << ch.narrow() << "' within csv title of column " << _titles.size();
+                 SerializationError::doThrow(msg.str());
+             }
+-            else if (ch == L'\n' || ch == L'\r')
++            else if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _noColumns = 1;
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else
+             {
+@@ -142,10 +142,10 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_title:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+                 _noColumns = _titles.size();
+             }
+             else if (ch == _delimiter)
+@@ -153,7 +153,7 @@ void CsvParser::advance(Char ch)
+                 log_debug("title=\"" << _titles.back() << '"');
+                 _titles.push_back(std::string());
+             }
+-            else if (ch == '\'' || ch == '\"')
++            else if ( (int) ch == (int) '\'' || (int) ch == (int) '\"')
+             {
+                 if (_titles.back().empty())
+                 {
+@@ -185,10 +185,10 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_qtitlep:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("title=\"" << _titles.back() << '"');
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+                 _noColumns = _titles.size();
+             }
+             else if (ch == _delimiter)
+@@ -207,7 +207,7 @@ void CsvParser::advance(Char ch)
+ 
+         case state_cr:
+             _state = state_rowstart;
+-            if (ch == L'\n')
++            if ( (int) ch == (int) L'\n')
+             {
+                 break;
+             }
+@@ -228,14 +228,14 @@ void CsvParser::advance(Char ch)
+                 _column < _titles.size() ? _titles[_column] : std::string(),
+                 std::string(), SerializationInfo::Value);
+ 
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 _deserializer->leaveMember();
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+-            else if (ch == L'"' || ch == L'\'')
++            else if ((int) ch == L'"' || (int) ch == L'\'')
+             {
+                 _quote = ch;
+                 _state = state_qdata;
+@@ -253,7 +253,7 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_data0:
+-            if (ch == L'"' || ch == L'\'')
++            if ( (int) ch == (int) L'"' || (int) ch == (int) L'\'')
+             {
+                 _quote = ch;
+                 _state = state_qdata;
+@@ -261,7 +261,7 @@ void CsvParser::advance(Char ch)
+             }
+ 
+         case state_data:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 log_debug("value \"" << _value << '"');
+                 _deserializer->setValue(_value);
+@@ -269,7 +269,7 @@ void CsvParser::advance(Char ch)
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();  // leave data item
+                 _deserializer->leaveMember();  // leave row
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else if (ch == _delimiter)
+             {
+@@ -307,11 +307,11 @@ void CsvParser::advance(Char ch)
+             break;
+ 
+         case state_qdata_end:
+-            if (ch == L'\n' || ch == L'\r')
++            if ( (int) ch == (int) L'\n' || (int) ch == (int) L'\r')
+             {
+                 checkNoColumns(_column, _noColumns, _lineNo);
+                 _deserializer->leaveMember();  // leave row
+-                _state = (ch == L'\r' ? state_cr : state_rowstart);
++                _state = ( (int) ch == (int) L'\r' ? state_cr : state_rowstart);
+             }
+             else if (ch == _delimiter)
+             {
+diff --git a/src/jsonformatter.cpp b/src/jsonformatter.cpp
+index 1604d3e..07ada52 100644
+--- a/src/jsonformatter.cpp
++++ b/src/jsonformatter.cpp
+@@ -323,25 +323,25 @@ void JsonFormatter::stringOut(const std::string& str)
+ {
+     for (std::string::const_iterator it = str.begin(); it != str.end(); ++it)
+     {
+-        if (*it == '"')
++        if ( (int) *it == (int) '"')
+             *_ts << L'\\'
+                 << L'\"';
+-        else if (*it == '\\')
++        else if ( (int) *it == (int) '\\')
+             *_ts << L'\\'
+                 << L'\\';
+-        else if (*it == '\b')
++        else if ( (int) *it == (int) '\b')
+             *_ts << L'\\'
+                 << L'b';
+-        else if (*it == '\f')
++        else if ( (int) *it == (int) '\f')
+             *_ts << L'\\'
+                 << L'f';
+-        else if (*it == '\n')
++        else if ( (int) *it == (int) '\n')
+             *_ts << L'\\'
+                 << L'n';
+-        else if (*it == '\r')
++        else if ( (int) *it == (int) '\r')
+             *_ts << L'\\'
+                 << L'r';
+-        else if (*it == '\t')
++        else if ( (int) *it == (int) '\t')
+             *_ts << L'\\'
+                 << L't';
+         else if (static_cast<unsigned char>(*it) >= 0x80 || static_cast<unsigned char>(*it) < 0x20)
+@@ -364,25 +364,25 @@ void JsonFormatter::stringOut(const cxxtools::String& str)
+ {
+     for (cxxtools::String::const_iterator it = str.begin(); it != str.end(); ++it)
+     {
+-        if (*it == L'"')
++        if ( (int) *it == (int) L'"')
+             *_ts << L'\\'
+                 << L'\"';
+-        else if (*it == L'\\')
++        else if ( (int) *it == (int) L'\\')
+             *_ts << L'\\'
+                 << L'\\';
+-        else if (*it == L'\b')
++        else if ( (int) *it == (int) L'\b')
+             *_ts << L'\\'
+                 << L'b';
+-        else if (*it == L'\f')
++        else if ( (int) *it == (int) L'\f')
+             *_ts << L'\\'
+                 << L'f';
+-        else if (*it == L'\n')
++        else if ( (int) *it == (int) L'\n')
+             *_ts << L'\\'
+                 << L'n';
+-        else if (*it == L'\r')
++        else if ( (int) *it == (int) L'\r')
+             *_ts << L'\\'
+                 << L'r';
+-        else if (*it == L'\t')
++        else if ( (int) *it == (int) L'\t')
+             *_ts << L'\\'
+                 << L't';
+         else if (it->value() >= 0x80 || it->value() < 0x20)
+diff --git a/src/xml/entityresolver.cpp b/src/xml/entityresolver.cpp
+index fb55f08..58ea86a 100644
+--- a/src/xml/entityresolver.cpp
++++ b/src/xml/entityresolver.cpp
+@@ -563,19 +563,19 @@ namespace
+ 
+ String EntityResolver::resolveEntity(const String& entity) const
+ {
+-    if (!entity.empty() && entity[0] == L'#')
++    if (!entity.empty() && (int) entity[0] == (int) L'#')
+     {
+         int code = 0;
+-        if (entity.size() > 2 && entity[1] == L'x')
++        if (entity.size() > 2 && (int) entity[1] == (int) L'x')
+         {
+             // hex notation: &#xABCD;
+             for (String::const_iterator it = entity.begin() + 2; it != entity.end(); ++it)
+             {
+-                if (*it >= L'0' && *it <= L'9')
++                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
+                     code = code * 16 + (it->value() - L'0');
+-                else if (*it >= L'A' && *it <= L'F')
++                else if ( (int) *it >= (int) L'A' && (int) *it <= (int) L'F')
+                     code = code * 16 + (it->value() - L'A' + 10);
+-                else if (*it >= L'a' && *it <= L'f')
++                else if ( (int) *it >= (int) L'a' && (int) *it <= (int) L'f')
+                     code = code * 16 + (it->value() - L'a' + 10);
+                 else
+                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());
+@@ -586,7 +586,7 @@ String EntityResolver::resolveEntity(const String& entity) const
+             // dec notation: &#9999;
+             for (String::const_iterator it = entity.begin() + 1; it != entity.end(); ++it)
+             {
+-                if (*it >= L'0' && *it <= L'9')
++                if ( (int) *it >= (int) L'0' && (int) *it <= (int) L'9')
+                     code = code * 10 + (it->value() - '0');
+                 else
+                     throw std::runtime_error(std::string("invalid entity ") + entity.narrow());

packages/3rdparty/lib/libhdhomerun/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libhdhomerun"
-PKG_VERSION="20130117"
+PKG_VERSION="20130328"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"

packages/3rdparty/lib/libxslt/build

@@ -33,7 +33,7 @@ fi
              --prefix=/usr \
              --sysconfdir=/etc \
              --enable-static \
-             --enable-shared \
+             --disable-shared \
              $CONFIG_LIBXML \
              --disable-ipv6 \
              --without-python \

packages/3rdparty/lib/libzip/build

@@ -27,6 +27,8 @@ cd $PKG_BUILD
 ./configure \
        --host=$TARGET_NAME \
        --build=$HOST_NAME \
+       --enable-static \
+       --disable-shared \
        --prefix=/usr 
 
 $MAKEINSTALL

packages/3rdparty/multimedia/rotorng/build

@@ -24,7 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
 
 make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
-

packages/3rdparty/multimedia/rotorng/meta

@@ -19,15 +19,15 @@
 ################################################################################
 
 PKG_NAME="rotorng"
-PKG_VERSION="0.1.0"
+PKG_VERSION="0.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-rotor-ng"
-PKG_URL="http://projects.vdr-developer.org/attachments/download/631/rotorng-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="vdr"
 PKG_BUILD_DEPENDS="toolchain vdr"
 PKG_PRIORITY="optional"
+PKG_URL="http://projects.vdr-developer.org/attachments/download/1088/rotorng-${PKG_VERSION}.tar.gz"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="Next generation of a VDR plugin design to drive a diseqc rotor"
 PKG_LONGDESC="Next generation of a VDR plugin design to drive a diseqc rotor"

packages/3rdparty/multimedia/rotorng/patches/rotorng-0.1.0-vdr.patch

@@ -1,30 +0,0 @@
-diff -uNr rotorng-0.1.0-orig/rotorng.c rotorng-0.1.0/rotorng.c
---- rotorng-0.1.0-orig/rotorng.c	2012-05-06 16:14:06.000000000 +0200
-+++ rotorng-0.1.0/rotorng.c	2012-05-07 10:52:18.000000000 +0200
-@@ -338,7 +338,7 @@
-   int last_position_shown;
-   bool transfer;
- protected:
--  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
-+  virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView);
- public:
-   cStatusMonitor();
- };
-@@ -348,7 +348,7 @@
-   transfer=false;
- }
- 
--void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber)
-+void cStatusMonitor::ChannelSwitch(const cDevice *Device, int ChannelNumber,bool LiveView)
- {
-   //actuator_status status;
-   if (ChannelNumber) {
-@@ -1494,7 +1494,7 @@
-                snprintf(buf, sizeof(buf),"%s %d", tr(menucaption[itemindex]), menuvalue[itemindex]);
-                break;  
-              case MI_SYSTEM:
--               snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValues));
-+               snprintf(buf, sizeof(buf),"%s %s", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], SystemValuesSat));
-                break;
-              case MI_MODULATION:
-                snprintf(buf, sizeof(buf),"%s %s ", tr(menucaption[itemindex]), MapToUserString(menuvalue[itemindex], ModulationValues));

packages/3rdparty/multimedia/rotorng/patches/rotorng-makefile.patch

@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index 9d62d04..5519a07 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,6 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ 
+ ### The C++ compiler and options:
+ 
+-CXX      ?= g++
+ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ 
+ ### Make sure that the necessary options are included
+@@ -27,7 +26,6 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-parentheses -fpermissive
+ ### The directory environment:
+ 
+ DVBDIR = ../../../../DVB
+-VDRDIR = ../../..
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+@@ -37,11 +35,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-ifeq ($(strip $(APIVERSION)),)
+-  APIVERSION = $(VDRVERSION)
+-endif
+ 
+ ### The name of the distribution archive:
+ 

packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch

@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 65a7674..1a5976e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,7 +31,7 @@ TMPDIR = /tmp
+ 
+ ### The version number of VDR (taken from VDR's "config.h"):
+ 
+-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+ 
+ ### The name of the distribution archive:
+ 
+@@ -54,7 +54,7 @@ all: libvdr-$(PLUGIN).so
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)

packages/3rdparty/multimedia/vdr-epgsearch/build

@@ -23,6 +23,11 @@
 . config/options $1
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-epgsearch/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-epgsearch"
-PKG_VERSION="0fc4817"
+PKG_VERSION="e2de927"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-01_makefile.patch

@@ -0,0 +1,68 @@
+diff --git a/Makefile b/Makefile
+index 6bb1b96..118e379 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,21 +62,10 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG   = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR   = $(call PKGCFG,libdir)
+-LOCDIR   = $(call PKGCFG,locdir)
+-MANDIR   = $(call PKGCFG,mandir)
+-CONFDIR  = $(call PKGCFG,configdir)
+-BINDIR   = $(call PKGCFG,bindir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
+-
+ ### configuring modules
+ ifeq ($(AUTOCONFIG),1)
+ 	ifeq (exists, $(shell pkg-config libpcre && echo exists))
+@@ -92,9 +81,11 @@ ifeq ($(AUTOCONFIG),1)
+ 	endif
+ endif
+ 
++include $(VDRDIR)/Make.global
++
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -103,7 +94,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += 
+ 
+@@ -231,15 +222,19 @@ install-i18n: $(I18Nmsgs)
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN2).so: $(OBJS2)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS2) $(LIBS2) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN3).so: $(OBJS3)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS3) $(LIBS3) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libvdr-$(PLUGIN4).so: $(OBJS4)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS4) $(LIBS4) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ createcats: createcats.o Makefile
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) createcats.o -o $@

packages/3rdparty/multimedia/vdr-iptv/build

@@ -30,4 +30,3 @@ LDFLAGS="$LDFLAGS -fPIC"
 
 cd $PKG_BUILD
 make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
-

packages/3rdparty/multimedia/vdr-iptv/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="0.5.2"
+PKG_VERSION="2.0.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/"
 PKG_URL="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/files/$PKG_NAME-$PKG_VERSION.tgz"
 PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr"
+PKG_BUILD_DEPENDS="toolchain vdr curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-iptv: an IPTV plugin for the Video Disk Recorder (VDR)"

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-skip_header_processing.patch

@@ -1,35 +0,0 @@
-From c7cd9b614762103a95f3da27783e03ce115d43fb Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Sun, 20 May 2012 16:05:51 +0300
-Subject: [PATCH] vdr-iptv: skip header processing
-
----
- protocolhttp.c |   12 +-----------
- 1 files changed, 1 insertions(+), 11 deletions(-)
-
-diff --git a/protocolhttp.c b/protocolhttp.c
-index de50f64..45c5425 100644
---- a/protocolhttp.c
-+++ b/protocolhttp.c
-@@ -140,17 +140,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
-     memset(buf, '\0', sizeof(buf));
-     if (!GetHeaderLine(buf, sizeof(buf), lineLength))
-        return false;
--    if (!responseFound && sscanf(buf, fmt, &version, &response) != 2) {
--       error("Expected HTTP header not found\n");
--       continue;
--       }
--    else
--       responseFound = true;
--    // Allow only 'OK' and 'Partial Content'
--    if ((response != 200) && (response != 206)) {
--       error("Invalid HTTP response (%d): %s\n", response, buf);
--       return false;
--       }
-+      responseFound = true;
-     }
-   return true;
- }
--- 
-1.7.2.5
-

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch

@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d41acd1..58faab1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,9 +5,6 @@
- # Debugging on/off 
- #IPTV_DEBUG = 1
- 
--# Strip debug symbols?  Set eg. to /bin/true if not
--STRIP = strip
--
- # The official name of this plugin.
- # This name will be used in the '-P...' option of VDR to load the plugin.
- # By default the main source file also carries this name.

packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-01_makefile.patch

@@ -0,0 +1,56 @@
+diff --git a/Makefile b/Makefile
+index 7f147b8..db294fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,6 @@
+ 
+ # Strip debug symbols?  Set eg. to /bin/true if not
+ 
+-STRIP = strip
+-
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
+@@ -27,23 +25,15 @@ GITTAG  = $(shell git describe --always 2>/dev/null)
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR = $(call PKGCFG,configdir)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -64,7 +54,7 @@ LIBS = $(shell curl-config --libs)
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES +=
++INCLUDES += -I$(VDRDIR)/include
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -138,6 +128,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ ifndef IPTV_DEBUG
+ 	@$(STRIP) $@
+ endif

packages/3rdparty/multimedia/vdr-live/build

@@ -24,9 +24,9 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
-CFLAGS="$CFLAGS -fPIC"
-CXXFLAGS="$CXXFLAGS -fPIC"
-LDFLAGS="$LDFLAGS -fPIC"
+CFLAGS="$CFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+CXXFLAGS="$CXXFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
+LDFLAGS="$LDFLAGS -fPIC -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 # dont build parallel
   MAKEFLAGS=-j1

packages/3rdparty/multimedia/vdr-live/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-live"
-PKG_VERSION="0.2.0"
+PKG_VERSION="0.3.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://live.vdr-developer.org/en/index.php"
 PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS="vdr"
-PKG_BUILD_DEPENDS="toolchain vdr tntnet"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet pcre-host pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch

@@ -1,39 +0,0 @@
-Description: Allows to use IPV6 addresses
-Forwarded: not-needed
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10
-Bug-Debian: http://bugs.debian.org/630627
-Author: Luboš Doležel <lubos@dolezel.info>
-
---- live-0.2.0/setup.cpp.orig	2008-04-23 01:01:53.000000000 +0200
-+++ live-0.2.0/setup.cpp	2011-06-15 20:22:36.577961061 +0200
-@@ -151,13 +151,28 @@
- 
- bool Setup::CheckServerIps()
- {
-+	bool v6supported = false;
-+	int s = socket(AF_INET6, SOCK_STREAM, 0);
-+	
-+	if (s != -1) {
-+		close(s);
-+		v6supported = true;
-+	}
-+	
- 	if ( m_serverIps.empty() ) {
--		m_serverIps.push_back( "0.0.0.0" );
-+		if (v6supported)
-+			m_serverIps.push_back( "::" );
-+		else
-+			m_serverIps.push_back( "0.0.0.0" );
- 		return true;
- 	}
- 
-+        union {
-+		in_addr in4;
-+		in6_addr in6;
-+	};
- 	for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) {
--		if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
-+		if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) {
- 			esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
- 			cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
- 			return false;

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch

@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_timers_colon.dpatch by Timo Weingärtner <timo@tiwe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: colons have to be replaced by pipes in timer titles.
-
-@DPATCH@
---- vdr-plugin-live-0.2.0/timers.cpp	2008-04-10 22:06:05.000000000 +0200
-+++ vdr-plugin-live-0.2.0.new/timers.cpp	2009-07-25 23:39:02.000000000 +0200
-@@ -138,7 +138,7 @@
- 		ostringstream builder;
- 		builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" )
- 				<< ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":"
--				<< priority << ":" << lifetime << ":" << title << ":" << aux;
-+				<< priority << ":" << lifetime << ":" << StringReplace(title, ":", "|") << ":" << aux;
- 		// dsyslog("%s", builder.str().c_str());
- 
- 		TimerPair timerData( timer, builder.str() );

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch

@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther <tom@toms-cafe.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes compilation with VDR >= 1.7.13.
-
-@DPATCH@
---- live-0.2.0/Makefile
-+++ live-0.2.0/Makefile
-@@ -38,6 +38,7 @@
- ### Allow user defined options to overwrite defaults:
- 
- -include $(VDRDIR)/Make.config
-+EXTRA_INCLUDES = $(INCLUDES)
- 
- ### The version number of VDR's plugin API (taken from VDR's "config.h"):
- 
-@@ -139,10 +140,10 @@
- subdirs: $(SUBDIRS)
- 
- $(SUBDIRS):
--	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
-+	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS)
- 
- PAGES:
--	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
-+	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies
- 
- $(VERSIONSUFFIX): FORCE
- 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
---- live-0.2.0/css/Makefile
-+++ live-0.2.0/css/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS  += `tntnet-config --libs`
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I..
- 
- ### The directory environment:
---- live-0.2.0/httpd/Makefile
-+++ live-0.2.0/httpd/Makefile
-@@ -7,6 +7,7 @@
- 
- ### Includes and Defines (add further entries here):
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.
- 
- ### The object files (add further files here):
---- live-0.2.0/javascript/Makefile
-+++ live-0.2.0/javascript/Makefile
-@@ -7,6 +7,7 @@
- CXXFLAGS += `tntnet-config --cxxflags`
- LDFLAGS  += `tntnet-config --libs`
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
- 
- ### The directory environment:
---- live-0.2.0/pages/Makefile
-+++ live-0.2.0/pages/Makefile
-@@ -2,6 +2,7 @@
- AR       ?= ar
- ECPPC    ?= ecppc
- 
-+INCLUDES += $(EXTRA_INCLUDES)
- INCLUDES += -I.. -I$(VDRDIR)/include
- 
- ### The directory environment:

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-05_do-not-use-the-direct-access-to-crecoding.patch

@@ -1,50 +0,0 @@
-From 94a0a210a485ce1fc95c47a6bc67c4c16c89a0f9 Mon Sep 17 00:00:00 2001
-From: Dieter Hametner
-Date: Sun, 25 Mar 2012 14:42:12 +0000
-Subject: Updated LIVE to latest changes in vdr 1.7.27
-
-- Do not use the direct access to cRecoding members any more.
----
-diff --git a/epg_events.cpp b/epg_events.cpp
-index a514769..cd4996e 100644
---- a/epg_events.cpp
-+++ b/epg_events.cpp
-@@ -182,12 +182,20 @@ namespace vdrlive
- 
- 	time_t EpgRecording::GetStartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	time_t EpgRecording::GetEndTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording ? m_recording->start : 0;
-+#else
-+		return m_recording ? m_recording->Start() : 0;
-+#endif
- 	}
- 
- 	const string EpgRecording::Name() const
-diff --git a/recman.cpp b/recman.cpp
-index fb315d2..6a2fc00 100644
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -383,7 +383,11 @@ namespace vdrlive {
- 
- 	time_t RecordingsItemRec::StartTime() const
- 	{
-+#if VDRVERSNUM < 10726
- 		return m_recording->start;
-+#else
-+		return m_recording->Start();
-+#endif
- 	}
- 
- 	long RecordingsItemRec::Duration() const
---
-cgit v0.9.0.2-40-g7c79

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-06_compile-fix-for-vdr.1.7.28+.patch

@@ -1,40 +0,0 @@
-From c3ecf9fabb674bc154f5a08cdd62e74e2b5d0e36 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert
-Date: Sun, 03 Jun 2012 23:42:31 +0000
-Subject: Compile fix for >=vdr-1.7.28
-
----
-diff --git a/tasks.cpp b/tasks.cpp
-index 9f20190..2a2b8d5 100644
---- a/tasks.cpp
-+++ b/tasks.cpp
-@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
- 
- 	const char *current = NowReplaying();
- 	if (!current || (0 != strcmp(current, recording->FileName()))) {
-+#if VDRVERSNUM >= 10728
-+		cReplayControl::SetRecording( 0 );
-+		cControl::Shutdown();
-+		cReplayControl::SetRecording( recording->FileName() );
-+#else
- 		cReplayControl::SetRecording( 0, 0 );
- 		cControl::Shutdown();
- 		cReplayControl::SetRecording( recording->FileName(), recording->Title() );
-+#endif
- 		cControl::Launch( new cReplayControl );
- 		cControl::Attach();
- 	}
-@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
- 		return;
- 	}
- 
-+#if VDRVERSNUM >= 10728
-+	cReplayControl::SetRecording( 0 );
-+#else
- 	cReplayControl::SetRecording( 0, 0 );
-+#endif
- 	cControl::Shutdown();
- }
- 
---
-cgit v0.9.0.2-40-g7c79

packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-dvbapi"
-PKG_VERSION="cd93752"
+PKG_VERSION="555272d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch

@@ -0,0 +1,77 @@
+diff --git a/Makefile b/Makefile
+index ebe9d76..ef2d2e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG  = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR  = $(call PKGCFG,libdir)
+-LOCDIR  = $(call PKGCFG,locdir)
+-PLGCFG  = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
+-ifeq ($(strip $(APIVERSION)),)
+-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+-NOCONFIG := 1
+-endif
+-
+-# backward compatibility with VDR version < 1.7.34
+-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
+-
+-ifdef API1733
+-
+-VDRSRC = $(VDRDIR)
+-ifeq ($(strip $(VDRSRC)),)
+-VDRSRC := ../../..
+-endif
+-LIBDIR = $(VDRSRC)/PLUGINS/lib
+-
+-ifndef NOCONFIG
+-CXXFLAGS = $(call PKGCFG,cflags)
+-CXXFLAGS += -fPIC
+-else
+--include $(VDRSRC)/Make.global
+--include $(VDRSRC)/Make.config
+-endif
+-
+-export CXXFLAGS
+-endif
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-ifdef API1733
+ INCLUDES += -I$(VDRSRC)/include
+-endif
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+@@ -145,6 +110,7 @@ $(DEPFILE): Makefile
+ 
+ $(SOFILE): $(OBJS) $(FFDECSA)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ libdvbapi-dvbsddevice.so: device-sd.o
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@

packages/3rdparty/multimedia/vdr-plugin-streamdev/build

@@ -24,6 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-plugin-streamdev/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-streamdev"
-PKG_VERSION="f58086a"
+PKG_VERSION="329129d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-01_makefile.patch

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 90f3261..d80e15d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,22 +15,15 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
+ 
+ ### The directory environment:
+ 
+-# Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-#
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++include $(VDRDIR)/Make.global
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+diff --git a/client/Makefile b/client/Makefile
+index ea9dc45..6fac485 100644
+--- a/client/Makefile
++++ b/client/Makefile
+@@ -72,6 +72,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/server/Makefile b/server/Makefile
+index 37cd4bb..8d2f49f 100644
+--- a/server/Makefile
++++ b/server/Makefile
+@@ -78,6 +78,7 @@ install-i18n: $(I18Nmsgs)
+ $(SOFILE): $(SERVEROBJS) $(COMMONOBJS) \
+ 	../tools/sockettools.a ../remux/remux.a ../libdvbmpeg/libdvbmpegtools.a
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
++	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-02_makefile-largefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index d80e15d..ed2e168 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ INCLUDES += -I$(VDRDIR)/include -I..
+ export INCLUDES
+ 
+-DEFINES += -D_GNU_SOURCE
++DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifdef DEBUG
+ DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-f58086a-makefile.patch

@@ -1,19 +0,0 @@
-commit 949a46ec2ea06d97a7fcd47adc33153215399ac5
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Sun Mar 4 16:39:58 2012 +0200
-
-    vdr-streamdev: adjust makefile for openelec
-
-diff --git a/Makefile b/Makefile
-index b375844..231041f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,8 +21,6 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
- TMPDIR = /tmp
- 
- ### The version number of VDR (taken from VDR's "config.h"):

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/build

@@ -24,6 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
 

packages/3rdparty/multimedia/vdr-plugin-vnsiserver/patches/vdr-plugin-vnsiserver-02_makefile-largefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 92fc90d..4196724 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ INCLUDES += -I$(VDRDIR)/include -I$(VDRDIR)
+ 
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"'
++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DVNSI_SERVER_VERSION='"$(VERSION)"' -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ 
+ ifeq ($(DEBUG),1)
+ DEFINES += -DDEBUG

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/build

@@ -23,6 +23,11 @@
 . config/options $1
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 cd $PKG_BUILD
   PWD=`pwd`
   make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-plugin-xmltv2vdr/meta

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xmltv2vdr"
-PKG_VERSION="8be374e781e734b44edbd6bc03cfdc1694f6617e"
+PKG_VERSION="30903cc0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://projects.vdr-developer.org/projects/plg-xmltv2vdr"
 PKG_URL="http://projects.vdr-developer.org/git/vdr-plugin-xmltv2vdr.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt"
-PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca"
+PKG_DEPENDS="vdr curl libxml2"
+PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr-xmltv2vdr"

packages/3rdparty/multimedia/vdr-plugin-xvdr/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-plugin-xvdr"
-PKG_VERSION="c43033c"
+PKG_VERSION="33afe59"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-makefile.patch

@@ -0,0 +1,79 @@
+diff --git a/Makefile b/Makefile
+index 06a49a2..ab037bd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,45 +16,46 @@ VERSION = $(shell grep 'static const char \*VERSION *=' src/xvdr/xvdr.h | awk '{
+ ### The directory environment:
+ 
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+-LIBDIR = $(call PKGCFG,libdir)
+-LOCDIR = $(call PKGCFG,locdir)
+-PLGCFG = $(call PKGCFG,plgcfg)
+-CFGDIR  = $(call PKGCFG,configdir)/plugins/$(PLUGIN)
+ #
+ TMPDIR ?= /tmp
+ 
+ ### The compiler options:
+ 
+-export CFLAGS   = $(call PKGCFG,cflags)
+-export CXXFLAGS = $(call PKGCFG,cxxflags)
++OPTLEVEL ?= 2
++CXXFLAGS = -O$(OPTLEVEL) -g -Wall -Woverloaded-virtual -fPIC -DPIC
+ 
+ ### The version number of VDR's plugin API:
+ 
+-APIVERSION = $(call PKGCFG,apiversion)
++#DVBDIR = ../../../../DVB
++#VDRDIR = ../../..
++#LIBDIR = ../../lib
++#TMPDIR = /tmp
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+--include $(PLGCFG)
++-include $(VDRDIR)/Make.config
++-include $(VDRDIR)/Make.global
+ 
+ ### The name of the distribution archive:
+ 
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+ 
++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++
+ ### The name of the shared object file:
+ 
+ SOFILE = libvdr-$(PLUGIN).so
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-INCLUDES += -I./src
++INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(VDRDIR) -I./src -I.
+ 
+ ifdef DEBUG
+ INCLUDES += -DDEBUG
+ endif
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DXVDR_VERSION='"$(VERSION)"'
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DXVDR_VERSION='"$(VERSION)"'
+ 
+ ### The object files (add further files here):
+ 
+@@ -103,7 +104,7 @@ all: $(SOFILE) i18n
+ MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
++	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ 
+ -include $(DEPFILE)
+ 
+@@ -137,6 +138,7 @@ install-i18n: $(I18Nmsgs)
+ 
+ $(SOFILE): $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)

packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-620-dynamite.patch

@@ -1,282 +0,0 @@
-diff -r 442eee2f550d device-hd.c
---- a/device-hd.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-hd.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -50,12 +50,18 @@
- {
-   if(!initial) cCondWait::SleepMs(150);
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_DESCR,ca_descr)>=0;
- }
- 
- bool cScDvbHdFfDevice::SetCaPid(ca_pid_t *ca_pid)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_PID,ca_pid)>=0;
- }
- 
-diff -r 442eee2f550d device-sd.c
---- a/device-sd.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-sd.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -59,12 +59,18 @@
- bool cScDvbSdFfDevice::SetCaDescr(ca_descr_t *ca_descr, bool initial)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_DESCR,ca_descr)>=0;
- }
- 
- bool cScDvbSdFfDevice::SetCaPid(ca_pid_t *ca_pid)
- {
-   cMutexLock lock(&cafdMutex);
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return false;
-+// END vdr-plugin-dynamite
-   return ioctl(fd_ca,CA_SET_PID,ca_pid)>=0;
- }
- 
-@@ -88,6 +94,9 @@
- 
- void cScDvbSdFfDevice::DumpAV(void)
- {
-+// BEGIN vdr-plugin-dynamite
-+  if(fd_ca < 0) return;
-+// END vdr-plugin-dynamite
-   if(LOG(L_CORE_AV7110)) {
- #define CODEBASE (0x2e000404+0x1ce00)
-     cMutexLock lock(&cafdMutex);
-diff -r 442eee2f550d device-tmpl.c
---- a/device-tmpl.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device-tmpl.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -62,6 +62,14 @@
- #else
-   cCam *Cam(void) { return cam; }
- #endif //!SASC
-+// BEGIN vdr-plugin-dynamite
-+private:
-+  bool lateInit;
-+public:
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+  virtual bool SetIdleDevice(bool Idle, bool TestOnly);
-+#endif
-+// END vdr-plugin-dynamite
-   };
- 
- SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int cafd)
-@@ -75,6 +83,9 @@
- :DVBDEVICE(Adapter)
- #endif //APIVERSNUM >= 10711
- {
-+// BEGIN vdr-plugin-dynamite
-+  lateInit = false;
-+// END vdr-plugin-dynamite
- #ifndef SASC
-   tsBuffer=0; hwciadapter=0;
- #endif
-@@ -88,10 +99,18 @@
- #ifdef SASC
-   cam=new cCam(this,Adapter,0,devId,devplugin,softcsa,fullts);
- #endif // !SASC
-+// BEGIN vdr-plugin-dynamite
-+  cScDevices::AddScDevice(this);
-+  if (cScDevices::AutoLateInit())
-+     LateInit();
-+// END vdr-plugin-dynamite
- }
- 
- SCDEVICE::~SCDEVICE()
- {
-+// BEGIN vdr-plugin-dynamite
-+  cScDevices::DelScDevice(this);
-+// END vdr-plugin-dynamite
- #ifndef SASC
-   DetachAllReceivers();
-   Cancel(3);
-@@ -139,6 +158,9 @@
- 
- void SCDEVICE::LateInit(void)
- {
-+  if (lateInit)
-+     return;
-+  lateInit = true;
-   int n=CardIndex();
-   if(DeviceNumber()!=n)
-     PRINTF(L_GEN_ERROR,"CardIndex - DeviceNumber mismatch! Put SC plugin first on VDR commandline!");
-@@ -155,8 +177,17 @@
-     if(fullts) PRINTF(L_GEN_INFO,"Enabling hybrid full-ts mode on card %s",devId);
-     else PRINTF(L_GEN_INFO,"Using software decryption on card %s",devId);
-     }
--  if(fd_ca2>=0) hwciadapter=cDvbCiAdapter::CreateCiAdapter(this,fd_ca2);
--  cam=new cCam(this,DVB_DEV_SPEC,devId,devplugin,softcsa,fullts);
-+// BEGIN vdr-plugin-dynamite
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+  cDevice *cidev = parentDevice ? parentDevice : this;
-+#else
-+  cDevice *cidev = this;
-+#endif
-+  if(fd_ca2>=0) hwciadapter=cDvbCiAdapter::CreateCiAdapter(cidev,fd_ca2);
-+  if (cidev != this)
-+     fd_ca2 = -1; // will be closed by patched cDvbCiAdapter
-+  cam=new cCam(cidev,DVB_DEV_SPEC,devId,devplugin,softcsa,fullts);
-+// END vdr-plugin-dynamite
- }
- 
- bool SCDEVICE::HasCi(void)
-@@ -225,6 +256,36 @@
-   return false;
- }
- 
-+// BEGIN vdr-plugin-dynamite
-+#ifdef __DYNAMIC_DEVICE_PROBE
-+bool SCDEVICE::SetIdleDevice(bool Idle, bool TestOnly)
-+{
-+  if (TestOnly) {
-+     if (hwciadapter)
-+        return hwciadapter->SetIdle(Idle, true);
-+     return DVBDEVICE::SetIdleDevice(Idle, true);
-+     }
-+  if (hwciadapter && !hwciadapter->SetIdle(Idle, false))
-+     return false;
-+  if (!DVBDEVICE::SetIdleDevice(Idle, false)) {
-+     if (hwciadapter)
-+        hwciadapter->SetIdle(!Idle, false);
-+     return false;
-+     }
-+  if (Idle) {
-+     if (fd_ca >= 0)
-+        close(fd_ca);
-+     fd_ca = -1;
-+     }
-+  else {
-+     if (fd_ca < 0)
-+        fd_ca = cScDevices::DvbOpen(DEV_DVB_CA,adapter,frontend,O_RDWR);
-+     }
-+  return true;
-+}
-+#endif
-+// END vdr-plugin-dynamite
-+
- #endif // !SASC
- 
- #undef SCDEVICE
-diff -r 442eee2f550d device.c
---- a/device.c	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device.c	Thu Oct 13 00:15:52 2011 +0200
-@@ -285,6 +285,58 @@
- 
- int cScDevices::budget=0;
- 
-+// BEGIN vdr-plugin-dynamite
-+// dynamite fills the vdr::cDevice::device array with vdr::plugin::dynamite::cDynamicDevice
-+// we have to maintain our own list of sc-devices
-+int cScDevices::numScDevices = 0;
-+cDevice *cScDevices::scdevice[MAXDEVICES] = { NULL };
-+bool cScDevices::autoLateInit = false;
-+
-+int cScDevices::NumScDevices(void)
-+{
-+  return numScDevices;
-+}
-+
-+cDevice *cScDevices::GetScDevice(int CardIndex)
-+{
-+  for (int n = 0; n < numScDevices; n++) {
-+      if (scdevice[n] && (scdevice[n]->CardIndex() == CardIndex))
-+         return scdevice[n];
-+      }
-+  return NULL;
-+}
-+
-+void cScDevices::AddScDevice(cDevice *Device)
-+{
-+  if (Device == NULL)
-+     return;
-+  int i = 0;
-+  while ((i < numScDevices) && (i < MAXDEVICES) && (scdevice[i] != Device))
-+        i++;
-+  if (i < MAXDEVICES) {
-+     scdevice[i] = Device;
-+     if (i == numScDevices)
-+        numScDevices++;
-+     }
-+  else
-+     esyslog("too many sc-devices!");
-+}
-+
-+void cScDevices::DelScDevice(cDevice *Device)
-+{
-+  if (Device == NULL)
-+     return;
-+  int i = 0;
-+  while ((i < numScDevices) && (i < MAXDEVICES)) {
-+        if (scdevice[i] == Device) {
-+           scdevice[i] = NULL;
-+           break;
-+           }
-+        i++;
-+        }
-+}
-+// END vdr-plugin-dynamite
-+
- void cScDevices::DvbName(const char *Name, int a, int f, char *buffer, int len)
- {
-   snprintf(buffer,len,"%s%d/%s%d",DEV_DVB_ADAPTER,a,Name,f);
-@@ -393,17 +445,22 @@
- {
-   if(ScSetup.ForceTransfer)
-     SetTransferModeForDolbyDigital(2);
--  for(int n=cDevice::NumDevices(); --n>=0;) {
--    cDevice *dev=cDevice::GetDevice(n);
-+// BEGIN vdr-plugin-dynamite
-+  for(int n=NumScDevices(); --n>=0;) {
-+    cDevice *dev=GetScDevice(n);
-     for(cScDevicePlugin *dp=devplugins.First(); dp; dp=devplugins.Next(dp))
-       if(dp->LateInit(dev)) break;
-     }
-+  autoLateInit = true;
-+// END vdr-plugin-dynamite
- }
- 
- void cScDevices::Shutdown(void)
- {
--  for(int n=cDevice::NumDevices(); --n>=0;) {
--    cDevice *dev=cDevice::GetDevice(n);
-+// BEGIN vdr-plugin-dynamite
-+  for(int n=NumScDevices(); --n>=0;) {
-+    cDevice *dev=GetScDevice(n);
-+// END vdr-plugin-dynamite
-     for(cScDevicePlugin *dp=devplugins.First(); dp; dp=devplugins.Next(dp))
-       if(dp->EarlyShutdown(dev)) break;
-     }
-diff -r 442eee2f550d device.h
---- a/device.h	Sun Oct 02 21:09:13 2011 +0200
-+++ b/device.h	Thu Oct 13 00:15:52 2011 +0200
-@@ -84,6 +84,21 @@
-   static bool ForceBudget(int n);
-   static void DvbName(const char *Name, int a, int f, char *buffer, int len);
-   static int DvbOpen(const char *Name, int a, int f, int Mode, bool ReportError=false);
-+
-+// BEGIN vdr-plugin-dynamite
-+// dynamite fills the vdr::cDevice::device array with vdr::plugin::dynamite::cDynamicDevice
-+// we have to maintain our own list of sc-devices
-+private:
-+  static int numScDevices;
-+  static cDevice *scdevice[MAXDEVICES];
-+  static bool autoLateInit;
-+public:
-+  static int NumScDevices(void);
-+  static cDevice *GetScDevice(int CardIndex);
-+  static void AddScDevice(cDevice *Device);
-+  static void DelScDevice(cDevice *Device);
-+  static bool AutoLateInit() { return autoLateInit; };
-+// END vdr-plugin-dynamite
-   };
- 
- // ----------------------------------------------------------------

packages/3rdparty/multimedia/vdr/build

@@ -29,10 +29,11 @@ cd $PKG_BUILD
 
 cat > Make.config <<EOF
 PLUGINLIBDIR = /usr/lib/vdr
+PREFIX = /usr
 VIDEODIR = /storage/videos
 CONFDIR = /storage/.config/vdr
 LOCDIR = /usr/share/locale
-LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
+#LIBS += -lz -lexpat -lbz2 -lfontconfig -lfreetype -lxml2
 
 NO_KBD=yes
 VDR_USER=root
@@ -46,3 +47,5 @@ fi
 
 make vdr
 make include-dir
+make plugins
+make install-plugins DESTDIR=$ROOT/$PKG_BUILD/.install

packages/3rdparty/multimedia/vdr/meta

@@ -20,14 +20,14 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="1.7.33"
+PKG_VERSION="2.0.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="fontconfig freetype libcap"
-PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat"
+PKG_URL="ftp://ftp.tvdr.de/vdr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="fontconfig freetype"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2 ncurses"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/3rdparty/multimedia/vdr/patches/vdr-1.7.33-10_hannels.conf.terr-fix.patch

@@ -1,16 +0,0 @@
-Description: Removes Ch 14 fom example channels.conf.terr, because the entry is
- invalid (reported as Ubuntu Bug #45721)
-Author: Thomas Schmidt <tschmidt@debian.org>
-
-Index: vdr/channels.conf.terr
-===================================================================
---- vdr.orig/channels.conf.terr	2011-12-10 22:22:04.000000000 +0100
-+++ vdr/channels.conf.terr	2011-12-11 01:49:01.000000000 +0100
-@@ -9,7 +9,6 @@
- bid-up.tv (TV):561833:I0C23D0M64B8T2G32Y0:T:27500:6273:6274:0:0:14272:0:0:0
- CBBC (TV):505833:I0C34D0M16B8T2G32Y0:T:27500:620:621,622:0:0:4671:0:0:0
- Cbeebies (TV):529833:I0C34D0M16B8T2G32Y0:T:27500:201:401,402:0:0:16960:0:0:0
--Ch 14 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2840:2841:2843:0:0:8800:0:0
- Ch 32 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:25984:0:0:0
- Ch 44 (TV):537833:I0C34D0M16B8T2G32Y0:T:27500:501:502,504:0:0:26048:0:0:0
- Channel 4 (TV):481833:I0C23D0M64B8T2G32Y0:T:27500:2827:2828,2830:0:0:8384:0:0:0

packages/3rdparty/multimedia/vdr/patches/vdr-44_rotor.patch

@@ -0,0 +1,133 @@
+Description: This patch is needed for the rotor plugin.
+Author: Thomas Bergwinkl <Bergwinkl.Thomas@vr-web.de>
+Origin: extracted from the rotor plugin 0.1.4-vdr1.5
+
+Index: b/device.h
+===================================================================
+--- a/device.h
++++ b/device.h
+@@ -24,6 +24,8 @@
+ #include "spu.h"
+ #include "thread.h"
+ #include "tools.h"
++#include <asm/types.h>
++#include <linux/dvb/frontend.h>
+ 
+ #define MAXDEVICES         16 // the maximum number of devices in the system
+ #define MAXPIDHANDLES      64 // the maximum number of different PIDs per device
+@@ -337,6 +339,7 @@
+   virtual bool HasProgramme(void) const;
+          ///< Returns true if the device is currently showing any programme to
+          ///< the user, either through replaying or live.
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd) {return false;}
+ 
+ // PID handle facilities
+ 
+Index: b/dvbdevice.c
+===================================================================
+--- a/dvbdevice.c
++++ b/dvbdevice.c
+@@ -283,6 +283,7 @@
+ private:
+   static cMutex bondMutex;
+   enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
++  bool SendDiseqc;
+   int frontendType;
+   const cDvbDevice *device;
+   int fd_frontend;
+@@ -299,6 +300,7 @@
+   cMutex mutex;
+   cCondVar locked;
+   cCondVar newSet;
++  dvb_diseqc_master_cmd diseqc_cmd;
+   cDvbTuner *bondedTuner;
+   bool bondedMaster;
+   bool SetFrontendType(const cChannel *Channel);
+@@ -325,12 +327,16 @@
+   bool Locked(int TimeoutMs = 0);
+   int GetSignalStrength(void) const;
+   int GetSignalQuality(void) const;
++  bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
++private:
++  int GetCurrentDeliverySystem(void);
+   };
+ 
+ cMutex cDvbTuner::bondMutex;
+ 
+ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
+ {
++  SendDiseqc = false;
+   frontendType = SYS_UNDEFINED;
+   device = Device;
+   fd_frontend = Fd_Frontend;
+@@ -653,6 +659,35 @@
+   return -1;
+ }
+ 
++int cDvbTuner::GetCurrentDeliverySystem()
++{
++  dtv_property Frontend[1];
++  memset(&Frontend, 0, sizeof(Frontend));
++  dtv_properties CmdSeq;
++  memset(&CmdSeq, 0, sizeof(CmdSeq));
++  CmdSeq.props = Frontend;
++  Frontend[0].cmd = DTV_DELIVERY_SYSTEM;
++  Frontend[0].u.data = 0;
++  if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) < 0) {
++     esyslog("ERROR: frontend %d/%d: %m", adapter, frontend);
++     return SYS_UNDEFINED;
++     }
++  return Frontend[0].u.data;
++}
++
++bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  cMutexLock MutexLock(&mutex);
++  int frontendType = GetCurrentDeliverySystem();
++  if ((frontendType != SYS_DVBS && frontendType != SYS_DVBS2) || SendDiseqc)
++    return false;
++  diseqc_cmd=cmd;
++  SendDiseqc=true;
++  newSet.Broadcast();
++  return true;
++}
++
++
+ static unsigned int FrequencyToHz(unsigned int f)
+ {
+   while (f && f < 1000000)
+@@ -874,6 +909,10 @@
+         if (GetFrontendStatus(NewStatus))
+            Status = NewStatus;
+         cMutexLock MutexLock(&mutex);
++        if (SendDiseqc) {
++           CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &diseqc_cmd));
++           SendDiseqc=false;
++           }
+         int WaitTime = 1000;
+         switch (tunerStatus) {
+           case tsIdle:
+@@ -1571,6 +1610,11 @@
+   return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
+ }
+ 
++bool cDvbDevice::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
++{
++  return dvbTuner->SendDiseqcCmd(cmd);
++}
++
+ void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
+ {
+   setTransferModeForDolbyDigital = Mode;
+Index: b/dvbdevice.h
+===================================================================
+--- a/dvbdevice.h
++++ b/dvbdevice.h
+@@ -196,6 +196,7 @@
+   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+ public:
+   virtual bool HasLock(int TimeoutMs = 0) const;
++  virtual bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
+ 
+ // PID handle facilities
+ 

packages/3rdparty/multimedia/vdr/patches/vdr-98-ncurses.patch

@@ -0,0 +1,26 @@
+diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
+index fa0ce41..5c71bcf 100644
+--- a/PLUGINS/src/skincurses/Makefile
++++ b/PLUGINS/src/skincurses/Makefile
+@@ -102,7 +102,7 @@ install-i18n: $(I18Nmsgs)
+ ### Targets:
+ 
+ $(SOFILE): $(OBJS)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncurses -o $@
+ 
+ install-lib: $(SOFILE)
+ 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c
+index 8a4da96..4c2eeed 100644
+--- a/PLUGINS/src/skincurses/skincurses.c
++++ b/PLUGINS/src/skincurses/skincurses.c
+@@ -6,7 +6,7 @@
+  * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $
+  */
+ 
+-#include <ncurses.h>
++#include <ncurses/ncurses.h>
+ #include <vdr/osd.h>
+ #include <vdr/plugin.h>
+ #include <vdr/skins.h>

packages/3rdparty/system/pcsc-lite/build

@@ -30,8 +30,8 @@ PCSCD_ADDON_DIR="/storage/.xbmc/addons/service.system.pcscd-addon"
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --enable-shared \
-            --disable-static \
+            --disable-shared \
+            --enable-static \
             --disable-libudev \
             --enable-libusb \
             --enable-usbdropdir=$PCSCD_ADDON_DIR/drivers

packages/3rdparty/system/pcsc-lite/meta

@@ -20,12 +20,12 @@
 ################################################################################
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="1.8.7"
+PKG_VERSION="1.8.8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"
-PKG_URL="https://alioth.debian.org/frs/download.php/3842/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3862/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libusb"
 PKG_PRIORITY="optional"

packages/addons/driver/hdhomerun/addon

@@ -24,3 +24,4 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/
   cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,19 +1,29 @@
+3.1.2
+  new addon settings option to enable suspend/resume driver actions
+  new addon settings option to enable logging
+3.1.1
+  rebuild for OpenELEC-3.2
+3.0.5
+  rebuild
+3.0.4
+  fixed "bad substitution" error with busybox/ash
+3.0.3
+  improved python script for modifying tuners
+3.0.2
+  added addon settings for
+    modifying tuner type (DVB-C, DVB-T, ATSC)
+    setting delays
 3.0.1
-- bump addon version
-- binary files are stored with OpenELEC image
-- addon is used to start userspace program
-
+  bump addon version
+  binary files are stored with OpenELEC image
+  addon is used to start userspace program
 2.1.3
-- bump addon version for new kernel
-
+  bump addon version for new kernel
 2.1.2
-- dvbhdhomerun upgraded to 0.0.10
-
+  dvbhdhomerun upgraded to 0.0.10
 2.1.1
-- rebuild for addon version 2.1
-
+  rebuild for addon version 2.1
 2.0.1
-- starting userspace DVB drivers from Tvheadend/VDR
-
+  starting userspace DVB drivers from Tvheadend/VDR
 2.0.0
-- initial version of HDHomeRun driver
+  initial version of HDHomeRun driver

packages/addons/driver/hdhomerun/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="3.0"
-PKG_REV="1"
+PKG_VERSION="3.2"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
@@ -31,8 +31,6 @@ PKG_PRIORITY="optional"
 PKG_SECTION="driver/dvb"
 PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."
 PKG_LONGDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."
-
 PKG_AUTORECONF="no"
-
 PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.python.script"

packages/addons/driver/hdhomerun/settings-default.xml

@@ -0,0 +1,7 @@
+<settings>
+  <setting id="PRE_WAIT"  value="2" />
+  <setting id="POST_WAIT" value="1" />
+  <setting id="USERHDHOMERUN_LOG" value="false" />
+  <setting id="LIBHDHOMERUN_LOG" value="false" />
+  <setting id="SUSPEND_DRIVER" value="false" />
+</settings>

packages/addons/driver/hdhomerun/source/bin/hdhomerun.start

@@ -20,8 +20,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+. /etc/profile
 
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libevent*.so* $INSTALL/usr/lib
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
 
+logger -t Hdhomerun "### Hdhomerun manual start ###"
+. $ADDON_DIR/bin/userspace-driver.sh

packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop

@@ -22,10 +22,5 @@
 
 . /etc/profile
 
-case "$1" in
-  thaw|resume)
-    autoupdate &
-    ;;
-  *) exit $NA
-    ;;
-esac
+logger -t Hdhomerun "### Hdhomerun manual stop ###"
+killall userhdhomerun

packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -22,48 +22,144 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+# start locking mechanism - allows only one instance to be run at a time
+HDHR_LOCKFILE="/var/lock/userspace-driver-hdhomerun.lck"
+HDHR_LOCKFD=99
+# obtain an exclusive lock
+exlock() { eval "exec $HDHR_LOCKFD>\"$HDHR_LOCKFILE\""; flock -x $HDHR_LOCKFD; }
+# drop a lock
+unlock() { flock -u $HDHR_LOCKFD; flock -xn $HDHR_LOCKFD && rm -f "$HDHR_LOCKFILE"; }
+# end locking mechanism
 
-mkdir -p $ADDON_HOME
+# exclusive lock
+exlock
 
-if [ ! -f "$ADDON_HOME/dvbhdhomerun.sample" ]; then
-  cp $ADDON_DIR/config/* $ADDON_HOME/
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
+
+# modules are not automatically loaded
+modprobe dvb_hdhomerun
+modprobe dvb_hdhomerun_fe
+
+mkdir -p $HDHR_ADDON_HOME
+
+if [ ! -f "$HDHR_ADDON_HOME/dvbhdhomerun.sample" ]; then
+  cp $HDHR_ADDON_DIR/config/* $HDHR_ADDON_HOME/
 fi
 
+if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
+  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
+fi
+
+mkdir -p /var/config
+cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
+. /var/config/hdhomerun-addon.conf
+
 if [ -z "$(pidof userhdhomerun)" ]; then
+  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
+    DVBHDHOMERUN_CONF_TMP=/tmp/dvbhdhomerun.conf
+    touch $HDHR_ADDON_HOME/dvbhdhomerun.conf
+    cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
+
+    # get tuner serial numbers
+    SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
+    . /var/config/hdhomerun-addon.conf
+
+    for SERIAL in $SERIALS; do
+      SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
+      FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
+      DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DISABLE)
+
+      [ "$DVBMODE" = "auto" ] && DVBMODE=""
+
+      # remove setttings for this tuner
+      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
+      mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
+      echo "" >>$DVBHDHOMERUN_CONF_TMP
+      # remove empty lines at the end of file
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+
+      ADDNEW=true
+      if [ -n "$DVBMODE" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+        echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
+      fi
+      if [ "$FULLNAME" = "true" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+        echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
+      fi
+      if [ "$DISABLE" = "true" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
+        echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
+      fi
+
+      echo "" >>$DVBHDHOMERUN_CONF_TMP
+    done
+
+    # remove logging from libhdhomerun library
+    awk -v val="[libhdhomerun]" '$0 == val {flag=1; next} /^enable=|^logfile=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-log
+    mv ${DVBHDHOMERUN_CONF_TMP}-log $DVBHDHOMERUN_CONF_TMP
+    echo "" >>$DVBHDHOMERUN_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
+
+    if [ "$LIBHDHOMERUN_LOG" = "true" ]; then
+      cat >>$DVBHDHOMERUN_CONF_TMP << EOF
+
+[libhdhomerun]
+enable=true
+logfile=/var/log/dvbhdhomerun_libhdhomerun.log
+
+EOF
+    fi
+
+    md5_1=$(md5sum -b $DVBHDHOMERUN_CONF_TMP | awk '{print $1}')
+    md5_2=$(md5sum -b $HDHR_ADDON_HOME/dvbhdhomerun.conf | awk '{print $1}')
+    if [ "$md5_1" != "$md5_2" ]; then
+      # file changed - copy to addon home
+      cp $DVBHDHOMERUN_CONF_TMP $HDHR_ADDON_HOME/dvbhdhomerun.conf
+    fi
+  fi
+
   rm -f /tmp/dvbhdhomerun
-  if [ -f $ADDON_HOME/dvbhdhomerun.conf ]; then
-    ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
+  if [ -f $HDHR_ADDON_HOME/dvbhdhomerun.conf ]; then
+    ln -s $HDHR_ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
   fi
 
-  # modules are not automatically loaded
-  modprobe dvb_hdhomerun
-  modprobe dvb_hdhomerun_fe
-  usleep 2000000
+  [ -z "$PRE_WAIT" ] && PRE_WAIT=0
+  PRE_WAIT=$(( $PRE_WAIT *1 ))
+  [ -z "$POST_WAIT" ] && POST_WAIT=0
+  POST_WAIT=$(( $POST_WAIT *1 ))
 
-  # could be useful
-  if [ -f $ADDON_HOME/pre-wait.sh ]; then
-    sh $ADDON_HOME/pre-wait.sh
-  fi
+  logger -t HDHomeRun "### Pre wait for $PRE_WAIT sec ###"
+  sleep $PRE_WAIT
 
   mkdir -p /var/log/
   rm -f /var/log/dvbhdhomerun.log
-  
-  userhdhomerun -f
-  # how much time should we wait?
-  usleep 1000000
-  if [ -f $ADDON_HOME/post-wait.sh ]; then
-    sh $ADDON_HOME/post-wait.sh
+
+  if [ "$USERHDHOMERUN_LOG" = "true" ]; then
+    userhdhomerun -f
+  else
+    userhdhomerun -f -d
   fi
 
+  logger -t HDHomeRun "### Post wait for $POST_WAIT sec ###"
+  sleep $POST_WAIT
+
 # save adapter names in background
 (
   sleep 4
-  sn_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null)
+  sn_old=$(cat $HDHR_ADDON_HOME/adapters.txt 2>/dev/null)
   sn_new=$(grep "Name of device: " /var/log/dvbhdhomerun.log)
   if [ "$sn_old" != "$sn_new" ]; then
-    echo -n $sn_new >$ADDON_HOME/adapters.txt
+    echo -n $sn_new >$HDHR_ADDON_HOME/adapters.txt
   fi
 )&
 fi
+
+logger -t HDHomeRun "### HDHomeRun ready ###"
+
+# unlock the lock
+unlock

packages/addons/driver/hdhomerun/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -21,3 +21,16 @@
 import os
 import sys
 import xbmcaddon
+
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
+
+__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
+
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_hdhomerun_tuners
+  refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
+  __settings__.openSettings()

packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+  <string id="1000">General</string>
+  <string id="1020">Pre wait time [sec]</string>
+  <string id="1030">Post wait time [sec]</string>
+  <string id="1040">Enable userhdhomerun logging</string>
+  <string id="1050">Enable libhdhomerun logging</string>
+  <string id="1060">Enable suspend/resume the driver</string>
+
+  <string id="9000">Tuner settings</string>
+  <string id="9005">Enable modifying settings</string>
+  <string id="9010">Refresh tuners... (press me)</string>
+  <string id="9020">    use full name</string>
+  <string id="9030">    disabled</string>
+</strings>

packages/addons/driver/hdhomerun/source/resources/lib/functions.py

@@ -0,0 +1,272 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 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
+################################################################################
+
+import os
+import sys
+import shutil
+import xmlpp
+from xml.dom import minidom
+
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+
+######################################################################################################
+# backup setting.xml file only if backup doesn't exist
+def settings_backup(settings_xml):
+  try:
+    with open(settings_xml + '_orig') as f: pass
+  except IOError as e:
+    shutil.copyfile(settings_xml, settings_xml + '_orig')
+
+######################################################################################################
+# restore setting.xml file from backup
+def settings_restore(settings_xml):
+  try:
+    shutil.copyfile(settings_xml + '_orig', settings_xml)
+  except IOError as e:
+    print 'Error restoring file:', settings_xml
+
+######################################################################################################
+# get hdhomerun supported devices on a system (only name like 101ADD2B-0)
+def get_devices_hdhomerun(hdhomerun_log):
+  tuners = []
+  try:
+    for line in open(hdhomerun_log, 'r'):
+      line = line.strip()
+      if line.startswith('Registered tuner'):
+        name = line.split(':');
+        name = name[2].strip()
+        tuners.append(name)
+  except IOError:
+    print 'Error reading hdhomerun log file', hdhomerun_log
+  return tuners
+
+  """
+root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
+Registered tuner, id from kernel: 0 name: 101ADD2B-0
+Registered tuner, id from kernel: 1 name: 101ADD2B-1
+Registered tuner, id from kernel: 2 name: 1031D75A-0
+Registered tuner, id from kernel: 3 name: 1031D75A-1
+  """
+
+######################################################################################################
+# get sundtek supported devices on a system (name, serial number, type)
+def get_devices_sundtek(mediaclient_e):
+  tuners = []
+  try:
+    p = os.popen(mediaclient_e, "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        if str.startswith('device '):
+          name = str[str.find("[")+1:str.find("]")]
+          tuners.append([name, 0, 's'])
+
+        if str.startswith('[SERIAL]:'):
+          line = p.readline()
+          str = line.strip()
+          if str.startswith('ID:'):
+            id = str.split(':');
+            id = id[1].strip()
+            tuners[len(tuners)-1] = [name, id, 's']
+
+        if str.startswith('[DVB-C]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T2]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+  except IOError:
+    print 'Error getting sundtek tuners info'
+  return tuners
+
+  """
+root ~ # mediaclient -e
+**** List of Media Hardware Devices ****
+device 0: [Sundtek MediaTV Pro (USB 2.0)]  DVB-C, DVB-T, ANALOG-TV, FM-RADIO, REMOTE-CONTROL, OSS-AUDIO, RDS
+  [BUS]:
+     ID: 1-7
+  [SERIAL]:
+     ID: U110763295205
+  [DVB-C]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [DVB-T]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [ANALOG-TV]:
+     VIDEO0: /dev/video0
+     VBI0: /dev/vbi0
+  [FM-RADIO]:
+     RADIO0: /dev/radio0
+     RDS: /dev/rds0
+  [REMOTECONTROL]:
+     INPUT0: /dev/mediainput0
+  [OSS]:
+     OSS0: /dev/dsp0
+  """
+
+######################################################################################################
+# parse settings.xml file
+def parse_settings(settings_xml):
+  try:
+    xmldoc = minidom.parse(settings_xml)
+    category = xmldoc.getElementsByTagName('category')
+    return xmldoc
+  except Exception as inst:
+    print 'Error parse settings file', settings_xml
+    return None
+
+######################################################################################################
+# remove all nodes with id started with ATTACHED_TUNER_
+def remove_old_tuners(xmldoc):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
+        node_set.parentNode.removeChild(node_set)
+
+######################################################################################################
+# add new hdhomerun tuners
+def add_hdhomerun(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_var = tuner.replace('-', '_')
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
+    node1.setAttribute("label", tuner)
+    node1.setAttribute("type", 'labelenum')
+    node1.setAttribute("default", 'auto')
+    node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_FULLNAME')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'bool')
+    node2.setAttribute("default", 'false')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'bool')
+    node3.setAttribute("default", 'false')
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new sundtek tuners
+def add_sundtek(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_name   = tuner[0]
+    tuner_serial = tuner[1]
+    tuner_type   = tuner[2]
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_DVBMODE')
+    node1.setAttribute("label", tuner_name + ", " + tuner_serial)
+    node1.setAttribute("type", 'labelenum')
+
+    if (tuner_type == 's'):
+      node1.setAttribute("default", 'DVB-S')
+      node1.setAttribute("values", 'DVB-S')
+    else:
+      node1.setAttribute("default", 'DVB-C')
+      node1.setAttribute("values", 'DVB-C|DVB-T')
+
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_IRPROT')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'labelenum')
+    node2.setAttribute("default", 'auto')
+    node2.setAttribute("values", 'auto|RC5|NEC|RC6')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_KEYMAP')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'file')
+    node3.setAttribute("mask", '*.map')
+    node3.setAttribute("default", __sundtek_userspace__)
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new ATTACHED_TUNER_ nodes for available tuners
+def add_new_tuners(xmldoc, tuners, which):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
+        if which == 'hdhomerun':
+          add_hdhomerun(xmldoc, node_cat, tuners)
+          break
+        elif which == 'sundtek':
+          add_sundtek(xmldoc, node_cat, tuners)
+          break
+
+
+######################################################################################################
+# save settings.xml file back
+def save_settings(settings_xml, xmldoc):
+  try:
+    outputfile = open(settings_xml, 'w')
+    xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2)
+    outputfile.close()
+  except IOError:
+    print 'Error saving file:', settings_xml
+    settings_restore(settings_xml)
+
+######################################################################################################
+# refresh hdhomerun tuners in settings.xml file
+def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+  settings_backup(settings_xml)
+  tuners = get_devices_hdhomerun(hdhomerun_log)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No hdhomerun tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'hdhomerun')
+    save_settings(settings_xml, xmldoc)
+
+######################################################################################################
+# refresh sundtek tuners in settings.xml file
+def refresh_sundtek_tuners(settings_xml, mediaclient_e):
+  settings_backup(settings_xml)
+  tuners = get_devices_sundtek(mediaclient_e)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No sundtek tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'sundtek')
+    save_settings(settings_xml, xmldoc)

packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py

@@ -0,0 +1,161 @@
+"""Pretty print an XML document.
+
+LICENCE:
+Copyright (c) 2008, Fredrik Ekholdt
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+* Neither the name of Fredrik Ekholdt nor the names of its contributors may be used to 
+endorse or promote products derived from this software without specific prior 
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE."""
+
+import sys as _sys
+import re as _re
+
+def _usage(this_file):
+    return """SYNOPSIS: pretty print an XML document
+USAGE: python %s <filename> \n""" % this_file
+
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
+    if line.strip():
+        start = ""
+        number_chars = 0
+        for l in range(indent_level):
+            start = start + " "
+            number_chars = number_chars + 1
+        try:
+            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
+            #should not have *
+            attrs = _re.findall("(\S*?\=\".*?\")", line)
+            output.write(start + elem_start)
+            number_chars = len(start + elem_start)
+            for attr in attrs:
+                if (attrs.index(attr) + 1) == len(attrs):
+                    number_chars = number_chars + len(elem_finished)
+                if (number_chars + len(attr) + 1) > width:
+                    output.write("\n")
+                    for i in range(len(start + elem_start) + 1):
+                        output.write(" ")
+                    number_chars = len(start + elem_start) + 1 
+                else:
+                    output.write(" ")
+                    number_chars = number_chars + 1
+                output.write(attr)
+                number_chars = number_chars + len(attr)
+            output.write(elem_finished + "\n")
+        except IndexError:
+            #give up pretty print this line
+            output.write(start + line + "\n")
+                
+
+def _pprint_elem_content(indent_level, line, output=_sys.stdout):
+    if line.strip():
+        for l in range(indent_level):
+            output.write(" ")
+        output.write(line + "\n")
+
+def _get_next_elem(data):
+    start_pos = data.find("<")
+    end_pos = data.find(">") + 1
+    retval = data[start_pos:end_pos]
+    stopper = retval.rfind("/") 
+    if stopper < retval.rfind("\""):
+        stopper = -1
+    single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
+
+    ignore_excl = retval.find("<!") > -1
+    ignore_question =  retval.find("<?") > -1
+
+    if ignore_excl:
+        cdata = retval.find("<![CDATA[") > -1
+        if cdata:
+            end_pos = data.find("]]>")
+            if end_pos > -1:
+                end_pos = end_pos + len("]]>")
+
+    elif ignore_question:
+        end_pos = data.find("?>") + len("?>")
+    ignore = ignore_excl or ignore_question
+    
+    no_indent = ignore or single
+
+    #print retval, end_pos, start_pos, stopper > -1, no_indent
+    return start_pos, \
+           end_pos, \
+           stopper > -1, \
+           no_indent
+
+def get_pprint(xml, indent=4, width=80):
+    """Returns the pretty printed xml """
+    class out:
+        output = ""
+
+        def write(self, string): 
+            self.output += string
+    out = out()
+    pprint(xml, output=out, indent=indent, width=width)
+
+    return out.output
+
+
+def pprint(xml, output=_sys.stdout, indent=4, width=80):
+    """Pretty print xml. 
+    Use output to select output stream. Default is sys.stdout
+    Use indent to select indentation level. Default is 4   """
+    data = xml
+    indent_level = 0
+    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    while ((start_pos > -1 and end_pos > -1)):
+        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
+                             output=output)
+        data = data[start_pos:]
+        if is_stop and not no_indent:
+            indent_level = indent_level - indent
+        _pprint_line(indent_level, 
+                     data[:end_pos - start_pos], 
+                     width=width,
+                     output=output)
+        data = data[end_pos - start_pos:]
+        if not is_stop and not no_indent :
+            indent_level = indent_level + indent
+
+        if not data:
+            break
+        else:
+            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    
+
+if __name__ == "__main__":
+    if "-h" in _sys.argv or "--help" in _sys.argv:
+        _sys.stderr.write(_usage(_sys.argv[0]))
+        _sys.exit(1)
+    if len(_sys.argv) < 2:
+        _sys.stderr.write(_usage(_sys.argv[0]))
+        _sys.exit(1)
+    else:
+        filename = _sys.argv[1]
+        fh = open(filename)
+
+    pprint(fh.read(), output=_sys.stdout, indent=4, width=80)

packages/addons/driver/hdhomerun/source/resources/settings.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+  <category label="1000" >
+    <setting type="sep" />
+    <setting id="PRE_WAIT"  type="number" label="1020" default="2" />
+    <setting id="POST_WAIT" type="number" label="1030" default="1" />
+    <setting id="USERHDHOMERUN_LOG" type="bool" label="1040" default="false" />
+    <setting id="LIBHDHOMERUN_LOG" type="bool" label="1050" default="false" />
+    <setting id="SUSPEND_DRIVER" type="bool" label="1060" default="false" />
+  </category>
+  <category label="9000">
+    <setting type="sep" />
+    <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
+  </category>
+</settings>

packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power

@@ -22,26 +22,42 @@
 
 . /etc/profile
 
-LOCKDIR="/var/lock/"
-LOCKFILE="hdhomerun"
+HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml"
 
-case "$1" in
-  hibernate|suspend)
-    if [ -n "$(pidof userhdhomerun)" ]; then
-      progress "Shutting down HDHomeRun driver for suspending..."
-      mkdir -p "$LOCKDIR"
-      touch "$LOCKDIR/$LOCKFILE"
-      killall userhdhomerun
-    fi
-    ;;
+if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
+  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
+fi
 
-  thaw|resume)
-    if [ -f "$LOCKDIR/$LOCKFILE" ]; then
-      # driver started within Tvheadend/VDR
-      rm -rf "$LOCKDIR/$LOCKFILE"
-    fi
-    ;;
+mkdir -p /var/config
+cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
+. /var/config/hdhomerun-addon.conf
 
-  *) exit $NA
-    ;;
-esac
+if [ "$SUSPEND_DRIVER" = "true" ]; then
+  LOCKDIR="/var/lock"
+  LOCKFILE="$LOCKDIR/hdhomerun"
+
+  case "$1" in
+    hibernate|suspend)
+      if [ -n "$(pidof userhdhomerun)" ]; then
+        progress "Shutting down HDHomeRun driver for suspending..."
+        mkdir -p "$LOCKDIR"
+        touch "$LOCKFILE"
+        killall -9 userhdhomerun
+      fi
+      ;;
+
+    thaw|resume)
+      if [ -f "$LOCKFILE" ]; then
+        # driver started within Tvheadend/VDR
+        rm -f "$LOCKFILE"
+      fi
+      ;;
+
+    *) exit $NA
+      ;;
+  esac
+else
+  progress "Suspend/resume of HDHomeRun driver not enabled..."
+fi

packages/addons/driver/imon-mce/changelog.txt

@@ -1,3 +1,5 @@
+3.1.1
+  rebuild for OpenELEC-3.2
 3.0.1
 - bump addon version
 

packages/addons/driver/sundtek-mediatv/changelog.txt

@@ -1,14 +1,21 @@
+3.1.2
+  new addon settings option to enable suspend/resume driver actions
+3.1.1
+  rebuild for OpenELEC-3.2
+3.0.6
+  rebuild
+3.0.5
+  fixed "bad substitution" error with busybox/ash
+3.0.4
+  improved python script for modifying tuners
 3.0.3
-  new addon settings:
+  added addon settings for modifying tuner type (DVB-C, DVB-T)
+3.0.2
+  added addon settings
     enable HW PID filter (enabled for RPi by default)
     enable IR receiver
     allow sharing local tuner over network
     use network tuners
-3.0.2
-  special version
-3.0.1
-  addon renamed to just sundtek
-  added addon settings
   sundtek's binaries are downloaded on first run
   automatically download new version of the binaries if available
   added preload library to .profile (to run mediaclient, w_scan, ... from console)

packages/addons/driver/sundtek-mediatv/config/rc_key_enter.map

@@ -0,0 +1,32 @@
+0x01 KEY_SELECT
+0x02 KEY_3
+0x03 KEY_EXIT
+0x04 KEY_1
+0x05 KEY_5
+0x06 KEY_6
+0x07 KEY_CHANNELDOWN
+0x08 KEY_2
+0x09 KEY_CHANNELUP
+0x0a KEY_9
+0x0b KEY_ZOOM
+0x0c KEY_7
+0x0d KEY_8
+0x0e KEY_VOLUMEUP
+0x0f KEY_4
+0x10 KEY_BACK
+0x11 KEY_0
+0x12 KEY_ENTER
+0x13 KEY_VOLUMEDOWN
+0x14 KEY_RECORD
+0x15 KEY_STOP
+0x16 KEY_PLAY
+0x17 KEY_MUTE
+0x18 KEY_UP
+0x19 KEY_DOWN
+0x1a KEY_LEFT
+0x1b KEY_RIGHT
+0x1c KEY_RED
+0x1d KEY_GREEN
+0x1e KEY_YELLOW
+0x1f KEY_BLUE
+0x43 KEY_POWER

packages/addons/driver/sundtek-mediatv/config/rc_key_ok.map

@@ -0,0 +1,32 @@
+0x01 KEY_SELECT
+0x02 KEY_3
+0x03 KEY_EXIT
+0x04 KEY_1
+0x05 KEY_5
+0x06 KEY_6
+0x07 KEY_CHANNELDOWN
+0x08 KEY_2
+0x09 KEY_CHANNELUP
+0x0a KEY_9
+0x0b KEY_ZOOM
+0x0c KEY_7
+0x0d KEY_8
+0x0e KEY_VOLUMEUP
+0x0f KEY_4
+0x10 KEY_BACK
+0x11 KEY_0
+0x12 KEY_OK
+0x13 KEY_VOLUMEDOWN
+0x14 KEY_RECORD
+0x15 KEY_STOP
+0x16 KEY_PLAY
+0x17 KEY_MUTE
+0x18 KEY_UP
+0x19 KEY_DOWN
+0x1a KEY_LEFT
+0x1b KEY_RIGHT
+0x1c KEY_RED
+0x1d KEY_GREEN
+0x1e KEY_YELLOW
+0x1f KEY_BLUE
+0x43 KEY_POWER

packages/addons/driver/sundtek-mediatv/config/sundtek.conf

@@ -1,9 +1,6 @@
 #
 # sundtek.conf
 #
-# Call attach/detach script when new device appears/disappears
-# Do not change this line (OpenElec addon require this) !
-device_attach=/storage/.xbmc/addons/driver.dvb.sundtek/bin/device-attached.sh
 
 # enable HW PID filter (default on for RPi)
 use_hwpidfilter=off

packages/addons/driver/sundtek-mediatv/meta

@@ -18,9 +18,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="sundtek"
-PKG_VERSION="3.0"
-PKG_REV="3"
+PKG_NAME="sundtek-mediatv"
+PKG_VERSION="3.1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

packages/addons/driver/sundtek-mediatv/settings-default.xml

@@ -6,6 +6,7 @@
   <setting id="ENABLE_HW_PID_FILTER" value="false" />
   <setting id="ENABLE_IR_RECEIVER" value="false" />
   <setting id="LOWEST_ADAPTER_NUM" value="0" />
+  <setting id="SUSPEND_DRIVER" value="true" />
   <setting id="ALLOW_NET_USE"  value="false" />
   <setting id="USE_NET_TUNERS" value="false" />
   <setting id="DEVICE1_IP"  value="" />

packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start

@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 
 logger -t Sundtek "### Sundtek manual start ###"
 . $ADDON_DIR/bin/userspace-driver.sh

packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop

@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 
 export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
 

packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh

@@ -2,7 +2,7 @@
 
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -22,6 +22,18 @@
 
 . /etc/profile
 
+# start locking mechanism - allows only one instance to be run at a time
+SUNDTEK_LOCKFILE="/var/lock/userspace-driver-sundtek.lck"
+SUNDTEK_LOCKFD=99
+# obtain an exclusive lock
+exlock() { eval "exec $SUNDTEK_LOCKFD>\"$SUNDTEK_LOCKFILE\""; flock -x $SUNDTEK_LOCKFD; }
+# drop a lock
+unlock() { flock -u $SUNDTEK_LOCKFD; flock -xn $SUNDTEK_LOCKFD && rm -f "$SUNDTEK_LOCKFILE"; }
+# end locking mechanism
+
+# exclusive lock
+exlock
+
 net_tuner_num_fix() {
   local num=$1
 
@@ -32,50 +44,58 @@ net_tuner_num_fix() {
   echo $num
 }
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek"
-ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-SUNDTEK_READY="/var/run/sundtek.ready"
+SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
 
-mkdir -p $ADDON_HOME
+mkdir -p $SUNDTEK_ADDON_HOME
 
-if [ ! -f "$ADDON_HOME/sundtek.conf" ]; then
-  cp $ADDON_DIR/config/* $ADDON_HOME/
+if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
+  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
 else
   # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)"
+  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
   if [ -z "$entry_set" ]; then
-    sed -i 's|\(^device_attach=.*\)|\1\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|\(^device_attach=.*\)|\1\n\n# enable HW PID filter\nuse_hwpidfilter=off\n|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $SUNDTEK_ADDON_HOME/sundtek.conf
   fi
 fi
 
-if [ ! -f "$ADDON_SETTINGS" ]; then
-  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
+if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
+  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
 fi
 
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_enter.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_enter $SUNDTEK_ADDON_HOME/rc_key_enter.map
+[ ! -f $SUNDTEK_ADDON_HOME/rc_key_ok.map ] && mv $SUNDTEK_ADDON_HOME/rc_key_ok $SUNDTEK_ADDON_HOME/rc_key_ok.map
+
 mkdir -p /var/config
-cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
 . /var/config/sundtek-addon.conf
 
-if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then
+if [ "$AUTO_UPDATE" = "true" -a -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
   logger -t Sundtek "### Checking for new Sundtek binary installer ###"
-  touch $ADDON_HOME/driver-version.txt
+  touch $SUNDTEK_ADDON_HOME/driver-version.txt
   wget -O /tmp/sundtek-driver-version.txt http://sundtek.de/media/latest.phtml
   md5_1=$(md5sum -b /tmp/sundtek-driver-version.txt | awk '{print $1}')
-  md5_2=$(md5sum -b $ADDON_HOME/driver-version.txt | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/driver-version.txt | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     logger -t Sundtek "### Updating Sundtek binary installer ###"
-    rm -f $ADDON_DIR/bin/mediasrv
+    rm -f $SUNDTEK_ADDON_DIR/bin/mediasrv
   fi
 
   rm -f /tmp/sundtek-driver-version.txt
 fi
 
-if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
+if [ ! -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
+  # remove renamed addon if exist
+  rm -fr "$HOME/.xbmc/addons/driver.dvb.sundtek"
+  rm -fr "$HOME/userdata/addon_data/driver.dvb.sundtek"
+
   logger -t Sundtek "### Downloading installer ###"
-  cd $ADDON_DIR
+  cd $SUNDTEK_ADDON_DIR
   mkdir -p bin lib tmp
   cd tmp/
 
@@ -88,9 +108,10 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
     INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
 
     # enable HW PID filter on RPi by default
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf
-    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|.*id="ENABLE_HW_PID_FILTER" value=.*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_DIR/config/sundtek.conf
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_HOME/sundtek.conf
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $SUNDTEK_ADDON_DIR/settings-default.xml
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $SUNDTEK_ADDON_SETTINGS
   else
     logger -t Sundtek "### Unsupported architecture ###"
     cd ..
@@ -111,35 +132,38 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
 
   cp -Pa opt/bin/* ../bin/
   cp -Pa opt/lib/* ../lib/
-  cp ../driver-version.txt $ADDON_HOME/
+  cp ../driver-version.txt $SUNDTEK_ADDON_HOME/
   cd ..
   rm -fr tmp/
   logger -t Sundtek "### Installer finished ###"
 
-  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+  cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
   . /var/config/sundtek-addon.conf
 fi
 
-if [ ! -f $ADDON_HOME/driver-version.txt ]; then
-  cp $ADDON_DIR/driver-version.txt $ADDON_HOME/
+if [ ! -f $SUNDTEK_ADDON_HOME/driver-version.txt ]; then
+  cp $SUNDTEK_ADDON_DIR/driver-version.txt $SUNDTEK_ADDON_HOME/
 fi
 
-# enable to install same addon version again
-rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek-*
+# enable to install same addon package version again
+#rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek*
 
 # add alias for /opt/bin/mediaclient
 alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)"
 if [ -z "$alias_set" ]; then
   echo "" >>/storage/.profile
-  echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so" >>/storage/.profile
+  echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so" >>/storage/.profile
   echo "" >>/storage/.profile
+else
+  # fix name
+  sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile
 fi
 
-export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
+export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 
-if [ "$ANALOG_TV" = "true" -a ! -f "$ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
+if [ "$ANALOG_TV" = "true" -a ! -f "$SUNDTEK_ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
   logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
-  cd $ADDON_DIR/bin
+  cd $SUNDTEK_ADDON_DIR/bin
   mkdir -p plugins/
   cd plugins/
 
@@ -160,10 +184,9 @@ fi
 if [ -z "$(pidof mediasrv)" ]; then
   rm -f /var/log/mediasrv.log
   rm -f /var/log/mediaclient.log
-  rm -f $SUNDTEK_READY
 
   SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
+  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
 
   [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
   sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
@@ -205,9 +228,9 @@ if [ -z "$(pidof mediasrv)" ]; then
     mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
     echo "" >>$SUNDTEK_CONF_TMP
     # remove empty lines at the end of file
-    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
     # add entries
-    echo "[NETWORK]" >>$SUNDTEK_CONF_TMP
+    echo -e "\n[NETWORK]" >>$SUNDTEK_CONF_TMP
     for dev in $(seq 0 $DEVICE1_NUM); do
       echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
     done
@@ -237,39 +260,71 @@ if [ -z "$(pidof mediasrv)" ]; then
     mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
     echo "" >>$SUNDTEK_CONF_TMP
     # remove empty lines at the end of file
-    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+    sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ENABLE_TUNER_TYPES" = "true" ]; then
+    # get tuner serial numbers
+    SERIALS=$(cat /var/config/sundtek-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
+    . /var/config/sundtek-addon.conf
+
+    for SERIAL in $SERIALS; do
+      DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL}_DVBMODE)
+      IRPROT=$(eval echo \$ATTACHED_TUNER_${SERIAL}_IRPROT)
+      KEYMAP=$(eval echo \$ATTACHED_TUNER_${SERIAL}_KEYMAP)
+
+      if [ "$DVBMODE" = "DVB-T" ]; then
+        # only set DVB-T because default is DVB-C (and DVB-S is not set either)
+        DVBMODE="DVBT"
+      else
+        DVBMODE=""
+      fi
+
+      [ "$IRPROT" = "NEC" -o "$IRPROT" = "auto" ] && IRPROT=""
+
+      [ ! -f $KEYMAP ] && KEYMAP=""
+
+      # remove setttings for this tuner
+      awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^ir_protocol=|^rcmap=|^initial_dvb_mode=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-types
+      mv ${SUNDTEK_CONF_TMP}-types $SUNDTEK_CONF_TMP
+      echo "" >>$SUNDTEK_CONF_TMP
+      # remove empty lines at the end of file
+      sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $SUNDTEK_CONF_TMP
+
+      ADDNEW=true
+      if [ -n "$DVBMODE" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "initial_dvb_mode=$DVBMODE" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$IRPROT" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "ir_protocol=$IRPROT" >>$SUNDTEK_CONF_TMP
+      fi
+      if [ -n "$KEYMAP" ]; then
+        [ $ADDNEW = true ] && ADDNEW=false && echo -e "\n[$SERIAL]" >>$SUNDTEK_CONF_TMP
+        echo "rcmap=$KEYMAP" >>$SUNDTEK_CONF_TMP
+      fi
+
+      echo "" >>$SUNDTEK_CONF_TMP
+    done
   fi
 
   md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $ADDON_HOME/sundtek.conf | awk '{print $1}')
+  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf
+    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
   fi
 
-  #rm "$SUNDTEK_CONF_TMP"
+  mediasrv --wait-for-devices -p $SUNDTEK_ADDON_DIR/bin -c $SUNDTEK_ADDON_HOME/sundtek.conf -d
 
-  mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d
-
-  # wait for device to get attached or connected
-  for i in $(seq 1 240); do
-    if [ -f $SUNDTEK_READY ]; then
-      rm -f $SUNDTEK_READY
-      logger -t Sundtek "### Sundtek ready ###"
-
-      if [ -n $SETTLE_TIME -a $SETTLE_TIME -gt 0 ]; then
-        logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
-        sleep $SETTLE_TIME
-      fi
-
-      break
-    elif [ "$i" = "240" ]; then
-      logger -t Sundtek "### No Sundtek device attached or connected ###"
-      return
-    else
-      usleep 500000
-    fi
-  done
+  # wait few seconds
+  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
+  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
+  if [ $SETTLE_TIME -gt 0 ]; then
+    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
+    sleep $SETTLE_TIME
+  fi
 
   if [ "$ANALOG_TV" = "true" ]; then
     logger -t Sundtek "### Switching to analog TV mode ###"
@@ -277,18 +332,23 @@ if [ -z "$(pidof mediasrv)" ]; then
     mediaclient --disable-dvb=/dev/dvb/adapter0
   fi
 
-  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$ADDON_HOME/userscript.sh" ]; then
-    logger -t Sundtek "### Running user script $ADDON_HOME/userscript.sh ###"
-    cat $ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
+  if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
+    logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
+    cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
     sh /var/run/sundtek-userscript.sh
   fi
 (
   # save adapter serial number in background
   sleep 5
-  serial_number_old=$(cat $ADDON_HOME/adapters.txt 2>/dev/null)
+  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
   serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}')
   if [ "$serial_number_old" != "$serial_number_new" ]; then
-    echo "$serial_number_new" >$ADDON_HOME/adapters.txt
+    echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt
   fi
 )&
 fi
+
+logger -t Sundtek "### Sundtek ready ###"
+
+# unlock the lock
+unlock

packages/addons/driver/sundtek-mediatv/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2009-2013 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
@@ -22,17 +22,17 @@ import os
 import sys
 import xbmcaddon
 
-__scriptname__ = "OpenELEC OS Settings Dialog"
-__author__ = "OpenELEC"
-__url__ = "http://www.openelec.tv"
-__svn_url__ = ""
-__credits__ = ""
-__version__ = "0.0.13"
-__XBMC_Revision__ = "22240"
+__settings__      = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
+__cwd__           = __settings__.getAddonInfo('path')
+__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
+__settings_xml__  = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
 
-__settings__   = xbmcaddon.Addon(id='os.openelec.settings')
-__language__   = __settings__.getLocalizedString
-__cwd__        = __settings__.getAddonInfo('path')
+__mediaclient__   = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
+__ld_preload__    = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so'))
+__mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'
 
-if __name__ == "__main__":
-	__settings__.openSettings()
+if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
+  sys.path.append(__resources_lib__)
+  from functions import refresh_sundtek_tuners
+  refresh_sundtek_tuners(__settings_xml__, __mediaclient_e__)
+  __settings__.openSettings()

packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml

@@ -3,11 +3,13 @@
   <string id="1000">General</string>
   <string id="1011">Auto update binary driver</string>
   <string id="1012">Enable analog TV</string>
-  <string id="1014">Extra settle time</string>
+  <string id="1014">Extra delay [sec]</string>
   <string id="1015">Run user script</string>
   <string id="1030">Enable hardware PID filter</string>
   <string id="1035">Enable IR receiver</string>
   <string id="1040">Lowest adapter number (/dev/dvb/adapterX/)</string>
+  <string id="1050">Enable suspend/resume the driver</string>
+
   <string id="2000">Networking</string>
   <string id="2005">Share local tuner over network</string>
   <string id="2010">Use network shared tuners</string>
@@ -21,4 +23,10 @@
   <string id="2051">    # of tuners</string>
   <string id="2060">Server 5 IP address</string>
   <string id="2061">    # of tuners</string>
+
+  <string id="9000">Tuner settings</string>
+  <string id="9005">Enable modifying settings</string>
+  <string id="9010">Refresh tuners... (press me)</string>
+  <string id="9020">    IR protocol</string>
+  <string id="9030">    keymap filename</string>
 </strings>

packages/addons/driver/sundtek-mediatv/source/resources/lib/functions.py

@@ -0,0 +1,272 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2013 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
+################################################################################
+
+import os
+import sys
+import shutil
+import xmlpp
+from xml.dom import minidom
+
+__sundtek_userspace__ = '/storage/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv/'
+
+######################################################################################################
+# backup setting.xml file only if backup doesn't exist
+def settings_backup(settings_xml):
+  try:
+    with open(settings_xml + '_orig') as f: pass
+  except IOError as e:
+    shutil.copyfile(settings_xml, settings_xml + '_orig')
+
+######################################################################################################
+# restore setting.xml file from backup
+def settings_restore(settings_xml):
+  try:
+    shutil.copyfile(settings_xml + '_orig', settings_xml)
+  except IOError as e:
+    print 'Error restoring file:', settings_xml
+
+######################################################################################################
+# get hdhomerun supported devices on a system (only name like 101ADD2B-0)
+def get_devices_hdhomerun(hdhomerun_log):
+  tuners = []
+  try:
+    for line in open(hdhomerun_log, 'r'):
+      line = line.strip()
+      if line.startswith('Registered tuner'):
+        name = line.split(':');
+        name = name[2].strip()
+        tuners.append(name)
+  except IOError:
+    print 'Error reading hdhomerun log file', hdhomerun_log
+  return tuners
+
+  """
+root ~ # grep "Registered tuner" /var/log/dvbhdhomerun.log
+Registered tuner, id from kernel: 0 name: 101ADD2B-0
+Registered tuner, id from kernel: 1 name: 101ADD2B-1
+Registered tuner, id from kernel: 2 name: 1031D75A-0
+Registered tuner, id from kernel: 3 name: 1031D75A-1
+  """
+
+######################################################################################################
+# get sundtek supported devices on a system (name, serial number, type)
+def get_devices_sundtek(mediaclient_e):
+  tuners = []
+  try:
+    p = os.popen(mediaclient_e, "r")
+    while 1:
+      line = p.readline()
+      if not line:
+        break
+      else:
+        str = line.strip()
+        if str.startswith('device '):
+          name = str[str.find("[")+1:str.find("]")]
+          tuners.append([name, 0, 's'])
+
+        if str.startswith('[SERIAL]:'):
+          line = p.readline()
+          str = line.strip()
+          if str.startswith('ID:'):
+            id = str.split(':');
+            id = id[1].strip()
+            tuners[len(tuners)-1] = [name, id, 's']
+
+        if str.startswith('[DVB-C]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+        elif str.startswith('[DVB-T2]:'):
+          tuners[len(tuners)-1] = [name, id, 'c']
+  except IOError:
+    print 'Error getting sundtek tuners info'
+  return tuners
+
+  """
+root ~ # mediaclient -e
+**** List of Media Hardware Devices ****
+device 0: [Sundtek MediaTV Pro (USB 2.0)]  DVB-C, DVB-T, ANALOG-TV, FM-RADIO, REMOTE-CONTROL, OSS-AUDIO, RDS
+  [BUS]:
+     ID: 1-7
+  [SERIAL]:
+     ID: U110763295205
+  [DVB-C]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [DVB-T]:
+     FRONTEND: /dev/dvb/adapter0/frontend0
+     DVR: /dev/dvb/adapter0/dvr0
+     DMX: /dev/dvb/adapter0/demux0
+  [ANALOG-TV]:
+     VIDEO0: /dev/video0
+     VBI0: /dev/vbi0
+  [FM-RADIO]:
+     RADIO0: /dev/radio0
+     RDS: /dev/rds0
+  [REMOTECONTROL]:
+     INPUT0: /dev/mediainput0
+  [OSS]:
+     OSS0: /dev/dsp0
+  """
+
+######################################################################################################
+# parse settings.xml file
+def parse_settings(settings_xml):
+  try:
+    xmldoc = minidom.parse(settings_xml)
+    category = xmldoc.getElementsByTagName('category')
+    return xmldoc
+  except Exception as inst:
+    print 'Error parse settings file', settings_xml
+    return None
+
+######################################################################################################
+# remove all nodes with id started with ATTACHED_TUNER_
+def remove_old_tuners(xmldoc):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'id' in node_set.attributes.keys() and not node_set.getAttribute('id').find('ATTACHED_TUNER_'):
+        node_set.parentNode.removeChild(node_set)
+
+######################################################################################################
+# add new hdhomerun tuners
+def add_hdhomerun(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_var = tuner.replace('-', '_')
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
+    node1.setAttribute("label", tuner)
+    node1.setAttribute("type", 'labelenum')
+    node1.setAttribute("default", 'auto')
+    node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_FULLNAME')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'bool')
+    node2.setAttribute("default", 'false')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'bool')
+    node3.setAttribute("default", 'false')
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new sundtek tuners
+def add_sundtek(xmldoc, node_cat, tuners):
+  for ix, tuner in enumerate(tuners):
+    tuner_name   = tuner[0]
+    tuner_serial = tuner[1]
+    tuner_type   = tuner[2]
+
+    node1 = xmldoc.createElement("setting")
+    node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_DVBMODE')
+    node1.setAttribute("label", tuner_name + ", " + tuner_serial)
+    node1.setAttribute("type", 'labelenum')
+
+    if (tuner_type == 's'):
+      node1.setAttribute("default", 'DVB-S')
+      node1.setAttribute("values", 'DVB-S')
+    else:
+      node1.setAttribute("default", 'DVB-C')
+      node1.setAttribute("values", 'DVB-C|DVB-T')
+
+    node_cat.appendChild(node1)
+
+    node2 = xmldoc.createElement("setting")
+    node2.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_IRPROT')
+    node2.setAttribute("label", '9020')
+    node2.setAttribute("type", 'labelenum')
+    node2.setAttribute("default", 'auto')
+    node2.setAttribute("values", 'auto|RC5|NEC|RC6')
+    node_cat.appendChild(node2)
+
+    node3 = xmldoc.createElement("setting")
+    node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_serial + '_KEYMAP')
+    node3.setAttribute("label", '9030')
+    node3.setAttribute("type", 'file')
+    node3.setAttribute("mask", '*.map')
+    node3.setAttribute("default", __sundtek_userspace__)
+    node_cat.appendChild(node3)
+
+  # for tuner
+
+######################################################################################################
+# add new ATTACHED_TUNER_ nodes for available tuners
+def add_new_tuners(xmldoc, tuners, which):
+  category = xmldoc.getElementsByTagName('category')
+  for node_cat in category:
+    setting = node_cat.getElementsByTagName('setting')
+    for node_set in setting :
+      if 'label' in node_set.attributes.keys() and '9010' in node_set.getAttribute('label'):
+        if which == 'hdhomerun':
+          add_hdhomerun(xmldoc, node_cat, tuners)
+          break
+        elif which == 'sundtek':
+          add_sundtek(xmldoc, node_cat, tuners)
+          break
+
+
+######################################################################################################
+# save settings.xml file back
+def save_settings(settings_xml, xmldoc):
+  try:
+    outputfile = open(settings_xml, 'w')
+    xmlpp.pprint(xmldoc.toxml(), output = outputfile, indent=2)
+    outputfile.close()
+  except IOError:
+    print 'Error saving file:', settings_xml
+    settings_restore(settings_xml)
+
+######################################################################################################
+# refresh hdhomerun tuners in settings.xml file
+def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
+  settings_backup(settings_xml)
+  tuners = get_devices_hdhomerun(hdhomerun_log)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No hdhomerun tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'hdhomerun')
+    save_settings(settings_xml, xmldoc)
+
+######################################################################################################
+# refresh sundtek tuners in settings.xml file
+def refresh_sundtek_tuners(settings_xml, mediaclient_e):
+  settings_backup(settings_xml)
+  tuners = get_devices_sundtek(mediaclient_e)
+  xmldoc = parse_settings(settings_xml)
+  if xmldoc == None:
+    print 'No sundtek tuners found'
+  else:
+    remove_old_tuners(xmldoc)
+    add_new_tuners(xmldoc, tuners, 'sundtek')
+    save_settings(settings_xml, xmldoc)

packages/addons/driver/sundtek-mediatv/source/resources/lib/xmlpp.py

@@ -0,0 +1,161 @@
+"""Pretty print an XML document.
+
+LICENCE:
+Copyright (c) 2008, Fredrik Ekholdt
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, 
+this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation 
+and/or other materials provided with the distribution.
+
+* Neither the name of Fredrik Ekholdt nor the names of its contributors may be used to 
+endorse or promote products derived from this software without specific prior 
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE."""
+
+import sys as _sys
+import re as _re
+
+def _usage(this_file):
+    return """SYNOPSIS: pretty print an XML document
+USAGE: python %s <filename> \n""" % this_file
+
+def _pprint_line(indent_level, line, width=100, output=_sys.stdout):
+    if line.strip():
+        start = ""
+        number_chars = 0
+        for l in range(indent_level):
+            start = start + " "
+            number_chars = number_chars + 1
+        try:
+            elem_start = _re.findall("(\<\W{0,1}\w+:\w+) ?", line)[0]
+            elem_finished = _re.findall("([?|\]\]/]*\>)", line)[0] 
+            #should not have *
+            attrs = _re.findall("(\S*?\=\".*?\")", line)
+            output.write(start + elem_start)
+            number_chars = len(start + elem_start)
+            for attr in attrs:
+                if (attrs.index(attr) + 1) == len(attrs):
+                    number_chars = number_chars + len(elem_finished)
+                if (number_chars + len(attr) + 1) > width:
+                    output.write("\n")
+                    for i in range(len(start + elem_start) + 1):
+                        output.write(" ")
+                    number_chars = len(start + elem_start) + 1 
+                else:
+                    output.write(" ")
+                    number_chars = number_chars + 1
+                output.write(attr)
+                number_chars = number_chars + len(attr)
+            output.write(elem_finished + "\n")
+        except IndexError:
+            #give up pretty print this line
+            output.write(start + line + "\n")
+                
+
+def _pprint_elem_content(indent_level, line, output=_sys.stdout):
+    if line.strip():
+        for l in range(indent_level):
+            output.write(" ")
+        output.write(line + "\n")
+
+def _get_next_elem(data):
+    start_pos = data.find("<")
+    end_pos = data.find(">") + 1
+    retval = data[start_pos:end_pos]
+    stopper = retval.rfind("/") 
+    if stopper < retval.rfind("\""):
+        stopper = -1
+    single = (stopper > -1 and ((retval.find(">") - stopper) < (stopper - retval.find("<"))))
+
+    ignore_excl = retval.find("<!") > -1
+    ignore_question =  retval.find("<?") > -1
+
+    if ignore_excl:
+        cdata = retval.find("<![CDATA[") > -1
+        if cdata:
+            end_pos = data.find("]]>")
+            if end_pos > -1:
+                end_pos = end_pos + len("]]>")
+
+    elif ignore_question:
+        end_pos = data.find("?>") + len("?>")
+    ignore = ignore_excl or ignore_question
+    
+    no_indent = ignore or single
+
+    #print retval, end_pos, start_pos, stopper > -1, no_indent
+    return start_pos, \
+           end_pos, \
+           stopper > -1, \
+           no_indent
+
+def get_pprint(xml, indent=4, width=80):
+    """Returns the pretty printed xml """
+    class out:
+        output = ""
+
+        def write(self, string): 
+            self.output += string
+    out = out()
+    pprint(xml, output=out, indent=indent, width=width)
+
+    return out.output
+
+
+def pprint(xml, output=_sys.stdout, indent=4, width=80):
+    """Pretty print xml. 
+    Use output to select output stream. Default is sys.stdout
+    Use indent to select indentation level. Default is 4   """
+    data = xml
+    indent_level = 0
+    start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    while ((start_pos > -1 and end_pos > -1)):
+        _pprint_elem_content(indent_level, data[:start_pos].strip(), 
+                             output=output)
+        data = data[start_pos:]
+        if is_stop and not no_indent:
+            indent_level = indent_level - indent
+        _pprint_line(indent_level, 
+                     data[:end_pos - start_pos], 
+                     width=width,
+                     output=output)
+        data = data[end_pos - start_pos:]
+        if not is_stop and not no_indent :
+            indent_level = indent_level + indent
+
+        if not data:
+            break
+        else:
+            start_pos, end_pos, is_stop, no_indent  = _get_next_elem(data)
+    
+
+if __name__ == "__main__":
+    if "-h" in _sys.argv or "--help" in _sys.argv:
+        _sys.stderr.write(_usage(_sys.argv[0]))
+        _sys.exit(1)
+    if len(_sys.argv) < 2:
+        _sys.stderr.write(_usage(_sys.argv[0]))
+        _sys.exit(1)
+    else:
+        filename = _sys.argv[1]
+        fh = open(filename)
+
+    pprint(fh.read(), output=_sys.stdout, indent=4, width=80)

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
   <category label="1000" >
-    <setting label="" type="lsep" />
     <setting type="sep" />
-    <setting id="AUTO_UPDATE" type="bool" label="1011" default="false" />
-    <setting id="ANALOG_TV" type="bool" label="1012" default="false" enable="false" />
-    <setting id="SETTLE_TIME" type="number" label="1014" default="0" />
-    <setting id="RUN_USER_SCRIPT" type="bool" label="1015" default="false" />
-    <setting id="ENABLE_HW_PID_FILTER" type="bool" label="1030" default="false" />
-    <setting id="ENABLE_IR_RECEIVER" type="bool" label="1035" default="false" />
-    <setting id="LOWEST_ADAPTER_NUM" type="number" label="1040" default="0" />
+    <setting id="AUTO_UPDATE"          type="bool"   label="1011" default="false" />
+    <setting id="ANALOG_TV"            type="bool"   label="1012" default="false" enable="false" />
+    <setting id="SETTLE_TIME"          type="number" label="1014" default="0" />
+    <setting id="RUN_USER_SCRIPT"      type="bool"   label="1015" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="false" />
+    <setting id="ENABLE_IR_RECEIVER"   type="bool"   label="1035" default="false" />
+    <setting id="LOWEST_ADAPTER_NUM"   type="number" label="1040" default="0" />
+    <setting id="SUSPEND_DRIVER"       type="bool"   label="1050" default="true" />
   </category>
   <category label="2000" >
-    <setting label="" type="lsep" />
     <setting type="sep" />
     <setting id="ALLOW_NET_USE"  type="bool"   label="2005" default="false" />
     <setting id="USE_NET_TUNERS" type="bool"   label="2010" default="false" />
@@ -27,4 +26,9 @@
     <setting id="DEVICE5_IP"  type="ipaddress" label="2060" default=""                     visible="eq(-9,true)" />
     <setting id="DEVICE5_NUM" type="labelenum" label="2061" default="1" values="1|5|4|3|2" visible="eq(-10,true)" />
   </category>
+  <category label="9000">
+    <setting type="sep" />
+    <setting id="ENABLE_TUNER_TYPES" type="bool" label="9005" default="true" />
+    <setting label="9010" option="close" type="action" action="RunScript($ID, refresh_tuners)" />
+  </category>
 </settings>

packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power

@@ -0,0 +1,63 @@
+#!/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
+################################################################################
+
+. /etc/profile
+
+SUNDTEK_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
+SUNDTEK_ADDON_SETTINGS="$SUNDTEK_ADDON_HOME/settings.xml"
+
+if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
+  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
+fi
+
+mkdir -p /var/config
+cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+. /var/config/sundtek-addon.conf
+
+if [ "$SUSPEND_DRIVER" = "true" ]; then
+  LOCKDIR="/var/lock/"
+  LOCKFILE="$LOCKDIR/sundtek-mediatv"
+
+  case "$1" in
+    hibernate|suspend)
+      if [ -n "$(pidof mediasrv)" ]; then
+        progress "Shutting down Sundtek DVB driver for suspending..."
+        mkdir -p "$LOCKDIR"
+        touch "$LOCKFILE"
+        killall -9 mediasrv
+      fi
+      ;;
+
+    thaw|resume)
+      if [ -f "$LOCKFILE" ]; then
+        # driver started within Tvheadend/VDR
+        rm -f "$LOCKFILE"
+      fi
+      ;;
+
+    *) exit $NA
+      ;;
+  esac
+else
+  progress "Suspend/resume of Sundtek driver not enabled..."
+fi