Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/graphics/imlib2/meta

@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://web.enlightenment.org/"
 PKG_URL="$SOURCEFORGE_SRC/enlightenment/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2"
+PKG_BUILD_DEPENDS="toolchain libjpeg-turbo libpng tiff zlib bzip2 libX11 libXext"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="Imlib2 is a graphics library."

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -1,6 +1,7 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
     <setting id="REMOVE_MODULES" value="" />
+    <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
     <setting id="ENABLE_DYNAMITE" value="true" />
     <setting id="ENABLE_IPTV" value="false" />
     <setting id="ENABLE_SOFTCAM" value="true" />

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -32,7 +32,6 @@ ADDON_SETTINGS="$ADDON_HOME/settings.xml"
 
 ADDON_CONFIG_DIR="$ADDON_HOME/config"
 ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
-ADDON_VIDEO_DIR="$HOME/videos"
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
   mkdir -p $ADDON_HOME
@@ -51,7 +50,7 @@ cp $ADDON_DIR/config/epgsources/epgdata2xmltv/epgdata2xmltv.dist /var/lib/epgsou
 VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
-VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR"
+VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\""
 VDR_ARG="$VDR_ARG -P xvdr"
 
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -2,6 +2,7 @@
 <strings>
 	<string id="1000">DVB</string>
 	<string id="1001">Plugins</string>
+	<string id="1002">VDR</string>
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
@@ -26,4 +27,6 @@
 	<string id="1048">Enable plugin: xineliboutput</string>
 	<string id="1049">xineliboutput: listen on port</string>
 	<string id="1050">Enable plugin: text2skin</string>
+	<string id="1051">VDR Configuration</string>
+	<string id="1052">VDR Video Dir</string>
 </strings>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -6,6 +6,11 @@
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
+    <category label="1002">
+		<setting label="1051" type="lsep"/>
+		<setting type="sep" />
+                <setting id="VDR_VIDEO_DIR" type="folder" label="1052" value="" default="/storage/videos" />
+    </category>
     <category label="1001">
 		<setting label="1030" type="lsep"/>
 		<setting type="sep" />

packages/linux-drivers/linux-tbs-drivers/install

@@ -24,8 +24,8 @@
 
 VER=`ls $BUILD/linux*/modules/lib/modules`
 
-mkdir -p $INSTALL/lib/modules/$VER/tbs
-find $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$VER/tbs \;
+mkdir -p $INSTALL/lib/modules/$VER/updates/tbs
+find $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/lib/modules/$VER/updates/tbs \;
 
 mkdir -p $INSTALL/lib/firmware/
 cp $BUILD/${PKG_NAME}-${PKG_VERSION}/*.fw $INSTALL/lib/firmware/

packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-901.41-avfilter-depends-on-avformat.patch

@@ -0,0 +1,41 @@
+From d1e06c28d3eb6cd689b8cbc5b96babe81707baa7 Mon Sep 17 00:00:00 2001
+From: Rainer Hochecker <fernetmenta@online.de>
+Date: Sun, 15 Apr 2012 14:00:22 +0200
+Subject: [PATCH] ffmpeg: avfilter depends on avformat
+
+---
+ lib/DllAvFilter.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
+index 5c83654..6ae5d15 100644
+--- a/lib/DllAvFilter.h
++++ b/lib/DllAvFilter.h
+@@ -25,6 +25,7 @@
+ #endif
+ #include "DynamicDll.h"
+ #include "DllAvCodec.h"
++#include "DllAvFormat.h"
+ #include "DllSwResample.h"
+ #include "utils/log.h"
+ 
+@@ -203,6 +204,7 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
+   /* dependencies of libavfilter */
+   DllAvUtil m_dllAvUtil;
+   DllSwResample m_dllSwResample;
++  DllAvFormat m_dllAvFormat;
+ 
+ public:
+   int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
+@@ -251,6 +253,8 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
+       return false;
+     if (!m_dllSwResample.Load())
+       return false;
++    if (!m_dllAvFormat.Load())
++      return false;
+     return DllDynamic::Load();
+   }
+ };
+-- 
+1.7.10
+

packages/mediacenter/xbmc/patches/xbmc-11.0.1-901.41-avfilter-depends-on-avformat.patch

@@ -0,0 +1,41 @@
+From d1e06c28d3eb6cd689b8cbc5b96babe81707baa7 Mon Sep 17 00:00:00 2001
+From: Rainer Hochecker <fernetmenta@online.de>
+Date: Sun, 15 Apr 2012 14:00:22 +0200
+Subject: [PATCH] ffmpeg: avfilter depends on avformat
+
+---
+ lib/DllAvFilter.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
+index 5c83654..6ae5d15 100644
+--- a/lib/DllAvFilter.h
++++ b/lib/DllAvFilter.h
+@@ -25,6 +25,7 @@
+ #endif
+ #include "DynamicDll.h"
+ #include "DllAvCodec.h"
++#include "DllAvFormat.h"
+ #include "DllSwResample.h"
+ #include "utils/log.h"
+ 
+@@ -203,6 +204,7 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
+   /* dependencies of libavfilter */
+   DllAvUtil m_dllAvUtil;
+   DllSwResample m_dllSwResample;
++  DllAvFormat m_dllAvFormat;
+ 
+ public:
+   int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name)
+@@ -251,6 +253,8 @@ class DllAvFilter : public DllDynamic, DllAvFilterInterface
+       return false;
+     if (!m_dllSwResample.Load())
+       return false;
++    if (!m_dllAvFormat.Load())
++      return false;
+     return DllDynamic::Load();
+   }
+ };
+-- 
+1.7.10
+

packages/sysutils/bash/config/inputrc

@@ -0,0 +1,66 @@
+# /etc/inputrc - global inputrc for libreadline
+# See readline(3readline) and `info rluserman' for more information.
+
+# Be 8 bit clean.
+set input-meta on
+set output-meta on
+
+# To allow the use of 8bit-characters like the german umlauts, uncomment
+# the line below. However this makes the meta key not work as a meta key,
+# which is annoying to those which don't need to type in 8-bit characters.
+
+# set convert-meta off
+
+# try to enable the application keypad when it is called.  Some systems
+# need this to enable the arrow keys.
+# set enable-keypad on
+
+# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys
+
+# do not bell on tab-completion
+# set bell-style none
+# set bell-style visible
+
+# some defaults / modifications for the emacs mode
+$if mode=emacs
+
+# allow the use of the Home/End keys
+"\e[1~": beginning-of-line
+"\e[4~": end-of-line
+
+# allow the use of the Delete/Insert keys
+"\e[3~": delete-char
+"\e[2~": quoted-insert
+
+# mappings for "page up" and "page down" to step to the beginning/end
+# of the history
+# "\e[5~": beginning-of-history
+# "\e[6~": end-of-history
+
+# alternate mappings for "page up" and "page down" to search the history
+# "\e[5~": history-search-backward
+# "\e[6~": history-search-forward
+
+# mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+"\e[5C": forward-word
+"\e[5D": backward-word
+"\e\e[C": forward-word
+"\e\e[D": backward-word
+
+$if term=rxvt
+"\e[8~": end-of-line
+"\eOc": forward-word
+"\eOd": backward-word
+$endif
+
+# for non RH/Debian xterm, can't hurt for RH/Debian xterm
+# "\eOH": beginning-of-line
+# "\eOF": end-of-line
+
+# for freebsd console
+# "\e[H": beginning-of-line
+# "\e[F": end-of-line
+
+$endif

packages/sysutils/bash/install

@@ -25,3 +25,6 @@
 mkdir -p $INSTALL/bin
   cp $PKG_BUILD/bash $INSTALL/bin
   ln -sf bash $INSTALL/bin/sh
+
+mkdir -p $INSTALL/etc
+  cp $PKG_DIR/config/inputrc $INSTALL/etc