From 5b8ee3035c00aae4c16fdd3cabea7e7e778a916a Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Fri, 21 Jun 2013 05:53:13 +0200 Subject: [PATCH 1/7] xbmc-addon-xvdr: add pvr api 1.8.0 patch (xvdr pull #111) --- .../xbmc-addon-xvdr-pvr-api-1-8-0.patch | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 packages/mediacenter/xbmc-addon-xvdr/patches/871faab/xbmc-addon-xvdr-pvr-api-1-8-0.patch diff --git a/packages/mediacenter/xbmc-addon-xvdr/patches/871faab/xbmc-addon-xvdr-pvr-api-1-8-0.patch b/packages/mediacenter/xbmc-addon-xvdr/patches/871faab/xbmc-addon-xvdr-pvr-api-1-8-0.patch new file mode 100644 index 0000000000..8ebb045861 --- /dev/null +++ b/packages/mediacenter/xbmc-addon-xvdr/patches/871faab/xbmc-addon-xvdr-pvr-api-1-8-0.patch @@ -0,0 +1,159 @@ +From b0dd079bee34969dade531ec33bc933cf5565964 Mon Sep 17 00:00:00 2001 +From: Daniel Meyerholt +Date: Wed, 19 Jun 2013 18:55:54 +0200 +Subject: [PATCH] Update xbmc addon headers + +--- + src/xvdr/XBMCAddon.cpp | 2 +- + src/xvdr/include/DVDDemuxPacket.h | 2 +- + src/xvdr/include/xbmc_addon_dll.h | 2 +- + src/xvdr/include/xbmc_epg_types.h | 2 +- + src/xvdr/include/xbmc_pvr_dll.h | 3 ++- + src/xvdr/include/xbmc_pvr_types.h | 25 ++++++++++++++++++++----- + 6 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/src/xvdr/XBMCAddon.cpp b/src/xvdr/XBMCAddon.cpp +index 60bfbe8..23c89a0 100644 +--- a/src/xvdr/XBMCAddon.cpp ++++ b/src/xvdr/XBMCAddon.cpp +@@ -828,7 +828,7 @@ int GetRecordingLastPlayedPosition(const PVR_RECORDING &recording) + return mClient->GetRecordingLastPosition(recording.strRecordingId); + } + +-PVR_ERROR CallMenuHook(const PVR_MENUHOOK &menuhook) { ++PVR_ERROR CallMenuHook(const PVR_MENUHOOK &menuhook, const PVR_MENUHOOK_DATA &item) { + switch(menuhook.iHookId) { + case XVDR_HOOK_SETTINGS_CHANNELSCAN: + DialogChannelScan(); +diff --git a/src/xvdr/include/DVDDemuxPacket.h b/src/xvdr/include/DVDDemuxPacket.h +index 7d9967e..cf3c1e0 100644 +--- a/src/xvdr/include/DVDDemuxPacket.h ++++ b/src/xvdr/include/DVDDemuxPacket.h +@@ -1,7 +1,7 @@ + #pragma once + + /* +- * Copyright (C) 2012 Team XBMC ++ * Copyright (C) 2012-2013 Team XBMC + * http://www.xbmc.org + * + * This Program is free software; you can redistribute it and/or modify +diff --git a/src/xvdr/include/xbmc_addon_dll.h b/src/xvdr/include/xbmc_addon_dll.h +index 9402623..12d3d91 100644 +--- a/src/xvdr/include/xbmc_addon_dll.h ++++ b/src/xvdr/include/xbmc_addon_dll.h +@@ -21,7 +21,7 @@ + * + */ + +-#ifdef _WIN32 ++#ifdef TARGET_WINDOWS + #include + #else + #ifndef __cdecl +diff --git a/src/xvdr/include/xbmc_epg_types.h b/src/xvdr/include/xbmc_epg_types.h +index 2284dda..c486be4 100644 +--- a/src/xvdr/include/xbmc_epg_types.h ++++ b/src/xvdr/include/xbmc_epg_types.h +@@ -26,7 +26,7 @@ + #undef PRAGMA_PACK_BEGIN + #undef PRAGMA_PACK_END + +-#if defined(__GNUC__) && !defined(__MINGW32__) ++#if defined(__GNUC__) + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) + #define ATTRIBUTE_PACKED __attribute__ ((packed)) + #define PRAGMA_PACK 0 +diff --git a/src/xvdr/include/xbmc_pvr_dll.h b/src/xvdr/include/xbmc_pvr_dll.h +index a40022b..5ef7b95 100644 +--- a/src/xvdr/include/xbmc_pvr_dll.h ++++ b/src/xvdr/include/xbmc_pvr_dll.h +@@ -108,10 +108,11 @@ + * Call one of the menu hooks (if supported). + * Supported PVR_MENUHOOK instances have to be added in ADDON_Create(), by calling AddMenuHook() on the callback. + * @param menuhook The hook to call. ++ * @param item The selected item for which the hook was called. + * @return PVR_ERROR_NO_ERROR if the hook was called successfully. + * @remarks Optional. Return PVR_ERROR_NOT_IMPLEMENTED if this add-on won't provide this function. + */ +- PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook); ++ PVR_ERROR CallMenuHook(const PVR_MENUHOOK& menuhook, const PVR_MENUHOOK_DATA &item); + //@} + + /*! @name PVR EPG methods +diff --git a/src/xvdr/include/xbmc_pvr_types.h b/src/xvdr/include/xbmc_pvr_types.h +index a8193ed..1fb0c6c 100644 +--- a/src/xvdr/include/xbmc_pvr_types.h ++++ b/src/xvdr/include/xbmc_pvr_types.h +@@ -22,7 +22,7 @@ + #ifndef __PVRCLIENT_TYPES_H__ + #define __PVRCLIENT_TYPES_H__ + +-#ifdef _WIN32 ++#ifdef TARGET_WINDOWS + #include + #else + #ifndef __cdecl +@@ -52,7 +52,7 @@ + #undef PRAGMA_PACK_BEGIN + #undef PRAGMA_PACK_END + +-#if defined(__GNUC__) && !defined(__MINGW32__) ++#if defined(__GNUC__) + #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) + #define ATTRIBUTE_PACKED __attribute__ ((packed)) + #define PRAGMA_PACK 0 +@@ -74,10 +74,10 @@ + #define PVR_STREAM_MAX_STREAMS 20 + + /* current PVR API version */ +-#define XBMC_PVR_API_VERSION "1.7.0" ++#define XBMC_PVR_API_VERSION "1.8.0" + + /* min. PVR API version */ +-#define XBMC_PVR_MIN_API_VERSION "1.7.0" ++#define XBMC_PVR_MIN_API_VERSION "1.8.0" + + #ifdef __cplusplus + extern "C" { +@@ -121,6 +121,7 @@ + */ + typedef enum + { ++ PVR_MENUHOOK_UNKNOWN =-1, /*!< @brief unknown menu hook */ + PVR_MENUHOOK_ALL = 0, /*!< @brief all categories */ + PVR_MENUHOOK_CHANNEL = 1, /*!< @brief for channels */ + PVR_MENUHOOK_TIMER = 2, /*!< @brief for timers */ +@@ -310,6 +311,20 @@ + } ATTRIBUTE_PACKED PVR_EDL_ENTRY; + + /*! ++ * @brief PVR menu hook data ++ */ ++ typedef struct PVR_MENUHOOK_DATA ++ { ++ PVR_MENUHOOK_CAT cat; ++ union data { ++ int iEpgUid; ++ PVR_CHANNEL channel; ++ PVR_TIMER timer; ++ PVR_RECORDING recording; ++ } data; ++ } ATTRIBUTE_PACKED PVR_MENUHOOK_DATA; ++ ++ /*! + * @brief Structure to transfer the methods from xbmc_pvr_dll.h to XBMC + */ + typedef struct PVRClient +@@ -324,7 +339,7 @@ + const char* (__cdecl* GetBackendVersion)(void); + const char* (__cdecl* GetConnectionString)(void); + PVR_ERROR (__cdecl* GetDriveSpace)(long long*, long long*); +- PVR_ERROR (__cdecl* MenuHook)(const PVR_MENUHOOK&); ++ PVR_ERROR (__cdecl* MenuHook)(const PVR_MENUHOOK&, const PVR_MENUHOOK_DATA&); + PVR_ERROR (__cdecl* GetEpg)(ADDON_HANDLE, const PVR_CHANNEL&, time_t, time_t); + int (__cdecl* GetChannelGroupsAmount)(void); + PVR_ERROR (__cdecl* GetChannelGroups)(ADDON_HANDLE, bool); +-- +1.8.1.6 + From 0ca3ade6e6bb38e57d90d526b2646d11e281f408 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Jun 2013 11:24:36 +0200 Subject: [PATCH 2/7] openvpn: update to openvpn-2.3.2 Signed-off-by: Stephan Raue --- packages/network/openvpn/meta | 2 +- .../patches/openvpn-2.3.0-automake-1.13.patch | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch diff --git a/packages/network/openvpn/meta b/packages/network/openvpn/meta index dfb8bf0b07..623c5008df 100644 --- a/packages/network/openvpn/meta +++ b/packages/network/openvpn/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openvpn" -PKG_VERSION="2.3.0" +PKG_VERSION="2.3.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch b/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch deleted file mode 100644 index 46dc975303..0000000000 --- a/packages/network/openvpn/patches/openvpn-2.3.0-automake-1.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openvpn-2.3.0/configure.ac openvpn-2.3.0.patch/configure.ac ---- openvpn-2.3.0/configure.ac 2012-11-29 21:47:57.000000000 +0100 -+++ openvpn-2.3.0.patch/configure.ac 2013-01-16 03:36:51.567034700 +0100 -@@ -32,7 +32,7 @@ - AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format]) - - AC_CONFIG_AUX_DIR([.]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([src/openvpn/syshead.h]) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE From 86e25c471de76371e698f19a43b1d90f67503060 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 21 Jun 2013 12:25:08 +0200 Subject: [PATCH 3/7] sundtek: improved start, suspend and resume --- .../driver/sundtek-mediatv/changelog.txt | 2 + packages/addons/driver/sundtek-mediatv/meta | 2 +- .../sundtek-mediatv/settings-default.xml | 1 + .../source/bin/userspace-driver.sh | 15 +++++ .../resources/language/English/strings.xml | 1 + .../source/resources/settings.xml | 1 + .../source/sleep.d/sundtek-mediatv.power | 56 ++++++++++++------- 7 files changed, 57 insertions(+), 21 deletions(-) diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index 9dbd332241..2ad4f8071a 100644 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,5 @@ +3.1.2 + new addon settings option to enable suspend/resume driver actions 3.1.1 rebuild for OpenELEC-3.2 3.0.6 diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta index 3775a7ded8..eae1b84de6 100644 --- a/packages/addons/driver/sundtek-mediatv/meta +++ b/packages/addons/driver/sundtek-mediatv/meta @@ -20,7 +20,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="3.1" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/addons/driver/sundtek-mediatv/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml index dff044590f..7a2ddc571a 100644 --- a/packages/addons/driver/sundtek-mediatv/settings-default.xml +++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml @@ -6,6 +6,7 @@ + diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh index 6f27a90709..0c82fef011 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh @@ -22,6 +22,18 @@ . /etc/profile +# start locking mechanism - allows only one instance to be run at a time +SUNDTEK_LOCKFILE="/var/lock/userspace-driver-sundtek.lck" +SUNDTEK_LOCKFD=99 +# obtain an exclusive lock +exlock() { eval "exec $SUNDTEK_LOCKFD>\"$SUNDTEK_LOCKFILE\""; flock -x $SUNDTEK_LOCKFD; } +# drop a lock +unlock() { flock -u $SUNDTEK_LOCKFD; flock -xn $SUNDTEK_LOCKFD && rm -f "$SUNDTEK_LOCKFILE"; } +# end locking mechanism + +# exclusive lock +exlock + net_tuner_num_fix() { local num=$1 @@ -337,3 +349,6 @@ if [ -z "$(pidof mediasrv)" ]; then fi logger -t Sundtek "### Sundtek ready ###" + +# unlock the lock +unlock diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml index b39dad0c87..79530eae49 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml @@ -8,6 +8,7 @@ Enable hardware PID filter Enable IR receiver Lowest adapter number (/dev/dvb/adapterX/) + Enable suspend/resume the driver Networking Share local tuner over network diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml index f69589c854..919b142f08 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml @@ -9,6 +9,7 @@ + diff --git a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power index 0167050dd9..8850339ae4 100644 --- a/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power +++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power @@ -22,26 +22,42 @@ . /etc/profile -LOCKDIR="/var/lock/" -LOCKFILE="$LOCKDIR/sundtek-mediatv" +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" -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 - ;; +if [ ! -f "$SUNDTEK_ADDON_SETTINGS" ]; then + cp $SUNDTEK_ADDON_DIR/settings-default.xml $SUNDTEK_ADDON_SETTINGS +fi - thaw|resume) - if [ -f "$LOCKFILE" ]; then - # driver started within Tvheadend/VDR - rm -f "$LOCKFILE" - 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 - *) exit $NA - ;; -esac +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 From c12144afeaaf6a72715bf150a8a1e262c67bf665 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Fri, 21 Jun 2013 12:26:11 +0200 Subject: [PATCH 4/7] hdhomerun: improved start, suspend and resume --- .../addons/driver/hdhomerun/changelog.txt | 3 + .../hdhomerun/config/dvbhdhomerun.sample | 0 .../addons/driver/hdhomerun/icon/icon.png | Bin packages/addons/driver/hdhomerun/meta | 2 +- .../driver/hdhomerun/settings-default.xml | 3 + .../hdhomerun/source/bin/hdhomerun.start | 0 .../hdhomerun/source/bin/hdhomerun.stop | 0 .../hdhomerun/source/bin/userspace-driver.sh | 23 ++++++- .../addons/driver/hdhomerun/source/default.py | 0 .../resources/language/English/strings.xml | 4 +- .../source/resources/lib/functions.py | 0 .../hdhomerun/source/resources/lib/xmlpp.py | 0 .../hdhomerun/source/resources/settings.xml | 4 +- .../hdhomerun/source/sleep.d/hdhomerun.power | 56 +++++++++++------- 14 files changed, 70 insertions(+), 25 deletions(-) mode change 100644 => 100755 packages/addons/driver/hdhomerun/changelog.txt mode change 100644 => 100755 packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample mode change 100644 => 100755 packages/addons/driver/hdhomerun/icon/icon.png mode change 100644 => 100755 packages/addons/driver/hdhomerun/meta mode change 100644 => 100755 packages/addons/driver/hdhomerun/settings-default.xml mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/bin/hdhomerun.start mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/default.py mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/resources/lib/functions.py mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/resources/settings.xml mode change 100644 => 100755 packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt old mode 100644 new mode 100755 index 89c36a01e1..c943d655a5 --- a/packages/addons/driver/hdhomerun/changelog.txt +++ b/packages/addons/driver/hdhomerun/changelog.txt @@ -1,3 +1,6 @@ +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 diff --git a/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample b/packages/addons/driver/hdhomerun/config/dvbhdhomerun.sample old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/icon/icon.png b/packages/addons/driver/hdhomerun/icon/icon.png old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/meta b/packages/addons/driver/hdhomerun/meta old mode 100644 new mode 100755 index 7d47b8165b..a88e62bd81 --- a/packages/addons/driver/hdhomerun/meta +++ b/packages/addons/driver/hdhomerun/meta @@ -20,7 +20,7 @@ PKG_NAME="hdhomerun" PKG_VERSION="3.2" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/" diff --git a/packages/addons/driver/hdhomerun/settings-default.xml b/packages/addons/driver/hdhomerun/settings-default.xml old mode 100644 new mode 100755 index 240d6ac22e..3f9180a9fe --- a/packages/addons/driver/hdhomerun/settings-default.xml +++ b/packages/addons/driver/hdhomerun/settings-default.xml @@ -1,4 +1,7 @@ + + + diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start b/packages/addons/driver/hdhomerun/source/bin/hdhomerun.start old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop b/packages/addons/driver/hdhomerun/source/bin/hdhomerun.stop old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh old mode 100644 new mode 100755 index d929d5ebc4..3ecb021239 --- a/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh +++ b/packages/addons/driver/hdhomerun/source/bin/userspace-driver.sh @@ -22,6 +22,18 @@ . /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" @@ -92,7 +104,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 @@ -127,7 +139,11 @@ EOF mkdir -p /var/log/ rm -f /var/log/dvbhdhomerun.log - userhdhomerun -f + if [ "$USERHDHOMERUN_LOG" = "true" ]; then + userhdhomerun -f + else + userhdhomerun -f -d + fi logger -t HDHomeRun "### Post wait for $POST_WAIT sec ###" sleep $POST_WAIT @@ -144,3 +160,6 @@ EOF fi logger -t HDHomeRun "### HDHomeRun ready ###" + +# unlock the lock +unlock diff --git a/packages/addons/driver/hdhomerun/source/default.py b/packages/addons/driver/hdhomerun/source/default.py old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml b/packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml old mode 100644 new mode 100755 index 9e9886759e..ab8488639d --- a/packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml +++ b/packages/addons/driver/hdhomerun/source/resources/language/English/strings.xml @@ -3,7 +3,9 @@ General Pre wait time [sec] Post wait time [sec] - Enable libhdhomerun logging + Enable userhdhomerun logging + Enable libhdhomerun logging + Enable suspend/resume the driver Tuner settings Enable modifying settings diff --git a/packages/addons/driver/hdhomerun/source/resources/lib/functions.py b/packages/addons/driver/hdhomerun/source/resources/lib/functions.py old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py b/packages/addons/driver/hdhomerun/source/resources/lib/xmlpp.py old mode 100644 new mode 100755 diff --git a/packages/addons/driver/hdhomerun/source/resources/settings.xml b/packages/addons/driver/hdhomerun/source/resources/settings.xml old mode 100644 new mode 100755 index 873b1ef411..9312f7ea17 --- a/packages/addons/driver/hdhomerun/source/resources/settings.xml +++ b/packages/addons/driver/hdhomerun/source/resources/settings.xml @@ -4,7 +4,9 @@ - + + + diff --git a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power b/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power old mode 100644 new mode 100755 index f3b08e6284..3d5fd278ba --- a/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power +++ b/packages/addons/driver/hdhomerun/source/sleep.d/hdhomerun.power @@ -22,26 +22,42 @@ . /etc/profile -LOCKDIR="/var/lock/" -LOCKFILE="$LOCKDIR/hdhomerun" +HDHR_ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.hdhomerun" +HDHR_ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.hdhomerun" +HDHR_ADDON_SETTINGS="$HDHR_ADDON_HOME/settings.xml" -case "$1" in - hibernate|suspend) - if [ -n "$(pidof userhdhomerun)" ]; then - progress "Shutting down HDHomeRun driver for suspending..." - mkdir -p "$LOCKDIR" - touch "$LOCKFILE" - killall -9 userhdhomerun - fi - ;; +if [ ! -f "$HDHR_ADDON_SETTINGS" ]; then + cp $HDHR_ADDON_DIR/settings-default.xml $HDHR_ADDON_SETTINGS +fi - thaw|resume) - if [ -f "$LOCKFILE" ]; then - # driver started within Tvheadend/VDR - rm -f "$LOCKFILE" - fi - ;; +mkdir -p /var/config +cat "$HDHR_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/hdhomerun-addon.conf +. /var/config/hdhomerun-addon.conf - *) exit $NA - ;; -esac +if [ "$SUSPEND_DRIVER" = "true" ]; then + LOCKDIR="/var/lock" + LOCKFILE="$LOCKDIR/hdhomerun" + + case "$1" in + hibernate|suspend) + if [ -n "$(pidof userhdhomerun)" ]; then + progress "Shutting down HDHomeRun driver for suspending..." + mkdir -p "$LOCKDIR" + touch "$LOCKFILE" + killall -9 userhdhomerun + fi + ;; + + thaw|resume) + if [ -f "$LOCKFILE" ]; then + # driver started within Tvheadend/VDR + rm -f "$LOCKFILE" + fi + ;; + + *) exit $NA + ;; + esac +else + progress "Suspend/resume of HDHomeRun driver not enabled..." +fi From f9e86cd15824e628fe47de980275b1366d0b2f97 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Jun 2013 08:07:18 +0200 Subject: [PATCH 5/7] linux: update to linux-3.9.7 Signed-off-by: Stephan Raue --- .../linux/patches/{3.9.6 => 3.9.7}/linux-003-no_dev_console.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-010-perf_crosscompiling.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-052-XBOX_remote_support.patch | 0 .../{3.9.6 => 3.9.7}/linux-053-spinelplus-remote-0.2.patch | 0 ...voton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch | 0 .../linux-055-add_Formosa_eHome_Infrared_Receiver.patch | 0 .../linux-056-add_Adaptec_eHome_Infrared_Receiver.patch | 0 ...-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch | 0 .../linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch | 0 .../{3.9.6 => 3.9.7}/linux-059-remove_some_xpad_pids-0.2.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-060-add_AUGUST_DVB-T205.patch | 0 .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 packages/linux/patches/{3.9.6 => 3.9.7}/linux-210-dvbsky.patch | 0 .../{3.9.6 => 3.9.7}/linux-212-mantis_stb0899_faster_lock.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-213-cinergy_s2_usb_r2.patch | 0 .../linux/patches/{3.9.6 => 3.9.7}/linux-221-ngene-octopus.patch | 0 .../{3.9.6 => 3.9.7}/linux-222-stb0899_signal_quality.patch | 0 .../linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-700-jmicron_1_0_8_5.patch | 0 packages/linux/patches/{3.9.6 => 3.9.7}/linux-701-fix-r8169.patch | 0 .../linux/patches/{3.9.6 => 3.9.7}/linux-900-hide_tsc_error.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 ....06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo | 0 .../patches/{3.9.6 => 3.9.7}/linux-995-CX24120-13Z_frontend.patch | 0 .../patches/{3.9.6 => 3.9.7}/linux-996-macmini2012-ethernet.patch | 0 .../linux-997-disable-rc6-on-sandybridge-gt1.patch | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-003-no_dev_console.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-010-perf_crosscompiling.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-052-XBOX_remote_support.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-053-spinelplus-remote-0.2.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-055-add_Formosa_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-059-remove_some_xpad_pids-0.2.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-060-add_AUGUST_DVB-T205.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-213-cinergy_s2_usb_r2.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-700-jmicron_1_0_8_5.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-701-fix-r8169.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-900-hide_tsc_error.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-995-CX24120-13Z_frontend.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-996-macmini2012-ethernet.patch (100%) rename packages/linux/patches/{3.9.6 => 3.9.7}/linux-997-disable-rc6-on-sandybridge-gt1.patch (100%) diff --git a/packages/linux/patches/3.9.6/linux-003-no_dev_console.patch b/packages/linux/patches/3.9.7/linux-003-no_dev_console.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-003-no_dev_console.patch rename to packages/linux/patches/3.9.7/linux-003-no_dev_console.patch diff --git a/packages/linux/patches/3.9.6/linux-010-perf_crosscompiling.patch b/packages/linux/patches/3.9.7/linux-010-perf_crosscompiling.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-010-perf_crosscompiling.patch rename to packages/linux/patches/3.9.7/linux-010-perf_crosscompiling.patch diff --git a/packages/linux/patches/3.9.6/linux-052-XBOX_remote_support.patch b/packages/linux/patches/3.9.7/linux-052-XBOX_remote_support.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-052-XBOX_remote_support.patch rename to packages/linux/patches/3.9.7/linux-052-XBOX_remote_support.patch diff --git a/packages/linux/patches/3.9.6/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/3.9.7/linux-053-spinelplus-remote-0.2.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-053-spinelplus-remote-0.2.patch rename to packages/linux/patches/3.9.7/linux-053-spinelplus-remote-0.2.patch diff --git a/packages/linux/patches/3.9.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch b/packages/linux/patches/3.9.7/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch rename to packages/linux/patches/3.9.7/linux-054-nuvoton_revert_d7b290a1056c5564eec8a1b169c6e84ff3.6.114c13.patch diff --git a/packages/linux/patches/3.9.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.9.7/linux-055-add_Formosa_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-055-add_Formosa_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.9.7/linux-055-add_Formosa_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.9.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch b/packages/linux/patches/3.9.7/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch rename to packages/linux/patches/3.9.7/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.9.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch b/packages/linux/patches/3.9.7/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch rename to packages/linux/patches/3.9.7/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch diff --git a/packages/linux/patches/3.9.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch b/packages/linux/patches/3.9.7/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch rename to packages/linux/patches/3.9.7/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch diff --git a/packages/linux/patches/3.9.6/linux-059-remove_some_xpad_pids-0.2.patch b/packages/linux/patches/3.9.7/linux-059-remove_some_xpad_pids-0.2.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-059-remove_some_xpad_pids-0.2.patch rename to packages/linux/patches/3.9.7/linux-059-remove_some_xpad_pids-0.2.patch diff --git a/packages/linux/patches/3.9.6/linux-060-add_AUGUST_DVB-T205.patch b/packages/linux/patches/3.9.7/linux-060-add_AUGUST_DVB-T205.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-060-add_AUGUST_DVB-T205.patch rename to packages/linux/patches/3.9.7/linux-060-add_AUGUST_DVB-T205.patch diff --git a/packages/linux/patches/3.9.6/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.9.7/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.9.7/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.9.6/linux-210-dvbsky.patch b/packages/linux/patches/3.9.7/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-210-dvbsky.patch rename to packages/linux/patches/3.9.7/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.9.6/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.9.7/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.9.7/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.9.6/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.9.7/linux-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/3.9.7/linux-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/3.9.6/linux-221-ngene-octopus.patch b/packages/linux/patches/3.9.7/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.9.7/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.9.6/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.9.7/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.9.7/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.9.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch b/packages/linux/patches/3.9.7/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch rename to packages/linux/patches/3.9.7/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch diff --git a/packages/linux/patches/3.9.6/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.9.7/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.9.7/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.9.6/linux-701-fix-r8169.patch b/packages/linux/patches/3.9.7/linux-701-fix-r8169.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-701-fix-r8169.patch rename to packages/linux/patches/3.9.7/linux-701-fix-r8169.patch diff --git a/packages/linux/patches/3.9.6/linux-900-hide_tsc_error.patch b/packages/linux/patches/3.9.7/linux-900-hide_tsc_error.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-900-hide_tsc_error.patch rename to packages/linux/patches/3.9.7/linux-900-hide_tsc_error.patch diff --git a/packages/linux/patches/3.9.6/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.9.7/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.9.7/linux-950-saa716x_PCIe_interface_chipset.patch diff --git a/packages/linux/patches/3.9.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo b/packages/linux/patches/3.9.7/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo similarity index 100% rename from packages/linux/patches/3.9.6/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo rename to packages/linux/patches/3.9.7/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch.todo diff --git a/packages/linux/patches/3.9.6/linux-995-CX24120-13Z_frontend.patch b/packages/linux/patches/3.9.7/linux-995-CX24120-13Z_frontend.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-995-CX24120-13Z_frontend.patch rename to packages/linux/patches/3.9.7/linux-995-CX24120-13Z_frontend.patch diff --git a/packages/linux/patches/3.9.6/linux-996-macmini2012-ethernet.patch b/packages/linux/patches/3.9.7/linux-996-macmini2012-ethernet.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-996-macmini2012-ethernet.patch rename to packages/linux/patches/3.9.7/linux-996-macmini2012-ethernet.patch diff --git a/packages/linux/patches/3.9.6/linux-997-disable-rc6-on-sandybridge-gt1.patch b/packages/linux/patches/3.9.7/linux-997-disable-rc6-on-sandybridge-gt1.patch similarity index 100% rename from packages/linux/patches/3.9.6/linux-997-disable-rc6-on-sandybridge-gt1.patch rename to packages/linux/patches/3.9.7/linux-997-disable-rc6-on-sandybridge-gt1.patch From 4c72b7f3e1b93d3a62de1c75780eee1e90a36a52 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Jun 2013 16:12:30 +0200 Subject: [PATCH 6/7] bcm_sta: fix build Signed-off-by: Stephan Raue --- packages/linux-drivers/bcm_sta/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux-drivers/bcm_sta/build b/packages/linux-drivers/bcm_sta/build index b904fd853c..8e0e2822a3 100755 --- a/packages/linux-drivers/bcm_sta/build +++ b/packages/linux-drivers/bcm_sta/build @@ -27,4 +27,4 @@ cd $PKG_BUILD [ "$TARGET_ARCH" = "i386" ] && cd x86-32 [ "$TARGET_ARCH" = "x86_64" ] && cd x86-64 -KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$ARCH +KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$TARGET_ARCH From 293744ce3566404d995a1f3556aefec494f10f52 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 21 Jun 2013 16:13:31 +0200 Subject: [PATCH 7/7] Python: add hack to break build if build goes wrong Signed-off-by: Stephan Raue --- packages/lang/Python/install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/lang/Python/install b/packages/lang/Python/install index 04295a23a6..d2382316db 100755 --- a/packages/lang/Python/install +++ b/packages/lang/Python/install @@ -39,6 +39,11 @@ mkdir -p $PYTHON_LIB_DIR/config mkdir -p $PYTHON_LIB_DIR/lib-dynload cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload +# Todo: sometimes Python dont build '_socket.so' for some reasons and continues without failing, +# let it fail in this way, to be sure '_socket.so' will be installed- a rebuild of Python fixes +# the issue in most cases: + cp $PKG_BUILD/.objdir-target/build/lib*/_socket.so $PYTHON_LIB_DIR/lib-dynload + cp -R $PKG_BUILD/.objdir-target/Lib/* $PYTHON_LIB_DIR # For future 3rd-parties Python modules