From: ms Date: Sun, 2 Jul 2006 11:54:34 +0000 (+0000) Subject: Hinzugefügt: X-Git-Tag: v2.3-beta1~1062 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a7b1824c6c543afe1884dbb62e80ba219bc90fd1 Hinzugefügt: * Libs und Fonts für Bootsplash * Bootsplash-Binaries selber git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@192 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/bootsplash/config/bootsplash-1024x768.cfg b/config/bootsplash/config/bootsplash-1024x768.cfg new file mode 100644 index 0000000000..4a30a3e480 --- /dev/null +++ b/config/bootsplash/config/bootsplash-1024x768.cfg @@ -0,0 +1,48 @@ +# This is the configuration file for the 1024x768 bootsplash picture. +# +# This file is necessary to specify the coordinates of the text box on +# the splash screen. +# +# Comments are welcome by stepan@suse.de + +# config file version +version=3 + +# should the picture be displayed? +state=1 + +# fgcolor is the text forground color. +# bgcolor is the text background (i.e. transparent) color. +fgcolor=7 +bgcolor=0 + +# (tx, ty) are the (x, y) coordinates of the text window in pixels. +# tw/th is the width/height of the text window in pixels. +tx=0 +ty=0 +tw=1024 +th=768 + +# name of the picture file (full path recommended) +jpeg=/etc/bootsplash/themes/Linux/images/bootsplash-1024x768.jpg +silentjpeg=/etc/bootsplash/themes/Linux/images/silent-1024x768.jpg + +progress_enable=1 + +# background +box silent noover 204 666 820 686 #515151 +box silent inter 204 666 204 686 #b77200 #f2b700 #b77200 #f2b700 +box silent 204 666 820 686 #b77200 #f2b700 #b77200 #f2b700 +#box silent inter 204 666 204 686 #f2b700 #b77200 #b77200 #f2b700 +#box silent 204 666 820 686 #f2b700 #b77200 #b77200 #f2b700 + + +# black border +box silent 204 665 820 665 #b5b5b5 +box silent 204 687 820 687 #b5b5b5 +box silent 203 665 203 687 #b5b5b5 +box silent 820 665 820 687 #b5b5b5 + + +overpaintok=1 + diff --git a/config/bootsplash/images/bootsplash-1024x768.jpg b/config/bootsplash/images/bootsplash-1024x768.jpg new file mode 100644 index 0000000000..b091da17a3 Binary files /dev/null and b/config/bootsplash/images/bootsplash-1024x768.jpg differ diff --git a/config/bootsplash/images/silent-1024x768.jpg b/config/bootsplash/images/silent-1024x768.jpg new file mode 100644 index 0000000000..9fe7cf7c7c Binary files /dev/null and b/config/bootsplash/images/silent-1024x768.jpg differ diff --git a/lfs/bootsplash b/lfs/bootsplash new file mode 100644 index 0000000000..17fd83f524 --- /dev/null +++ b/lfs/bootsplash @@ -0,0 +1,82 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.0.7 + +THISAPP = bootsplash-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d7c7cdab692fb2edc5cf5ebb554f20a1 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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)/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/current + -find /etc/bootsplash/themes/current -name .svn -exec rm -rf {} \; + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/freetype b/lfs/freetype new file mode 100644 index 0000000000..25edb8ddd1 --- /dev/null +++ b/lfs/freetype @@ -0,0 +1,80 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.1.10 + +THISAPP = freetype-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 440a4702182a79ac2f51e8974fb742c9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/lcms b/lfs/lcms new file mode 100644 index 0000000000..01bb5012f1 --- /dev/null +++ b/lfs/lcms @@ -0,0 +1,79 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.15 + +THISAPP = lcms-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 76c921973fdea4f880944a024197f924 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(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 + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libmng b/lfs/libmng new file mode 100644 index 0000000000..6a7a1f7ebf --- /dev/null +++ b/lfs/libmng @@ -0,0 +1,82 @@ +############################################################################### +# This file is part of the IPCop Firewall. # +# # +# IPCop is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPCop is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPCop; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Makefiles are based on LFSMake, which is # +# Copyright (C) 2002 Rod Roard # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.9 + +THISAPP = libmng-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ff1205ef70855a75c098ea09690413c6 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && cp makefiles/makefile.linux Makefile && make + cd $(DIR_APP) && make prefix=/usr install + # cd $(DIR_APP) && install -v -m644 doc/man/*.3 /usr/share/man/man3 + # cd $(DIR_APP) && install -v -m644 doc/man/*.5 /usr/share/man/man5 + # cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/libmng-1.0.9 + # cd $(DIR_APP) && install -v -m644 doc/*.{png,txt} /usr/share/doc/libmng-1.0.9 + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index f016842d96..28a7967f25 100644 --- a/lfs/linux +++ b/lfs/linux @@ -187,7 +187,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.4.29_r8169clone.patch # bootsplash - cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/bootsplash-3.0.7-2.4.31-vanilla.diff + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bootsplash-3.0.7-2.4.31-vanilla.diff # Cleanup kernel source cd $(DIR_APP) && make mrproper diff --git a/make.sh b/make.sh index eea54f42cc..b18e02c26b 100644 --- a/make.sh +++ b/make.sh @@ -679,6 +679,10 @@ buildipcop() { ipcopmake java ipcopmake libtiff ipcopmake libjpeg + ipcopmake lcms + ipcopmake libmng + ipcopmake freetype + ipcopmake bootsplash ipcopmake libxml2 ipcopmake spandsp ipcopmake lzo diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index ddb40c87c0..4a8b476d29 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -26481,6 +26481,149 @@ usr/lib/libdb_cxx.so #usr/share/doc/db-4.4.20/utility/db_verify.html #usr/share/doc/db-4.4.20/utility/index.html ## +## freetype 2.1.10 +## +usr/bin/freetype-config +#usr/include/freetype2 +#usr/include/freetype2/freetype +#usr/include/freetype2/freetype/cache +#usr/include/freetype2/freetype/cache/ftccache.h +#usr/include/freetype2/freetype/cache/ftccmap.h +#usr/include/freetype2/freetype/cache/ftcglyph.h +#usr/include/freetype2/freetype/cache/ftcimage.h +#usr/include/freetype2/freetype/cache/ftcmanag.h +#usr/include/freetype2/freetype/cache/ftcmru.h +#usr/include/freetype2/freetype/cache/ftcsbits.h +#usr/include/freetype2/freetype/config +#usr/include/freetype2/freetype/config/ftconfig.h +#usr/include/freetype2/freetype/config/ftheader.h +#usr/include/freetype2/freetype/config/ftmodule.h +#usr/include/freetype2/freetype/config/ftoption.h +#usr/include/freetype2/freetype/config/ftstdlib.h +#usr/include/freetype2/freetype/freetype.h +#usr/include/freetype2/freetype/ftbbox.h +#usr/include/freetype2/freetype/ftbdf.h +#usr/include/freetype2/freetype/ftbitmap.h +#usr/include/freetype2/freetype/ftcache.h +#usr/include/freetype2/freetype/ftchapters.h +#usr/include/freetype2/freetype/fterrdef.h +#usr/include/freetype2/freetype/fterrors.h +#usr/include/freetype2/freetype/ftglyph.h +#usr/include/freetype2/freetype/ftgzip.h +#usr/include/freetype2/freetype/ftimage.h +#usr/include/freetype2/freetype/ftincrem.h +#usr/include/freetype2/freetype/ftlist.h +#usr/include/freetype2/freetype/ftlzw.h +#usr/include/freetype2/freetype/ftmac.h +#usr/include/freetype2/freetype/ftmm.h +#usr/include/freetype2/freetype/ftmodapi.h +#usr/include/freetype2/freetype/ftmoderr.h +#usr/include/freetype2/freetype/ftotval.h +#usr/include/freetype2/freetype/ftoutln.h +#usr/include/freetype2/freetype/ftpfr.h +#usr/include/freetype2/freetype/ftrender.h +#usr/include/freetype2/freetype/ftsizes.h +#usr/include/freetype2/freetype/ftsnames.h +#usr/include/freetype2/freetype/ftstroke.h +#usr/include/freetype2/freetype/ftsynth.h +#usr/include/freetype2/freetype/ftsysio.h +#usr/include/freetype2/freetype/ftsysmem.h +#usr/include/freetype2/freetype/ftsystem.h +#usr/include/freetype2/freetype/fttrigon.h +#usr/include/freetype2/freetype/fttypes.h +#usr/include/freetype2/freetype/ftwinfnt.h +#usr/include/freetype2/freetype/ftxf86.h +#usr/include/freetype2/freetype/internal +#usr/include/freetype2/freetype/internal/autohint.h +#usr/include/freetype2/freetype/internal/ftcalc.h +#usr/include/freetype2/freetype/internal/ftdebug.h +#usr/include/freetype2/freetype/internal/ftdriver.h +#usr/include/freetype2/freetype/internal/ftgloadr.h +#usr/include/freetype2/freetype/internal/ftmemory.h +#usr/include/freetype2/freetype/internal/ftobjs.h +#usr/include/freetype2/freetype/internal/ftrfork.h +#usr/include/freetype2/freetype/internal/ftserv.h +#usr/include/freetype2/freetype/internal/ftstream.h +#usr/include/freetype2/freetype/internal/fttrace.h +#usr/include/freetype2/freetype/internal/ftvalid.h +#usr/include/freetype2/freetype/internal/internal.h +#usr/include/freetype2/freetype/internal/pcftypes.h +#usr/include/freetype2/freetype/internal/psaux.h +#usr/include/freetype2/freetype/internal/pshints.h +#usr/include/freetype2/freetype/internal/sfnt.h +#usr/include/freetype2/freetype/internal/svbdf.h +#usr/include/freetype2/freetype/internal/svgldict.h +#usr/include/freetype2/freetype/internal/svmm.h +#usr/include/freetype2/freetype/internal/svotval.h +#usr/include/freetype2/freetype/internal/svpfr.h +#usr/include/freetype2/freetype/internal/svpostnm.h +#usr/include/freetype2/freetype/internal/svpscmap.h +#usr/include/freetype2/freetype/internal/svpsinfo.h +#usr/include/freetype2/freetype/internal/svsfnt.h +#usr/include/freetype2/freetype/internal/svttcmap.h +#usr/include/freetype2/freetype/internal/svwinfnt.h +#usr/include/freetype2/freetype/internal/svxf86nm.h +#usr/include/freetype2/freetype/internal/t1types.h +#usr/include/freetype2/freetype/internal/tttypes.h +#usr/include/freetype2/freetype/t1tables.h +#usr/include/freetype2/freetype/ttnameid.h +#usr/include/freetype2/freetype/tttables.h +#usr/include/freetype2/freetype/tttags.h +#usr/include/freetype2/freetype/ttunpat.h +#usr/include/ft2build.h +#usr/lib/libfreetype.a +#usr/lib/libfreetype.la +usr/lib/libfreetype.so +usr/lib/libfreetype.so.6 +usr/lib/libfreetype.so.6.3.8 +#usr/lib/pkgconfig/freetype2.pc +#usr/share/aclocal/freetype2.m4 +## +## bootsplash 3.0.7 +## +sbin/splash +#etc/bootsplash +#etc/bootsplash/themes +#etc/bootsplash/themes/current +#etc/bootsplash/themes/current/config +etc/bootsplash/themes/current/config/bootsplash-1024x768.cfg +#etc/bootsplash/themes/current/images +etc/bootsplash/themes/current/images/bootsplash-1024x768.jpg +etc/bootsplash/themes/current/images/silent-1024x768.jpg +## +## lcms +## +usr/bin/icc2ps +usr/bin/icclink +usr/bin/icctrans +usr/bin/jpegicc +usr/bin/tiffdiff +usr/bin/tifficc +usr/bin/wtpt +#usr/include/icc34.h +#usr/include/lcms.h +#usr/lib/liblcms.a +#usr/lib/liblcms.la +usr/lib/liblcms.so +usr/lib/liblcms.so.1 +usr/lib/liblcms.so.1.0.15 +#usr/lib/pkgconfig/lcms.pc +#usr/share/man/man1/icc2ps.1 +#usr/share/man/man1/icclink.1 +#usr/share/man/man1/jpegicc.1 +#usr/share/man/man1/tifficc.1 +#usr/share/man/man1/wtpt.1 +## +## libmng +## +#usr/include/libmng.h +#usr/include/libmng_conf.h +#usr/include/libmng_types.h +#usr/lib/libmng.a +usr/lib/libmng.so +usr/lib/libmng.so.1 +usr/lib/libmng.so.1.1.0.9 +## ## bridge-utils ## usr/include/libbridge.h diff --git a/src/patches/bootsplash-3.0.7-include-fix.patch b/src/patches/bootsplash-3.0.7-include-fix.patch new file mode 100644 index 0000000000..70b52a4cf8 --- /dev/null +++ b/src/patches/bootsplash-3.0.7-include-fix.patch @@ -0,0 +1,11 @@ +--- ttf.c~ 2006-07-02 08:38:10.000000000 +0000 ++++ ttf.c 2006-06-30 21:49:52.533706392 +0000 +@@ -10,6 +10,8 @@ + #include + #include + ++#include ++#include FT_FREETYPE_H + #include + #include + #include