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

2026-03-31 14:41:55 -07:00 · 2013-05-03 17:57:19 +02:00
parent a4cc1a4d1f 72c281d4bb
commit 4a2290ac44
20 changed files with 207 additions and 142 deletions
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -3,6 +3,7 @@
 - cleanup epgsources handling
 - * support for multiple epgsources
 - * support user defined epgsources
+- fixed epgsearch plugin not working without streamdev-server

 3.0.6
 - fix startup error in vnsiserver / 32bit
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -62,7 +62,15 @@ done
 . /var/config/vdr.conf.default
 . /var/config/vdr.conf

-VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
+VDR_ARG="-g /tmp --no-kbd --log=3"
+SVDRP_PORT=0
+
+# epgsearch needs svdrp
+if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
+  SVDRP_PORT=6419
+fi
+VDR_ARG="$VDR_ARG --port=$SVDRP_PORT"
+
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --resdir=$ADDON_DIR/res"
 VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
@@ -125,7 +133,7 @@ fi
    sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
  fi
  cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
-epgsearch.SVDRPPort = 2004
+epgsearch.SVDRPPort = 6419
 MYDATA

 )
--- a/packages/linux-drivers/linux-tbs-drivers/build
+++ b/packages/linux-drivers/linux-tbs-drivers/build
@@ -30,7 +30,13 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers
 LDFLAGS="" make DIR=$(kernel_path) prepare
 sed -i -e "s|^CONFIG_IR_LIRC_CODEC=.*$|# CONFIG_IR_LIRC_CODEC is not set|" v4l/.config

-# linux 3.9 temp build fix
-sed -i -e "s|^CONFIG_VIDEO_PVRUSB2=.*$|# CONFIG_VIDEO_PVRUSB2 is not set|" v4l/.config
+find . -iname *.c | xargs sed -i -e "s|__devinit||"
+find . -iname *.h | xargs sed -i -e "s|__devinit||"
+find . -iname *.c | xargs sed -i -e "s|__devexit||"
+find . -iname *.h | xargs sed -i -e "s|__devexit||"
+
+for cfg in CONFIG_VIDEO_SH_MOBILE_CEU CONFIG_VIDEO_SH_MOBILE_CSI2 ; do
+  sed -i -e "s|^$cfg=.*$|# $cfg is not set|" v4l/.config
+done

 LDFLAGS="" make DIR=$(kernel_path)
--- a/packages/linux-drivers/linux-tbs-drivers/meta
+++ b/packages/linux-drivers/linux-tbs-drivers/meta
@@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="linux-tbs-drivers"
-PKG_VERSION="130318"
+PKG_VERSION="130429"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/linux/patches/3.9/linux-210-dvbsky.patch.todo
+++ b/packages/linux/patches/3.9/linux-210-dvbsky.patch.todo
--- a/packages/toolchain/devel/eglibc/install
+++ b/packages/toolchain/devel/eglibc/install
@@ -44,7 +44,7 @@ mkdir -p $INSTALL/usr/lib
  cp $PKG_BUILD/objdir-$1/login/libutil.so.1 $INSTALL/usr/lib # e.g. for utmp support, needed by PAM_filter


-  [ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/objdir-$1/nptl_db/libthread_db.so.1 $INSTALL/lib # for GDB
+  [ "$DEVTOOLS" = yes ] && cp $PKG_BUILD/objdir-$1/nptl_db/libthread_db.so.1 $INSTALL/usr/lib # for GDB

 mkdir -p $INSTALL/usr/bin
  cp $PKG_BUILD/objdir-$1/elf/ldd $INSTALL/usr/bin
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@@ -2003,6 +2003,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2149,6 +2150,8 @@ CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1911,6 +1911,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2053,6 +2054,8 @@ CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -2130,6 +2130,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2349,6 +2350,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -2086,6 +2086,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2305,6 +2306,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2212,6 +2212,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2432,6 +2433,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -2171,6 +2171,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2391,6 +2392,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -2210,6 +2210,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2430,6 +2431,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -2138,6 +2138,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2358,6 +2359,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -2076,6 +2076,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2296,6 +2297,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -2156,6 +2156,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2376,6 +2377,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -2095,6 +2095,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2315,6 +2316,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -1989,6 +1989,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2131,6 +2132,8 @@ CONFIG_DVB_TUNER_ITD1000=m
 CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -2212,6 +2212,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2432,6 +2433,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -2171,6 +2171,7 @@ CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
 # CONFIG_DVB_USB_MXL111SF is not set
 CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
 # CONFIG_DVB_TTUSB_BUDGET is not set
 # CONFIG_DVB_TTUSB_DEC is not set
 CONFIG_SMS_USB_DRV=m
@@ -2391,6 +2392,8 @@ CONFIG_DVB_TUNER_CX24113=m
 CONFIG_DVB_TDA826X=m
 CONFIG_DVB_TUA6100=m
 CONFIG_DVB_CX24116=m
+CONFIG_DVB_M88DS3103=m
+CONFIG_DVB_M88DC2800=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_TS2020=m
 CONFIG_DVB_DS3000=m