From: Maniacikarus <maniacikarus@ipfire.org>
Date: Thu, 2 Oct 2008 20:48:43 +0000 (+0200)
Subject: Upgraded vdr softdevice to lastest official release
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=a58a3090e2a3a18feebc3700bc3a364885633d48

Upgraded vdr softdevice to lastest official release
---

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 643e6d41e..8dca3922f 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -257,7 +257,7 @@
 * rssdler-0.4.0a
 * rsync-2.6.9
 * rtorrent-0.7.9
-* samba-3.0.32
+* samba-3.2.4
 * sane-1.0.19
 * sane-1.0.19-kmod
 * screen-4.0.3
diff --git a/lfs/vdr b/lfs/vdr
index ec68d2bfe..f7197e63c 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -28,14 +28,14 @@ VER        = 1.6.0
 THISAPP    = vdr-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FILE1   = vdr-streamdev-20080325-http-0_4.tgz
-DL_FILE2   = vdr-softdevice-cvs-2008-04-16.tar.bz2
+DL_FILE2   = vdr-softdevice-0.5.0.tgz
 DL_FILE3   = vidix-1.0.0.tar.bz2
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "freefont fontconfig"
 
@@ -52,7 +52,7 @@ $(DL_FILE3) = $(DL_FROM)/$(DL_FILE3)
 
 $(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0
 $(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720
-$(DL_FILE2)_MD5 = 2b2eec38a653c205967849efb907b707
+$(DL_FILE2)_MD5 = e106876497db478f3b9ba4da0e5532f8
 $(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b
 
 
@@ -89,8 +89,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1)
 	cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev
-	cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE2)
-	cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-cvs-2008-04-16 softdevice
+	cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE2)
+	cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-0.5.0 softdevice
 	cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure
 	cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3)
 	cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix
diff --git a/lfs/vdr_softdevice b/lfs/vdr_softdevice
index 817599f74..3336d6874 100644
--- a/lfs/vdr_softdevice
+++ b/lfs/vdr_softdevice
@@ -29,7 +29,7 @@ VER        = plugin
 THISAPP    = vdr_softdevice-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = vdr_softdevice
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "vdr ffmpeg sdl alsa dfb++"
 
diff --git a/make.sh b/make.sh
index d6e235a7b..1dce1ecb0 100755
--- a/make.sh
+++ b/make.sh
@@ -177,7 +177,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j8"
+    MAKETUNING="-j6"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD