Updated mediatomb to svn2020.

diff --git a/config/rootfiles/packages/mediatomb-disabled b/config/rootfiles/packages/mediatomb
similarity index 99%
rename from config/rootfiles/packages/mediatomb-disabled
rename to config/rootfiles/packages/mediatomb
index f94df6310a584eefe3134d19df955d6ee1a12410..5f08e9152c8216a54fcf240a43edb2a7d2bf868c 100644 (file)
--- a/config/rootfiles/packages/mediatomb-disabled
+++ b/config/rootfiles/packages/mediatomb
@@ -3,6 +3,7 @@ usr/bin/mediatomb
 #usr/share/mediatomb
 #usr/share/mediatomb/js
 usr/share/mediatomb/js/common.js
+usr/share/mediatomb/js/import-dvd.js
 usr/share/mediatomb/js/import.js
 usr/share/mediatomb/js/playlists.js
 usr/share/mediatomb/mappings.xml
@@ -94,9 +95,9 @@ usr/share/mediatomb/web/std_treelook.css
 usr/share/mediatomb/web/top.html
 usr/share/mediatomb/web/topleft.html
 usr/share/mediatomb/web/topright.html
+var/ipfire/backup/addons/includes/mediatomb
 var/ipfire/mediatomb
 #var/ipfire/mediatomb/config.xml
-var/ipfire/backup/addons/includes/mediatomb
 etc/rc.d/init.d/mediatomb
 etc/rc.d/rc0.d/K02mediatomb
 etc/rc.d/rc6.d/K02mediatomb

diff --git a/lfs/mediatomb b/lfs/mediatomb
index 653d31cf461b44fc87cb1f981f6bfa662d393b00..73e5c807e302739d098aae224e2d47c0bfc1e145 100644 (file)
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.11.0
+VER        = svn2020
 
 THISAPP    = mediatomb-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mediatomb
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "sqlite taglib"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 661f08933830d920de21436fe122fb15
+$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874
 
 install : $(TARGET)
 
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index cf085774c55e679fe06ae8284026d2cf0f853f34..2f69a4c921529493af8f9247915f2b61b113300e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -605,7 +605,7 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-#  ipfiremake mediatomb
+  ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin