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

2025-07-24 11:16:51 +00:00 · 2013-02-13 18:14:15 +01:00 · 2013-02-13 18:14:15 +01:00 · a346645a0d
commit a346645a0d
parent b595704d97 6eb8ce874b
7 changed files with 15 additions and 35 deletions
--- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch
+++ b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.2-use-our-strip.patch
@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index d41acd1..58faab1 100644
+--- a/Makefile
+++ b/Makefile
+@@ -5,9 +5,6 @@
+ # Debugging on/off 
+ #IPTV_DEBUG = 1
+ 
+-# Strip debug symbols?  Set eg. to /bin/true if not
+-STRIP = strip
+-
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@ -33,10 +33,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
  cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
  cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
  echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
-  cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
  cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch

 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
  cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins
@ -56,10 +53,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/vdr-sc-*/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/vdr-plugin-streamdev-*/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $BUILD/vdr-live-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/rotorng-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
  cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

 #  ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2"
@ -80,8 +75,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/libzip-[0-9]*/lib/.libs/libzip*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/libxslt-[0-9]*/libxslt/.libs/libxslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
  cp -P $BUILD/libxslt-[0-9]*/libexslt/.libs/libexslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@ -10,12 +10,8 @@
    <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
    <setting id="ENABLE_STREAMDEV_SERVER" value="false" />
    <setting id="ENABLE_WIRBELSCAN" value="true" />
-    <setting id="ENABLE_LIVE" value="false" />
-    <setting id="LIVE_IP" value="0.0.0.0" />
-    <setting id="LIVE_PORT" value="8008" />
    <setting id="ENABLE_CONTROL" value="false" />
    <setting id="CONTROL_PORT" value="2002" />
    <setting id="ENABLE_ROTORNG" value="false" />
-    <setting id="ENABLE_EPGSEARCH" value="false" />
    <setting id="SOFTCAM_PLUGIN" value="sc" />
 </settings>
--- a/packages/addons/service/multimedia/vdr-addon/meta
+++ b/packages/addons/service/multimedia/vdr-addon/meta
@ -27,7 +27,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev rotorng vdr-control vdr-plugin-xmltv2vdr"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@ -68,18 +68,12 @@ fi
 if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
 fi
-if [ "$ENABLE_LIVE" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
-fi
 if [ "$ENABLE_ROTORNG" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P rotorng"
 fi
 if [ "$ENABLE_CONTROL" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
 fi
-if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P epgsearch"
-fi
 if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
  VDR_ARG="$VDR_ARG -P xmltv2vdr"
 fi
@ -101,15 +95,6 @@ fi
      cp $config $ADDON_CONFIG_DIR/$config
    fi
  done
-
-  if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then
-    sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf
-    sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
-  fi
-  cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
-epgsearch.SVDRPPort = 2004
-MYDATA
-
 )

 if [ ! "$(pidof vdr.bin)" ];then
--- 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
@ -15,13 +15,9 @@
 	<string id="1035">Enable plugin: dynamite</string>
 	<string id="1036">Enable softcam</string>
 	<string id="1037">softcam plugin</string>
-	<string id="1038">Enable plugin: live</string>
-	<string id="1039">live: listen on ip</string>
-	<string id="1040">live: listen on port</string>
 	<string id="1041">Enable plugin: rotorng</string>
 	<string id="1042">Enable plugin: control</string>
 	<string id="1043">control: listen on port</string>
-	<string id="1044">Enable plugin: epgsearch</string>
 	<string id="1045">Enable plugin: xmltv2vdr</string>
 	<string id="1046">Enable epgdata.com</string>
 	<string id="1047">epgdata.com PIN</string>
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@ -20,13 +20,9 @@
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
 		<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
-		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
-		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" enable="!eq(-1,false)" default="0.0.0.0"/>
-		<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>
 		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
 		<setting id="CONTROL_PORT" type="number" label="1043" values="" enable="!eq(-1,false)"  default="2002"/>
 		<setting id="ENABLE_ROTORNG" type="bool" label="1041" default="false" />
-		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting id="ENABLE_EPGDATA" type="bool" label="1046" default="false" />
 		<setting id="EPGDATA_PIN" type="number" label="1047" values="" enable="!eq(-1,false)"  default="1234"/>