From 236d0533ce5e4e4fecf73b4cbdcb973b31a36b52 Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Sat, 12 May 2012 20:06:44 +0200 Subject: [PATCH 1/6] vdr: always restart vdr after resume --- .../vdr-addon/source/sleep.d/modules.power | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power index 68e5c5e438..07f4de12d1 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power +++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/modules.power @@ -29,27 +29,26 @@ REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e LOCKFILE="/var/lock/vdr.sleep" -if [ ! "$REMOVE_MODULES" == "" ] ; then - case "$1" in - hibernate|suspend) - progress "Shutting down vdr for suspending..." - vdr.stop - touch $LOCKFILE - for module in $REMOVE_MODULES ; do - rmmod -w $module - done - ;; - thaw|resume) - for module in $REMOVE_MODULES ; do - modprobe $module - done - progress "Restarting vdr for wakeup..." - if [ -f "$LOCKFILE" ] ; then - rm -rf "$LOCKFILE" - vdr.start - fi - ;; - *) exit $NA - ;; - esac -fi +case "$1" in + hibernate|suspend) + progress "Shutting down vdr for suspending..." + vdr.stop + touch $LOCKFILE + for module in $REMOVE_MODULES ; do + rmmod -w $module + done + ;; + thaw|resume) + for module in $REMOVE_MODULES ; do + modprobe $module + done + progress "Restarting vdr for wakeup..." + if [ -f "$LOCKFILE" ] ; then + rm -rf "$LOCKFILE" + vdr.start + fi + ;; + *) exit $NA + ;; +esac + From f1e42b7667a7952df6efa07aca88a8f76cbeddb9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 12:46:29 +0300 Subject: [PATCH 2/6] vdr-plugin-dvbapi: update to vdr-plugin-dvbapi-e3200c8 --- packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta | 2 +- ...ing.patch => vdr-plugin-dvbapi-e3200c8-crosscompiling.patch} | 0 ...e8-ffdecsa.patch => vdr-plugin-dvbapi-e3200c8-ffdecsa.patch} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/{vdr-plugin-dvbapi-329cbe8-crosscompiling.patch => vdr-plugin-dvbapi-e3200c8-crosscompiling.patch} (100%) rename packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/{vdr-plugin-dvbapi-329cbe8-ffdecsa.patch => vdr-plugin-dvbapi-e3200c8-ffdecsa.patch} (100%) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta index f81e5d558f..c1bfc2a621 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-dvbapi" -PKG_VERSION="329cbe8" +PKG_VERSION="e3200c8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-crosscompiling.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-crosscompiling.patch rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-crosscompiling.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-ffdecsa.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-ffdecsa.patch rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e3200c8-ffdecsa.patch From 1ed6742a8194592d18f0a1a9931afe6a6e2d3947 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 12:47:26 +0300 Subject: [PATCH 3/6] vdr-addon: add dvbapi to sc list --- .../service/multimedia/vdr-addon/source/resources/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 14676dd6a6..be49d43c64 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -29,6 +29,6 @@ - + From e6135332d34738b0167aac00a6576de62b59b148 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 12:48:11 +0300 Subject: [PATCH 4/6] vdr-addon: update changelog --- packages/addons/service/multimedia/vdr-addon/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index d5d6a23a4f..a9a8f471f7 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,4 +1,5 @@ 2.1.6 +- update to vdr-plugin-dvbapi-e3200c8 - added vdr-xmltv2vdr plugin - added xineliboutput plugin - added text2skin plugin From e089530797a543d1ea139d686dbab376a136a080 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 17:29:30 +0300 Subject: [PATCH 5/6] busybox-hosttools: remove CONFIG_MONOTONIC_SYSCALL --- .../sysutils/busybox-hosttools/config/busybox-hosttools.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf index 7e94c23223..bfad25922c 100644 --- a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf +++ b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf @@ -114,7 +114,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 # CONFIG_FEATURE_SKIP_ROOTFS is not set -CONFIG_MONOTONIC_SYSCALL=y +# CONFIG_MONOTONIC_SYSCALL is not set # CONFIG_IOCTL_HEX2STR_ERROR is not set # CONFIG_FEATURE_HWIB is not set From 4de522a6c673a0deff50b83d4fd0b3439af97637 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 14 May 2012 20:34:24 +0300 Subject: [PATCH 6/6] transmission: do not use epoll --- .../downloadmanager/transmission/source/bin/transmission.start | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 9921c05e7d..fed7a28623 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -83,7 +83,7 @@ if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then break fi - LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE + EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE sleep 1 done & fi