Ices durch Icegenerator ersetzt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@833 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/packages/icegenerator b/config/rootfiles/packages/icegenerator
new file mode 100644 (file)
index 0000000..940c829
--- /dev/null
+++ b/config/rootfiles/packages/icegenerator
@@ -0,0 +1 @@
+usr/local/bin/icegenerator

diff --git a/config/rootfiles/packages/ices b/config/rootfiles/packages/ices
deleted file mode 100644 (file)
index 35d6911..0000000
--- a/config/rootfiles/packages/ices
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin/ices
-#usr/share/ices
-usr/share/ices/basic.html
-usr/share/ices/config.html
-usr/share/ices/faq.html
-usr/share/ices/ices-alsa.xml
-usr/share/ices/ices-oss.xml
-usr/share/ices/ices-playlist.xml
-usr/share/ices/index.html
-usr/share/ices/inputs.html
-usr/share/ices/intro.html
-usr/share/ices/style.css

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 38cf2d85a70e836aea70a678f053a5b6c1ae7428..97b55a5a56f9a5e7814d4ab16580f18b58f0e6b3 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -108,6 +108,7 @@
 * hwdata
 * iana-etc-2.10
 * icecast-2.3.1
+* icegenerator-0.5.5-pre2
 * ices-0.4
 * ices-2.0.1
 * iftop-0.17

diff --git a/lfs/ices b/lfs/icegenerator
similarity index 94%
rename from lfs/ices
rename to lfs/icegenerator
index b7011696d340702fcf259e427d8fe89c310e9816..5443f2d003d920b8a169e855d1f931129fe68d56 100644 (file)
--- a/lfs/ices
+++ b/lfs/icegenerator
@@ -26,9 +26,9 @@
 
 include Config
 
-VER        = 0.4
+VER        = 0.5.5-pre2
 
-THISAPP    = ices-$(VER)
+THISAPP    = icegenerator-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d31450c4011561dae0229f071cb41cb6
+$(DL_FILE)_MD5 = 71515d79bc43ca53baffc96c4ada946a
 
 install : $(TARGET)
 
@@ -81,8 +81,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && ./configure --prefix=/usr --with-id3
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 4d92e8d50e4bf5deac63b1a3a9a87c1dae44fd46..f7be997a1244b195015d5aa809ce0d4ffd940d1d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -492,7 +492,7 @@ buildipfire() {
   ipfiremake sox
   ipfiremake libshout
   ipfiremake icecast
-  ipfiremake ices
+  ipfiremake icegenerator
   ipfiremake mp3blaster
   ipfiremake libpri
   ipfiremake stund