fix target & patch of xupnpd

diff --git a/archive-patches/xupnpd/xupnpd_cst.diff b/archive-patches/xupnpd/xupnpd_cst.diff
index a305c476554a58745e8b9406878ef4b8943a4784..c3fb6cd3f314ac7fb61eda0009a251448b162fde 100644 (file)
--- a/archive-patches/xupnpd/xupnpd_cst.diff
+++ b/archive-patches/xupnpd/xupnpd_cst.diff
@@ -1,5 +1,5 @@
---- a/xupnpd.lua       2014-05-01 16:44:16.000000000 +0200
-+++ b/xupnpd.lua       2014-05-01 16:51:30.424628163 +0200
+--- a/xupnpd.lua
++++ b/xupnpd.lua
 @@ -1,13 +1,13 @@
  cfg={}
  
@@ -16,7 +16,7 @@
  
  -- SSDP announcement age
  cfg.ssdp_max_age=1800
-@@ -19,10 +19,10 @@
+@@ -19,10 +19,10 @@ cfg.http_port=4044
  cfg.log_facility='local0'
  
  -- 'cfg.daemon' detach server from terminal
@@ -29,7 +29,7 @@
  
  -- 'cfg.debug' enables SSDP debug output to stdout (if cfg.daemon=false)
  -- 0-off, 1-basic, 2-messages
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ cfg.debug=1
  --cfg.udpxy_url='http://192.168.1.1:4022'
  
  -- downstream interface for builtin multicast proxy (comment 'cfg.udpxy_url' for processing 'udp://@...' playlists)
@@ -38,7 +38,7 @@
  
  -- 'cfg.proxy' enables proxy for injection DLNA headers to stream
  -- 0-off, 1-radio, 2-radio/TV
-@@ -51,16 +51,17 @@
+@@ -51,16 +51,17 @@ cfg.dlna_notify=true
  cfg.dlna_subscribe_ttl=1800
  
  -- group by 'group-title'
@@ -59,23 +59,24 @@
  
  -- max url cache size
  cfg.cache_size=8
-@@ -72,12 +73,14 @@
+@@ -72,12 +73,14 @@ cfg.cache_ttl=900
  cfg.default_mime_type='mpeg'
  
  -- feeds update interval (seconds, 0 - disabled)
 -cfg.feeds_update_interval=0
+-cfg.playlists_update_interval=0
 +cfg.feeds_update_interval=3600
- cfg.playlists_update_interval=0
++cfg.playlists_update_interval=120
  
  -- playlist (m3u file path or path with alias
  playlist=
  {
 +    { '/media/sda1/movies', 'Local Record Files' },
-+    { '/media/sda1/pic', 'Local Picture Files' },
++    { '/media/sda1/pictures', 'Local Picture Files' },
  --    { './playlists/mozhay.m3u', 'Mozhay.tv' },
  --    { './localmedia', 'Local Media Files' }
  --    { './private', 'Private Media Files', '127.0.0.1;192.168.1.1' }  -- only for 127.0.0.1 and 192.168.1.1
-@@ -86,10 +89,10 @@
+@@ -86,10 +89,10 @@ playlist=
  -- feeds list (plugin, feed name, feed type)
  feeds=
  {
@@ -90,22 +91,24 @@
  --    { 'youtube',        'Drift0r',              'Drift0r' },
  --    { 'youtube',        'XboxAhoy',             'XboxAhoy' },
  --    { 'ag',             'videos',               'AG - New' },
-@@ -97,6 +100,8 @@
+@@ -97,6 +100,12 @@ feeds=
  --    { 'gametrailers',   'ps3',                   'GT - PS3' },
  --    { 'giantbomb',      'all',                  'GiantBomb - All' },
  --    { 'dreambox',       'http://192.168.0.1:8001/','Dreambox1' },
-+    { 'coolstream',     'localhost', 'CST' },
++    { 'coolstream',     'localhost',            'CST' },
++    { 'cczwei',         'localhost',            'ComputerClub2' },
++    { 'youtube',        'Netzkino',             'YouTube - Netzkino' },
++    { 'youtube',        'JPPGmbH',              'YouTube - JP Performance' },
++--    { 'youporn',        'top_rated',             'YouPorn' },
 +--    { 'coolstream',       '172.16.1.10', 'CST-Remote' },
  }
  
  -- log ident, pid file end www root
-@@ -107,8 +112,8 @@
- cfg.tmp_path='/tmp/'
+@@ -108,7 +117,7 @@ cfg.tmp_path='/tmp/'
  cfg.plugin_path='./plugins/'
  cfg.config_path='./config/'
--cfg.playlists_path='./playlists/'
+ cfg.playlists_path='./playlists/'
 ---cfg.feeds_path='/tmp/xupnpd-feeds/'
-+cfg.playlists_path='./playlists/'
 +cfg.feeds_path='/tmp/xupnpd-feeds/'
  cfg.ui_path='./ui/'
  cfg.drive=''                    -- reload playlists only if drive state=active/idle, example: cfg.drive='/dev/sda'

diff --git a/make/applications.mk b/make/applications.mk
index 7bc957f943980a8c85bd8fc641984b8ab06e85e6..8979477dfe3565cf0081c9e0091d0ed26f6f9013 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -690,15 +690,15 @@ $(D)/xupnpd: $(ARCHIVE)/xupnpd-git-$(XUPNPD_GIT).tar.gz $(D)/udpxy $(D)/lua $(D)
                        LUAFLAGS="-I$(TARGETPREFIX)/include -L$(TARGETPREFIX)/lib -L$(TARGETPREFIX_BASE)/lib";
                cp -f $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/xupnpd $(TARGETPREFIX)/bin/
                mkdir -p $(TARGETPREFIX)/share/xupnpd/
-               cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_18*.lua $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins/staff
-               cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_cc*.lua $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins/staff
-               cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_co*.lua $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins
-               cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_yo*.lua $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins
+               cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/*.lua $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/playlists $(TARGETPREFIX)/share/xupnpd/
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/plugins $(TARGETPREFIX)/share/xupnpd/
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/profiles $(TARGETPREFIX)/share/xupnpd/
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/www $(TARGETPREFIX)/share/xupnpd/
                cp -rf $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/ui $(TARGETPREFIX)/share/xupnpd/
+               rm -rf $(TARGETPREFIX)/share/xupnpd/playlists/example
+               rm -rf $(TARGETPREFIX)/share/xupnpd/plugins/staff
+               rm -rf $(TARGETPREFIX)/share/xupnpd/xupnpd.lua
                cp -f $(BUILD_TMP)/xupnpd-git-$(XUPNPD_GIT)/src/*.lua $(TARGETPREFIX)/share/xupnpd/
                mv $(TARGETPREFIX)/share/xupnpd/xupnpd.lua $(TARGETPREFIX)/var/tuxbox/config
                ln -sf /var/tuxbox/config/xupnpd.lua $(TARGETPREFIX)/share/xupnpd/xupnpd.lua