Geändert:

* Bootsplash-Software-Update.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@198 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-07-06 10:24:53 +00:00
parent 84cab47359
commit 44ed6f8962
4 changed files with 36 additions and 14 deletions

View File

@@ -44,6 +44,7 @@
* binutils-2.15.90.0.3
* bison-1.875
* bootsplash-3.0.7
* bootsplash-3.2
* bridge-utils-1.1
* busybox-0.60.5
* bzip2-1.0.3

View File

@@ -26,7 +26,7 @@
include Config
VER = 3.0.7
VER = 3.2
THISAPP = bootsplash-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d7c7cdab692fb2edc5cf5ebb554f20a1
$(DL_FILE)_MD5 = b74c104372fd182d0442b3ed63210e29
install : $(TARGET)
@@ -72,16 +72,13 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/Utilities && patch -Np0 < /usr/src/src/patches/bootsplash-3.0.7-include-fix.patch
cd $(DIR_APP) && patch -Np1 < /usr/src/src/patches/bootsplash-3.2_makefile.patch
cd $(DIR_APP)/Utilities && make
cd $(DIR_APP)/Utilities && cp -f splash /sbin
-mkdir -p /etc/bootsplash/themes/current
cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /etc/bootsplash/themes
-find /etc/bootsplash/themes -name .svn -exec rm -rf {} \;
ln -fs /etc/bootsplash/themes/ipfire1 /etc/bootsplash/themes/current
# Set screens for console... Maybe this doesn't work and has to be done at each boot?!
for i in `seq 0 5`; do \
splash -s -n -u $1 /etc/bootsplash/themes/current/config/bootsplash-1024x768.cfg \
done
cd $(DIR_APP)/Utilities && cp -f splash fbresolution fbmngplay /sbin
cd $(DIR_APP)/Scripts && cp -f bootanim /sbin
cd $(DIR_APP)/Scripts && chmod +x /sbin/bootanim
-mkdir -p /boot/splash
cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /boot/splash
-find /boot/splash -name .svn -exec rm -rf {} \;
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -26580,10 +26580,13 @@ usr/lib/libfreetype.so.6.3.8
#usr/lib/pkgconfig/freetype2.pc
#usr/share/aclocal/freetype2.m4
##
## bootsplash 3.0.7
## bootsplash 3.2
##
sbin/splash
etc/bootsplash
sbin/bootanim
sbin/fbmngplay
sbin/fbresolution
boot/splash
##
## lcms
##

View File

@@ -0,0 +1,21 @@
--- bootsplash-3.2/Utilities/Makefile 2004-09-23 18:28:38.000000000 +0200
+++ bootsplash-3.2/Utilities/Makefile 2005-04-13 14:04:19.000000000 +0200
@@ -22,7 +22,7 @@
LIBSS_FT2 = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
LIBSD_FT2 = -lfreetype -lm
-LIBSS_MNG = $(LIBDIR)/libmng-mini.a $(LIBDIR)/libz.a -lm
+LIBSS_MNG = $(LIBDIR)/libmng.a $(LIBDIR)/libz.a -lm
LIBSD_MNG = -lmng -lz -lm
CFLAGS = -Os -Wall -I/usr/include/freetype2
@@ -40,7 +40,7 @@
-rm -f $(PROGRAMS) $(PROGRAMS_STATIC)
splash: splash.o
- $(LINKD) $(LDFLAGS) splash.o $(LIBDIR)/libmng-mini.a -lz -lm
+ $(LINKD) $(LDFLAGS) splash.o $(LIBDIR)/libmng.a -lz -lm -ljpeg -llcms
fbtruetype: $(OBJECTS_FT2)
@rm -f fbtruetype