From ae8d9281e69b927539fc62815a2bcc5100be974b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 15 May 2012 23:16:56 +0300 Subject: [PATCH 1/5] linux-tbs-drivers: install modules in updates/tbs --- packages/linux-drivers/linux-tbs-drivers/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-drivers/linux-tbs-drivers/install b/packages/linux-drivers/linux-tbs-drivers/install index 6930354f7b..a28d4b899d 100755 --- a/packages/linux-drivers/linux-tbs-drivers/install +++ b/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/ From b2692af7d1e64858f80f50b631b5da2c5a74c8b5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 15 May 2012 23:18:21 +0300 Subject: [PATCH 2/5] bash: add inputrc --- packages/sysutils/bash/config/inputrc | 66 +++++++++++++++++++++++++++ packages/sysutils/bash/install | 3 ++ 2 files changed, 69 insertions(+) create mode 100644 packages/sysutils/bash/config/inputrc diff --git a/packages/sysutils/bash/config/inputrc b/packages/sysutils/bash/config/inputrc new file mode 100644 index 0000000000..5253889c39 --- /dev/null +++ b/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 diff --git a/packages/sysutils/bash/install b/packages/sysutils/bash/install index 3316266f0d..81ee05ded9 100755 --- a/packages/sysutils/bash/install +++ b/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 From 629d65bb9a83ea0ea5b29c09d4762eae85b11b15 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 15 May 2012 23:49:56 +0300 Subject: [PATCH 3/5] xbmc-*: avfilter depends on avformat --- ...-901.41-avfilter-depends-on-avformat.patch | 41 +++++++++++++++++++ ...-901.41-avfilter-depends-on-avformat.patch | 41 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-901.41-avfilter-depends-on-avformat.patch create mode 100644 packages/mediacenter/xbmc/patches/xbmc-11.0.1-901.41-avfilter-depends-on-avformat.patch diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-901.41-avfilter-depends-on-avformat.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-901.41-avfilter-depends-on-avformat.patch new file mode 100644 index 0000000000..04708b7219 --- /dev/null +++ b/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 +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 + diff --git a/packages/mediacenter/xbmc/patches/xbmc-11.0.1-901.41-avfilter-depends-on-avformat.patch b/packages/mediacenter/xbmc/patches/xbmc-11.0.1-901.41-avfilter-depends-on-avformat.patch new file mode 100644 index 0000000000..04708b7219 --- /dev/null +++ b/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 +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 + From e4b183a384b13339f98edcbbfa1e0e4e026f3836 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 16 May 2012 11:47:17 +0300 Subject: [PATCH 4/5] imlib2: fix build depends --- packages/3rdparty/graphics/imlib2/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/graphics/imlib2/meta b/packages/3rdparty/graphics/imlib2/meta index d2479b4bad..b354c7ebbf 100755 --- a/packages/3rdparty/graphics/imlib2/meta +++ b/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." From d6bd9770468d102bfd067015dfbec1b211f5415e Mon Sep 17 00:00:00 2001 From: Henk Wiedig Date: Wed, 16 May 2012 11:02:15 +0200 Subject: [PATCH 5/5] vdr-addon: make vdr video dir configurable --- .../addons/service/multimedia/vdr-addon/config/settings.xml | 1 + .../addons/service/multimedia/vdr-addon/source/bin/vdr.start | 3 +-- .../vdr-addon/source/resources/language/English/strings.xml | 3 +++ .../multimedia/vdr-addon/source/resources/settings.xml | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 72497ba183..3e4f06fafa 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -1,6 +1,7 @@ + diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index b96d1c2959..3c87b62165 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/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 diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index efb0616f89..63c7a3b21e 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -2,6 +2,7 @@ DVB Plugins + VDR DVB Configuration Unload DVB mudules before suspend Wait for frontend initialization @@ -26,4 +27,6 @@ Enable plugin: xineliboutput xineliboutput: listen on port Enable plugin: text2skin + VDR Configuration + VDR Video Dir 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 be49d43c64..6153ea7578 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -6,6 +6,11 @@ + + + + +