config/version: set version to 3.0.6

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

CHANGELOG

@@ -1,20 +1,5 @@
-OpenELEC (Version 2.1)
+OpenELEC (Version 3.0)
 
-Changelog OpenELEC-2.0 to OpenELEC-2.1
+for a detailed Changelog from OpenELEC-2.0 to OpenELEC-3.0 see:
+ https://github.com/OpenELEC/OpenELEC.tv/compare/2.0.0...3.0.0
 
-Added packages:
-  - add package 'ppp'
-  - add package 'pptp'
-
-Package updates:
-  - update linux to linux-3.5
-  - update dialog to dialog-1.1-20120215
-  - update connman to connman-1.4
-
-Added functions:
-  - sshd can be enabled via OpenELEC Settings addon
-  - add PPTP support
-
-Changed functions:
-
-Removed functions:

CONTRIBUTING.md

@@ -1,93 +0,0 @@
-## 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

config/functions

@@ -56,7 +56,7 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  ls -d $ROOT/$BUILD/linux-*
+  ls -d $ROOT/$BUILD/linux-[0-9]*
 }
 
 tolower(){
@@ -278,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 - XBMC Player driver:\t\t\t $XBMCPLAYER_DRIVER"
+  config_message="$config_message\n - OpenMAX Support (provider):\t\t $OPENMAX_SUPPORT ($OPENMAX)"
   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"
@@ -347,6 +347,7 @@ 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,6 +20,12 @@ 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"

config/path

@@ -49,7 +49,7 @@ SED="sed -i"
   PKG_DEPENDS=""
   PKG_BUILD_DEPENDS=""
   PKG_PRIORITY="optional"
-  PKG_SECTION=""
+  PKG_SECTION="misc"
   PKG_SHORTDESC="$1 (autogenerated)"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
@@ -64,9 +64,7 @@ SED="sed -i"
   fi
 
   [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
-  if [ "$PKG_IS_ADDON" = "yes" ] ; then
-    [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
-  fi
+  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
 
   [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
   [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`

config/version

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

packages/3rdparty/download/CouchPotato/meta

@@ -1,6 +1,7 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
 #
 #  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
@@ -18,19 +19,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="opengl-mali"
-PKG_VERSION="20130520"
+PKG_NAME="CouchPotato"
+PKG_VERSION="806bed6"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="nonfree"
-PKG_SITE="http://www.arm.com/products/multimedia/mali-graphics-hardware/mali-400-mp.php"
+PKG_LICENSE="OSS"
+PKG_SITE="https://github.com/RuudBurger/CouchPotato"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="Python SABnzbd"
+PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"
-PKG_SECTION="graphics"
-PKG_SHORTDESC="opengl-mali: OpenGL-ES and Mali driver for Mali 400 GPUs"
-PKG_LONGDESC="opengl-mali: OpenGL-ES and Mali driver for Mali 400 GPUs"
+PKG_SECTION="service/downloadmanager"
+PKG_SHORTDESC="CouchPotato: automated movie downloading."
+PKG_LONGDESC="CouchPotato: automated movie downloading."
+
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"

packages/3rdparty/download/CouchPotatoServer/meta

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

packages/3rdparty/download/Headphones/meta

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

packages/3rdparty/download/SickBeard/meta

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

packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-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 2144a0f..703c99e 100755
+index 826cf0a..02f14af 100755
 --- a/data/interfaces/default/config_notifications.tmpl
 +++ b/data/interfaces/default/config_notifications.tmpl
-@@ -639,45 +639,6 @@
+@@ -547,45 +547,6 @@
  
                  <div class="component-group clearfix">
                      <div class="component-group-desc">
@@ -12,7 +12,7 @@ index 2144a0f..703c99e 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 2144a0f..703c99e 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 da9ff7f..36b608e 100644
+index 20f0dfc..b0bf6a6 100644
 --- a/sickbeard/webserve.py
 +++ b/sickbeard/webserve.py
-@@ -613,7 +613,6 @@ class History:
+@@ -609,7 +609,6 @@ class History:
  
  
  ConfigMenu = [

packages/3rdparty/lib/ccid/meta

@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="ccid"
-PKG_VERSION="1.4.10"
+PKG_VERSION="1.4.9"
 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/3897/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://alioth.debian.org/frs/download.php/3866/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain pcsc-lite"
 PKG_PRIORITY="optional"

packages/3rdparty/lib/cxxtools/build

@@ -32,9 +32,7 @@ mkdir -p .build-host && cd .build-host
             --build=$HOST_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
             --disable-static \
-            --enable-shared \
-            --disable-demos \
-            --disable-unittest
+            --enable-shared
 
 make
 make install
@@ -43,18 +41,12 @@ 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 \
-            --enable-static \
-            --disable-shared \
-            --disable-demos \
-            --disable-unittest
+            --disable-static \
+            --enable-shared
 
 $MAKEINSTALL

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

@@ -1,278 +0,0 @@
-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="20130328"
+PKG_VERSION="20130117"
 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 \
-             --disable-shared \
+             --enable-shared \
              $CONFIG_LIBXML \
              --disable-ipv6 \
              --without-python \

packages/3rdparty/lib/libzip/build

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

packages/3rdparty/multimedia/rotorng/build

@@ -24,10 +24,7 @@
 
 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.3.1"
+PKG_VERSION="0.1.0"
 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

@@ -0,0 +1,30 @@
+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

@@ -1,32 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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-dynamite/build

@@ -22,5 +22,11 @@
 
 . config/options $1
 
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
 cd $PKG_BUILD
-  LDFLAGS="" make V=1 ARCH=$TARGET_ARCH KSRC=$(kernel_path) CROSS_COMPILE=$TARGET_PREFIX CONFIG_POWER_SAVING=n
+  make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
+

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

@@ -18,19 +18,20 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="libamlplayer-m1"
-PKG_VERSION="e7ba300"
+PKG_NAME="vdr-dynamite"
+PKG_VERSION="914af24"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://openlinux.amlogic.com"
+PKG_LICENSE="GPL"
+PKG_SITE="http://projects.vdr-developer.org/projects/plg-dynamite"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="alsa-lib rtmpdump"
-PKG_BUILD_DEPENDS="toolchain alsa-lib rtmpdump"
+PKG_DEPENDS="vdr systemd"
+PKG_BUILD_DEPENDS="toolchain vdr systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
-PKG_SHORTDESC="libamlplayer-m1: tools for Amlogic Meson1 support."
-PKG_LONGDESC="libamlplayer-m1: tools for Amlogic Meson1 support."
+PKG_SHORTDESC="vdr-dynamite turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running."
+PKG_LONGDESC="This plugin turns the dvbdevices into hotpluggable devices. They can be dynamically attached and detached while vdr is running."
 
 PKG_IS_ADDON="no"
+
 PKG_AUTORECONF="no"

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

@@ -23,11 +23,6 @@
 . 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="e2de927"
+PKG_VERSION="0fc4817"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -1,68 +0,0 @@
-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,3 +30,4 @@ 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="2.0.0"
+PKG_VERSION="0.5.2"
 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 curl"
+PKG_BUILD_DEPENDS="toolchain vdr"
 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

@@ -0,0 +1,35 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -1,56 +0,0 @@
-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 -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"
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
 
 # dont build parallel
   MAKEFLAGS=-j1

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

@@ -19,14 +19,14 @@
 ################################################################################
 
 PKG_NAME="vdr-live"
-PKG_VERSION="0.3.0"
+PKG_VERSION="0.2.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 pcre-host pcre"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet"
 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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,18 @@
+#! /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

@@ -0,0 +1,70 @@
+#! /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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,40 @@
+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="555272d"
+PKG_VERSION="cd93752"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -1,77 +0,0 @@
-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,10 +24,6 @@
 
 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="329129d"
+PKG_VERSION="f58086a"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -1,53 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -0,0 +1,19 @@
+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,10 +24,6 @@
 
 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

@@ -1,13 +0,0 @@
-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,11 +23,6 @@
 . 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="30903cc0"
+PKG_VERSION="8be374e781e734b44edbd6bc03cfdc1694f6617e"
 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 curl libxml2"
-PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml2 libxslt enca pcre"
+PKG_DEPENDS="vdr sqlite curl libzip libxml libxslt"
+PKG_BUILD_DEPENDS="toolchain vdr sqlite curl libzip libxml libxslt enca"
 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="33afe59"
+PKG_VERSION="c43033c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

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

@@ -1,79 +0,0 @@
-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

@@ -0,0 +1,282 @@
+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,11 +29,10 @@ 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
@@ -47,5 +46,3 @@ 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="2.0.1"
+PKG_VERSION="1.7.33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvdr.de"
-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_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="fontconfig freetype libcap"
+PKG_BUILD_DEPENDS="toolchain fontconfig freetype libcap libjpeg-turbo bzip2"
 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

@@ -0,0 +1,16 @@
+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

@@ -1,133 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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 \
-            --disable-shared \
-            --enable-static \
+            --enable-shared \
+            --disable-static \
             --disable-libudev \
             --enable-libusb \
             --enable-usbdropdir=$PCSCD_ADDON_DIR/drivers

packages/addons/driver/hdhomerun/changelog.txt

@@ -1,12 +1,3 @@
-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

packages/addons/driver/hdhomerun/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="hdhomerun"
-PKG_VERSION="3.2"
-PKG_REV="2"
+PKG_VERSION="3.0"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"

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

@@ -1,7 +1,4 @@
 <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/userspace-driver.sh

@@ -22,45 +22,33 @@
 
 . /etc/profile
 
-# 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
-
-# exclusive lock
-exlock
-
-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"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 
 # modules are not automatically loaded
 modprobe dvb_hdhomerun
 modprobe dvb_hdhomerun_fe
 
-mkdir -p $HDHR_ADDON_HOME
+mkdir -p $ADDON_HOME
 
-if [ ! -f "$HDHR_ADDON_HOME/dvbhdhomerun.sample" ]; then
-  cp $HDHR_ADDON_DIR/config/* $HDHR_ADDON_HOME/
+if [ ! -f "$ADDON_HOME/dvbhdhomerun.sample" ]; then
+  cp $ADDON_DIR/config/* $ADDON_HOME/
 fi
 
-if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
-  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
+if [ ! -f "$ADDON_SETTINGS" ]; then
+  cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
 fi
 
 mkdir -p /var/config
-cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf
+cat "$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
+    touch $ADDON_HOME/dvbhdhomerun.conf
+    cp $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)
@@ -104,7 +92,7 @@ if [ -z "$(pidof userhdhomerun)" ]; then
     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
 
@@ -116,16 +104,16 @@ EOF
     fi
 
     md5_1=$(md5sum -b $DVBHDHOMERUN_CONF_TMP | awk '{print $1}')
-    md5_2=$(md5sum -b $HDHR_ADDON_HOME/dvbhdhomerun.conf | awk '{print $1}')
+    md5_2=$(md5sum -b $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
+      cp $DVBHDHOMERUN_CONF_TMP $ADDON_HOME/dvbhdhomerun.conf
     fi
   fi
 
   rm -f /tmp/dvbhdhomerun
-  if [ -f $HDHR_ADDON_HOME/dvbhdhomerun.conf ]; then
-    ln -s $HDHR_ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
+  if [ -f $ADDON_HOME/dvbhdhomerun.conf ]; then
+    ln -s $ADDON_HOME/dvbhdhomerun.conf /tmp/dvbhdhomerun
   fi
 
   [ -z "$PRE_WAIT" ] && PRE_WAIT=0
@@ -139,11 +127,7 @@ EOF
   mkdir -p /var/log/
   rm -f /var/log/dvbhdhomerun.log
 
-  if [ "$USERHDHOMERUN_LOG" = "true" ]; then
-    userhdhomerun -f
-  else
-    userhdhomerun -f -d
-  fi
+  userhdhomerun -f
 
   logger -t HDHomeRun "### Post wait for $POST_WAIT sec ###"
   sleep $POST_WAIT
@@ -151,15 +135,12 @@ EOF
 # save adapter names in background
 (
   sleep 4
-  sn_old=$(cat $HDHR_ADDON_HOME/adapters.txt 2>/dev/null)
+  sn_old=$(cat $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 >$HDHR_ADDON_HOME/adapters.txt
+    echo -n $sn_new >$ADDON_HOME/adapters.txt
   fi
 )&
 fi
 
 logger -t HDHomeRun "### HDHomeRun ready ###"
-
-# unlock the lock
-unlock

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

@@ -3,9 +3,7 @@
   <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="1040">Enable libhdhomerun logging</string>
 
   <string id="9000">Tuner settings</string>
   <string id="9005">Enable modifying settings</string>

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

@@ -4,9 +4,7 @@
     <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" />
+    <setting id="LIBHDHOMERUN_LOG" type="bool" label="1040" default="false" />
   </category>
   <category label="9000">
     <setting type="sep" />

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

@@ -22,42 +22,26 @@
 
 . /etc/profile
 
-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"
+LOCKDIR="/var/lock/"
+LOCKFILE="$LOCKDIR/hdhomerun"
 
-if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then
-  cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS
-fi
+case "$1" in
+  hibernate|suspend)
+    if [ -n "$(pidof userhdhomerun)" ]; then
+      progress "Shutting down HDHomeRun driver for suspending..."
+      mkdir -p "$LOCKDIR"
+      touch "$LOCKFILE"
+      killall userhdhomerun
+    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
+  thaw|resume)
+    if [ -f "$LOCKFILE" ]; then
+      # driver started within Tvheadend/VDR
+      rm -f "$LOCKFILE"
+    fi
+    ;;
 
-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
+  *) exit $NA
+    ;;
+esac

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

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

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

@@ -1,11 +1,3 @@
-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

packages/addons/driver/sundtek-mediatv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="sundtek-mediatv"
-PKG_VERSION="3.1"
-PKG_REV="2"
+PKG_VERSION="3.0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

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

@@ -6,7 +6,6 @@
   <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/userspace-driver.sh

@@ -22,18 +22,6 @@
 
 . /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
 
@@ -44,58 +32,58 @@ net_tuner_num_fix() {
   echo $num
 }
 
-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"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
+ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 
-mkdir -p $SUNDTEK_ADDON_HOME
+mkdir -p $ADDON_HOME
 
-if [ ! -f "$SUNDTEK_ADDON_HOME/sundtek.conf" ]; then
-  cp $SUNDTEK_ADDON_DIR/config/* $SUNDTEK_ADDON_HOME/
+if [ ! -f "$ADDON_HOME/sundtek.conf" ]; then
+  cp $ADDON_DIR/config/* $ADDON_HOME/
 else
   # in case of missing entries in addon home's sundtek.conf
-  entry_set="$(grep use_hwpidfilter $SUNDTEK_ADDON_HOME/sundtek.conf 2>/dev/null)"
+  entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)"
   if [ -z "$entry_set" ]; then
-    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|^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' $ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $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
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $ADDON_HOME/sundtek.conf
   fi
 fi
 
-if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
-  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
+if [ ! -f "$ADDON_SETTINGS" ]; then
+  cp $ADDON_DIR/settings-default.xml $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
+[ ! -f $ADDON_HOME/rc_key_enter.map ] && mv $ADDON_HOME/rc_key_enter $ADDON_HOME/rc_key_enter.map
+[ ! -f $ADDON_HOME/rc_key_ok.map ] && mv $ADDON_HOME/rc_key_ok $ADDON_HOME/rc_key_ok.map
 
 mkdir -p /var/config
-cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+cat "$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 $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
+if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then
   logger -t Sundtek "### Checking for new Sundtek binary installer ###"
-  touch $SUNDTEK_ADDON_HOME/driver-version.txt
+  touch $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 $SUNDTEK_ADDON_HOME/driver-version.txt | awk '{print $1}')
+  md5_2=$(md5sum -b $ADDON_HOME/driver-version.txt | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     logger -t Sundtek "### Updating Sundtek binary installer ###"
-    rm -f $SUNDTEK_ADDON_DIR/bin/mediasrv
+    rm -f $ADDON_DIR/bin/mediasrv
   fi
 
   rm -f /tmp/sundtek-driver-version.txt
 fi
 
-if [ ! -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
+if [ ! -f $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 $SUNDTEK_ADDON_DIR
+  cd $ADDON_DIR
   mkdir -p bin lib tmp
   cd tmp/
 
@@ -108,10 +96,10 @@ if [ ! -f $SUNDTEK_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' $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
+    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".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_DIR/settings-default.xml
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
   else
     logger -t Sundtek "### Unsupported architecture ###"
     cd ..
@@ -132,17 +120,17 @@ if [ ! -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then
 
   cp -Pa opt/bin/* ../bin/
   cp -Pa opt/lib/* ../lib/
-  cp ../driver-version.txt $SUNDTEK_ADDON_HOME/
+  cp ../driver-version.txt $ADDON_HOME/
   cd ..
   rm -fr tmp/
   logger -t Sundtek "### Installer finished ###"
 
-  cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
   . /var/config/sundtek-addon.conf
 fi
 
-if [ ! -f $SUNDTEK_ADDON_HOME/driver-version.txt ]; then
-  cp $SUNDTEK_ADDON_DIR/driver-version.txt $SUNDTEK_ADDON_HOME/
+if [ ! -f $ADDON_HOME/driver-version.txt ]; then
+  cp $ADDON_DIR/driver-version.txt $ADDON_HOME/
 fi
 
 # enable to install same addon package version again
@@ -159,11 +147,11 @@ else
   sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile
 fi
 
-export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
+export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
 
-if [ "$ANALOG_TV" = "true" -a ! -f "$SUNDTEK_ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
+if [ "$ANALOG_TV" = "true" -a ! -f "$ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
   logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
-  cd $SUNDTEK_ADDON_DIR/bin
+  cd $ADDON_DIR/bin
   mkdir -p plugins/
   cd plugins/
 
@@ -186,7 +174,7 @@ if [ -z "$(pidof mediasrv)" ]; then
   rm -f /var/log/mediaclient.log
 
   SUNDTEK_CONF_TMP=/tmp/sundtek.conf
-  cp $SUNDTEK_ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
+  cp $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
@@ -310,13 +298,13 @@ if [ -z "$(pidof mediasrv)" ]; then
   fi
 
   md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
-  md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/sundtek.conf | awk '{print $1}')
+  md5_2=$(md5sum -b $ADDON_HOME/sundtek.conf | awk '{print $1}')
   if [ "$md5_1" != "$md5_2" ]; then
     # file changed - copy to addon home
-    cp $SUNDTEK_CONF_TMP $SUNDTEK_ADDON_HOME/sundtek.conf
+    cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf
   fi
 
-  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 few seconds
   [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
@@ -332,23 +320,20 @@ if [ -z "$(pidof mediasrv)" ]; then
     mediaclient --disable-dvb=/dev/dvb/adapter0
   fi
 
-  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
+  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
     sh /var/run/sundtek-userscript.sh
   fi
 (
   # save adapter serial number in background
   sleep 5
-  serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null)
+  serial_number_old=$(cat $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" >$SUNDTEK_ADDON_HOME/adapters.txt
+    echo "$serial_number_new" >$ADDON_HOME/adapters.txt
   fi
 )&
 fi
 
 logger -t Sundtek "### Sundtek ready ###"
-
-# unlock the lock
-unlock

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

@@ -8,7 +8,6 @@
   <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>

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

@@ -9,7 +9,6 @@
     <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 type="sep" />

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

@@ -22,42 +22,26 @@
 
 . /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"
+LOCKDIR="/var/lock/"
+LOCKFILE="$LOCKDIR/sundtek-mediatv"
 
-if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then
-  cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS
-fi
+case "$1" in
+  hibernate|suspend)
+    if [ -n "$(pidof mediasrv)" ]; then
+      progress "Shutting down Sundtek DVB driver for suspending..."
+      mkdir -p "$LOCKDIR"
+      touch "$LOCKFILE"
+      mediaclient --shutdown
+    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
+  thaw|resume)
+    if [ -f "$LOCKFILE" ]; then
+      # driver started within Tvheadend/VDR
+      rm -f "$LOCKFILE"
+    fi
+    ;;
 
-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
+  *) exit $NA
+    ;;
+esac

packages/addons/driver/xbmc-ps3d/addon

@@ -22,24 +22,13 @@
 
 . config/options $1
 
-CWD=`pwd`
-cd $PKG_BUILD
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pixmaps
+  cp $BUILD/xbmc-*/tools/EventClients/icons/bluetooth.png $ADDON_BUILD/$PKG_ADDON_ID/pixmaps
 
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-nls \
-            --disable-rpath \
-            --disable-libdvbv5 \
-            --disable-libv4l \
-            --disable-v4l-utils \
-            --disable-qv4l2 \
-            --without-jpeg \
-            --without-libiconv-prefix \
-            --without-libintl-prefix \
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
+  cp -R $BUILD/PyBluez-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
 
-cd $CWD/$PKG_BUILD/lib/libdvbv5
-  make CFLAGS="$TARGET_CFLAGS"
-
-cd $CWD/$PKG_BUILD/utils/dvb
-  make CFLAGS="$TARGET_CFLAGS"
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
+  cp $BUILD/xbmc-*/tools/EventClients/Clients/PS3\ Sixaxis\ Controller/ps3d.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
+  cp $BUILD/xbmc-*/tools/EventClients/Clients/PS3\ BD\ Remote/ps3_remote.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
+  cp -R $BUILD/xbmc-*/tools/EventClients/lib/python/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc

packages/addons/driver/xbmc-ps3d/changelog.txt

@@ -0,0 +1,23 @@
+3.0.1
+- bump addon version
+
+2.1.1
+- update to addon version 2.1
+
+2.0.3
+- fix so python dont steal xbmc's webserver port
+
+2.0.2
+- rebuild with latest changes
+
+2.0.1
+- fix so python dont steal xbmc's webserver port
+
+2.0.0
+- prepare for OpenELEC-2.0 release
+
+1.90.1
+- depends on xbmc.python API 2.0
+
+1.90.0
+- initial version xbmc-ps3d

packages/addons/driver/xbmc-ps3d/meta

@@ -18,25 +18,21 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="service.openelec.settings"
-PKG_VERSION="0.1.23"
+PKG_NAME="xbmc-ps3d"
+PKG_VERSION="3.0"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="prop."
-PKG_SITE="http://www.openelec.tv"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
-PKG_DEPENDS="connman hd-idle"
-PKG_BUILD_DEPENDS="toolchain python"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.xbmc.org"
+PKG_URL=""
+PKG_DEPENDS="PyBluez"
+PKG_BUILD_DEPENDS="toolchain xbmc PyBluez"
 PKG_PRIORITY="optional"
-PKG_SECTION=""
-PKG_SHORTDESC="service.openelec.settings: Settings dialog for OpenELEC"
-PKG_LONGDESC="service.openelec.settings: is a settings dialog for OpenELEC"
+PKG_SECTION="driver/remote"
+PKG_SHORTDESC="xbmc-ps3d: a quick port of brandonj's PS3 remote script to use the event server for sending input events."
+PKG_LONGDESC="xbmc-ps3d is a quick port of brandonj's PS3 remote script to use the event server for sending input events. This addon also supports the PS3 sixaxis controller."
+
 PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
 
 PKG_AUTORECONF="no"
-
-if [ "$DISPLAYSERVER" = "xorg-server" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS setxkbmap"
-else
-  PKG_DEPENDS="$PKG_DEPENDS bkeymaps"
-fi

packages/addons/driver/xbmc-ps3d/source/bin/ps3d.service

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -19,33 +20,24 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="libshairplay"
-PKG_VERSION=""
-GIT_REPO="https://github.com/juhovh/shairplay.git"
-DEST_DIR="$PKG_NAME"
+. /etc/profile
 
-echo "getting sources..."
-  if [ ! -d $DEST_DIR.git ]; then
-    git clone $GIT_REPO $DEST_DIR.git
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/driver.remote.xbmc-ps3d"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.remote.xbmc-ps3d"
+  PIXMAPS_DIR="$ADDON_DIR/pixmaps"
+
+  export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
+
+################################################################################
+# setup ps3d
+################################################################################
+
+  if [ ! -f $ADDON_DIR/pylib/xbmc/defs.py ]; then
+    echo "ICON_PATH=\"$PIXMAPS_DIR\"" > $ADDON_DIR/pylib/xbmc/defs.py
   fi
 
-  cd $DEST_DIR.git
-    git pull
-
-    echo "getting version..."
-    PKG_VERSION=`git log -n1 --format=%h`
-    echo $GIT_REV
-  cd ..
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  cp -R $DEST_DIR.git $PKG_NAME-$PKG_VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION
+################################################################################
+# start ps3d
+################################################################################
+  python $ADDON_DIR/pylib/xbmc/ps3d.py &

packages/addons/driver/xbmc-ps3d/source/default.py

@@ -18,6 +18,6 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import os
-import sys
-import xbmcaddon
+import xbmc, time, os, subprocess
+
+subprocess.Popen("ps3d.service", shell=True, close_fds=True)

packages/addons/driver/xbmc-wiimote/addon

@@ -22,9 +22,8 @@
 
 . config/options $1
 
-cd $PKG_BUILD
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./resources/lib/ -f
-  rm -rf `find ./resources/lib/ -name "*.py"`
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $BUILD/xbmc-*/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $ADDON_BUILD/$PKG_ADDON_ID/bin/wiimote
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py ./oe.py -f
-  rm -rf ./oe.py
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/wiiuse_v[0-9]*/src/release*/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/driver/xbmc-wiimote/build

@@ -22,5 +22,7 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/screen $ADDON_BUILD/$PKG_ADDON_ID/bin/screen
+$SCRIPTS/unpack xbmc
+
+cd $BUILD/xbmc-*/tools/EventClients/Clients/WiiRemote
+  $CXX $CFLAGS -lwiiuse WiiUse_WiiRemote.cpp -o WiiUse_WiiRemote

packages/addons/driver/xbmc-wiimote/changelog.txt

@@ -0,0 +1,14 @@
+3.0.1
+- bump addon version
+
+2.1.1
+- update to addon version 2.1
+
+2.0.0
+- prepare for OpenELEC-2.0 release
+
+1.90.1
+- depends on xbmc.python API 2.0
+
+1.90.0
+- initial version xbmc-wiimote

packages/addons/driver/xbmc-wiimote/meta

@@ -0,0 +1,38 @@
+################################################################################
+#      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
+################################################################################
+
+PKG_NAME="xbmc-wiimote"
+PKG_VERSION="3.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.xbmc.org"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain wiiuse"
+PKG_PRIORITY="optional"
+PKG_SECTION="driver/remote"
+PKG_SHORTDESC="xbmc-wiimote: a driver to support WiiMote Controllers."
+PKG_LONGDESC="xbmc-wiimote is a driver to support WiiMote Controllers."
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.service"
+
+PKG_AUTORECONF="no"

packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -17,15 +19,14 @@
 #  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
+
+. /etc/profile
+
+# Addon settings
+  ADDON_DIR="$HOME/.xbmc/addons/driver.remote.xbmc-wiimote"
+  ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.remote.xbmc-wiimote"
 
 ################################################################################
-# setup functions
+# start ps3d
 ################################################################################
-
-# stub function
-  wait_for_xorg () {
-    :
-  }
+  LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" wiimote &

packages/addons/driver/xbmc-wiimote/source/default.py

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,18 +18,15 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+import os
+import sys
+import xbmcaddon
 
-LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-LDFLAGS="$LDFLAGS -ltinfo"
+__scriptname__ = "WiiMote driver"
+__author__ = "OpenELEC"
+__url__ = "http://www.openelec.tv"
+__settings__   = xbmcaddon.Addon(id='driver.remote.xbmc-wiimote')
+__cwd__        = __settings__.getAddonInfo('path')
+__path__       = xbmc.translatePath( os.path.join( __cwd__, 'bin', "wiimote.service") )
 
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-pam \
-            --disable-locale \
-            --disable-telnet
-
-make
+os.system(__path__)

packages/addons/multimedia/makemkv/addon

@@ -27,7 +27,6 @@ MAKEMKV_ARCH=i386
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp $PKG_BUILD/bin/bin/$MAKEMKV_ARCH/makemkvcon $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
-  chmod 755 $ADDON_BUILD/$PKG_ADDON_ID/bin/makemkvcon.bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp $PKG_BUILD/lib/out/libmakemkv.so.[0-9] $ADDON_BUILD/$PKG_ADDON_ID/lib

packages/addons/multimedia/makemkv/changelog.txt

@@ -1,12 +1,3 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
-3.0.6
-- update to makemkv-1.8.3
-
-3.0.5
-- update to makemkv-1.8.2
-
 3.0.4
 - update to makemkv-1.8.0
 

packages/addons/multimedia/makemkv/meta

@@ -19,8 +19,8 @@
 ################################################################################
 
 PKG_NAME="makemkv"
-PKG_VERSION="1.8.3"
-PKG_REV="1"
+PKG_VERSION="1.8.0"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"

packages/addons/multimedia/w_scan/changelog.txt

@@ -1,6 +1,3 @@
-3.1.1
-- rebuild for OpenELEC-3.2
-
 3.0.2
 - update to w_scan-20121111