From 8557cda8bd2cc7491b7926fba266a5be297405f0 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 20 Apr 2006 19:52:45 +0200 Subject: slpashutils: add them and a patch to make it build on amd64 --- media-gfx/splashutils/ChangeLog | 306 +++++++++++++++++++++ media-gfx/splashutils/Manifest | 24 ++ .../files/digest-splashutils-1.1.9.10-r2 | 21 ++ .../files/splashutils-1.1.9.10-linux-2.6.16.diff | 12 + .../files/splashutils-1.1.9.10-ppc-2.6.14.patch | 13 + .../files/splashutils-1.1.9.9-external-klibc.patch | 297 ++++++++++++++++++++ .../splashutils/files/splashutils-depscan.patch | 50 ++++ media-gfx/splashutils/metadata.xml | 8 + .../splashutils/splashutils-1.1.9.10-r2.ebuild | 229 +++++++++++++++ 9 files changed, 960 insertions(+) create mode 100644 media-gfx/splashutils/ChangeLog create mode 100644 media-gfx/splashutils/Manifest create mode 100644 media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r2 create mode 100644 media-gfx/splashutils/files/splashutils-1.1.9.10-linux-2.6.16.diff create mode 100644 media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch create mode 100644 media-gfx/splashutils/files/splashutils-1.1.9.9-external-klibc.patch create mode 100644 media-gfx/splashutils/files/splashutils-depscan.patch create mode 100644 media-gfx/splashutils/metadata.xml create mode 100644 media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog new file mode 100644 index 00000000..a7c9fbb9 --- /dev/null +++ b/media-gfx/splashutils/ChangeLog @@ -0,0 +1,306 @@ +# ChangeLog for media-gfx/splashutils +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.53 2006/03/14 16:42:40 spock Exp $ + + 14 Mar 2006; Michał Januszewski + splashutils-1.1.9.10-r1.ebuild: + Made most of the einfo/ewarn messages conditional. + + 06 Mar 2006; Michał Januszewski + -splashutils-1.1.9.8.ebuild, -splashutils-1.1.9.9.ebuild: + Removed old ebuilds. + +*splashutils-1.1.9.10-r1 (02 Mar 2006) +*splashutils-1.1.9.8-r1 (02 Mar 2006) + + 02 Mar 2006; Roy Marples + +files/splashutils-depscan.patch, +splashutils-1.1.9.8-r1.ebuild, + splashutils-1.1.9.9.ebuild, splashutils-1.1.9.9-r1.ebuild, + +splashutils-1.1.9.10-r1.ebuild: + Support baselayout's depscan --svcdir option instead of nasty variable + hacking. + + 02 Feb 2006; Michał Januszewski + splashutils-1.1.9.8.ebuild, splashutils-1.1.9.9.ebuild, + splashutils-1.1.9.9-r1.ebuild, splashutils-1.1.9.10.ebuild: + Added dependency on app-arch/cpio to all ebuilds (bug #121256). + + 01 Jan 2006; Michał Januszewski + splashutils-1.1.9.8.ebuild, splashutils-1.1.9.9.ebuild, + splashutils-1.1.9.9-r1.ebuild, splashutils-1.1.9.10.ebuild: + Fixed a typo (bug #117330). + + 20 Nov 2005; Michał Januszewski + +files/splashutils-1.1.9.10-ppc-2.6.14.patch, splashutils-1.1.9.10.ebuild: + Added a patch to allow building splashutils against 2.6.14 on ppc (bug + #112744). + +*splashutils-1.1.9.10 (29 Sep 2005) + + 29 Sep 2005; Michał Januszewski + -splashutils-0.9.1.ebuild, -splashutils-1.1.9.6-r1.ebuild, + -splashutils-1.1.9.7.ebuild, +splashutils-1.1.9.10.ebuild: + Version bump. + + 09 Sep 2005; Michał Januszewski + splashutils-1.1.9.9-r1.ebuild: + Updated zlib to 1.2.3 (requested in bug #104118). + + 08 Sep 2005; Michał Januszewski + splashutils-1.1.9.9-r1.ebuild: + Added a fix for bug #104251 -- try to support gcc built with the 'vanilla' + USE flag. + + 02 Sep 2005; Michael Hanselmann + splashutils-1.1.9.8.ebuild: + Stable on ppc. + + 31 Aug 2005; Luis Medinas + splashutils-1.1.9.8.ebuild: + Marked Stable on AMD64. + +*splashutils-1.1.9.9-r1 (28 Aug 2005) + + 28 Aug 2005; Michał Januszewski + +files/splashutils-1.1.9.9-external-klibc.patch, + splashutils-1.1.9.8.ebuild, +splashutils-1.1.9.9-r1.ebuild: + Updated the splashutils ebuild to build against external klibc. Credits for + the patch go to Martin Schlemmer (bug + #103855). Marked 1.1.9.8 stable on x86. + +*splashutils-1.1.9.9 (21 Aug 2005) + + 21 Aug 2005; Michał Januszewski + +splashutils-1.1.9.9.ebuild: + Version bump. + + 20 Jul 2005; Joseph Jezak splashutils-1.1.9.7.ebuild: + Marked ppc stable for 2.6.12 support. + +*splashutils-1.1.9.8 (18 Jul 2005) + + 18 Jul 2005; Michał Januszewski + +splashutils-1.1.9.8.ebuild: + Version bump. + +*splashutils-1.1.9.7 (09 Jul 2005) + + 09 Jul 2005; Michał Januszewski + +splashutils-1.1.9.7.ebuild: + Version bump -- 1.1.9.7 includes many bugfixes and has support for genkernel + initrds. Changed all KBUILD_OUTPUT references to KV_OUT_DIR in the ebuild. + This should fix compilation problems for people using an external kernel + object directory. + + 08 Jul 2005; Michał Januszewski + -splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild: + Fixed a typo in the ebuild info messages (bug #98375). Removed old ebuild. + + 07 Jul 2005; Herbie Hopkins + splashutils-1.1.9.6-r1.ebuild: + Stable on amd64. + + 06 Jul 2005; Daniel Drake splashutils-1.1.9.6-r1.ebuild: + Stable on x86, required for fbsplash on 2.6.12 + + 23 Jun 2005; Michał Januszewski + splashutils-1.1.9.6-r1.ebuild: + Use KERNEL_DIR instead of /usr/src/linux for the kernel source tree (bug + #96897). + + 23 Jun 2005; Michał Januszewski + splashutils-1.1.9.6.ebuild, splashutils-1.1.9.6-r1.ebuild: + Replaced 'mkdev' with 'mknod' (bug #96725). + + 12 Jun 2005; Michał Januszewski + splashutils-0.9.1.ebuild, splashutils-1.1.9.6.ebuild: + Negate -fstack-protector regardless of the 'hardened' USE flag state (fix + for bug #71193). + + 12 Jun 2005; Michał Januszewski + -splashutils-1.1.9.5.ebuild: + Removed old ebuild. + +*splashutils-1.1.9.6-r1 (12 Jun 2005) + + 12 Jun 2005; Michał Januszewski + +splashutils-1.1.9.6-r1.ebuild: + Added a fix for bug #95657. + + 05 Jun 2005; Michael Hanselmann + splashutils-0.9.1.ebuild: + Stable on ppc. + + 24 May 2005; Herbie Hopkins splashutils-1.1.9.6.ebuild: + fixed multilib issue + +*splashutils-1.1.9.6 (16 May 2005) + + 16 May 2005; Michał Januszewski + -splashutils-1.1.9.3.ebuild, -splashutils-1.1.9.4.ebuild, + +splashutils-1.1.9.6.ebuild: + And another bugfix release, which includes fixes for some remaining issues + spotted in the 1.1.9.x series (bug #90483 comes to mind). The default silent + tty has now been set to tty16 to avoid conflicts with consolefont and + syslog-ng. If you have a 'tty:' setting on your kernel command line, try + removing it in case of any problems. A new utility script, called + splash_manager, is included in this release. The script can be used for + switching, setting, testing and listing themes. It's somewhat experimental + at this stage, so please test it. If you are not sure how the kernel command + line should be set, try using 'splash_manager -c switch -t '. + + 29 Apr 2005; Michał Januszewski + -splashutils-0.9_rc1.ebuild, -splashutils-1.1.9.1.ebuild, + -splashutils-1.1.9.2.ebuild: + Removed old ebuilds. + +*splashutils-1.1.9.5 (29 Apr 2005) + + 29 Apr 2005; Michał Januszewski + +splashutils-1.1.9.5.ebuild: + Yet another bugfix release. Includes fixes for 16bpp modes, and complete or + partial fixes for bugs: #90307, #90331, #90483, #90556. There have also been + some important changes in the ebuild. The sample Gentoo themes have been + removed from this package and are now available in + media-gfx/splash-themes-gentoo. Some additional sanity checks (/dev/tty1 + presence, GCC_SPEC checking) have been added to make it easier to fix common + problems. + + 26 Apr 2005; Michał Januszewski + splashutils-1.1.9.4.ebuild: + Avoid installing the default symlink if it already exists -- fixed bug #90484. + +*splashutils-1.1.9.4 (24 Apr 2005) + + 24 Apr 2005; Michał Januszewski + +splashutils-1.1.9.4.ebuild: + A bugfix release (fixes bugs: #88461, #87113, #85531). It also introduces + support for new USE flags: png, truetype and kdgraphics. The first two of + them should probably be enabled to make sure all themes work correctly. + kdgraphics is a local USE flag which changes the way the silent splash image + is displayed. Please read the description in use.local.desc before enabling + it, as it has the potential to break things and it should probably be kept + disabled in all common situations. + +*splashutils-1.1.9.3 (28 Mar 2005) + + 28 Mar 2005; Michał Januszewski + +splashutils-1.1.9.3.ebuild: + A new release with bugfixes and some simple new features. Please have a look + at the project changelog at my devsite for a full list of changes. + +*splashutils-1.1.9.2 (21 Mar 2005) + + 21 Mar 2005; Michał Januszewski + +splashutils-1.1.9.2.ebuild: + Version bump. Mostly bugfixes. Please have a look at the project homepage + for a full list of changes. + +*splashutils-1.1.9.1 (09 Mar 2005) + + 09 Mar 2005; Michał Januszewski + +splashutils-1.1.9.1.ebuild: + Added a development version of splashutils. + + 08 Mar 2005; Michał Januszewski + splashutils-0.9.1.ebuild, -splashutils-0.9_pre09.ebuild, + -splashutils-0.9_pre10.ebuild, splashutils-0.9_rc1.ebuild: + Removed old ebuilds. Updated the remaining ebuilds to work with KBUILD_OUTPUT. + + 07 Mar 2005; Chris Gianelloni + splashutils-0.9.1.ebuild: + Marking stable on amd64 so we have the right version on the LiveCD... bad + spock... + + 01 Mar 2005; Michał Januszewski + splashutils-0.9.1.ebuild: + Marked stable on x86. + + 11 Feb 2005; Michał Januszewski + splashutils-0.9.1.ebuild, splashutils-0.9_pre09.ebuild, + splashutils-0.9_pre10.ebuild, splashutils-0.9_rc1.ebuild: + Added version deps as a fix for bug #81608. + +*splashutils-0.9.1 (27 Jan 2005) + + 27 Jan 2005; Michał Januszewski + +splashutils-0.9.1.ebuild, -splashutils-0.9_pre07.ebuild, + -splashutils-0.9_pre08.ebuild: + Added a new version of splashutils with some amazing new features and + bugfixes which I'm too lazy to list here ;) Removed old ebuilds. + + 16 Jan 2005; Michal Januszewski + splashutils-0.9_rc1.ebuild: + Added hardened compilation fixes from bug #71193. + + 12 Jan 2005; Michal Januszewski + splashutils-0.9_rc1.ebuild: + Marked stable on x86. + + 04 Jan 2005; Michael Hanselmann + splashutils-0.9_rc1.ebuild: + Added to ~ppc, bug 76637. + +*splashutils-0.9_rc1 (12 Nov 2004) + + 12 Nov 2004; Michal Januszewski + +splashutils-0.9_rc1.ebuild: + A new bugfix release. Closes #68853 and #70029. Fixes some theme issues + (wrong images for 8bpp, wrong box coordinates for the gentoo theme). + + 20 Oct 2004; Michal Januszewski + splashutils-0.9_pre10.ebuild: + Marked splashutils stable on x86 and amd64. Changed baselayout dep. to >= + 1.9.4-r5. + + 13 Oct 2004; Michal Januszewski + splashutils-0.9_pre07.ebuild, splashutils-0.9_pre08.ebuild, + splashutils-0.9_pre09.ebuild, splashutils-0.9_pre10.ebuild: + Added a dep on virtual/linux-sources. + + 01 Oct 2004; Michal Januszewski + splashutils-0.9_pre10.ebuild: + Added a little fix (removed dependency on unistd.h for syscalls.nrs) which + should make splashutils compile with older kernels. + +*splashutils-0.9_pre10 (27 Sep 2004) + + 27 Sep 2004; Michal Januszewski + +splashutils-0.9_pre10.ebuild: + Splashutils update. Includes small bugfixes, klibc and libpng updates, and + 2.6.9-rc2 compatibility. Closes bug #64068. + + 08 Sep 2004; Michal Januszewski + splashutils-0.9_pre09.ebuild: + Updated the klibc version (bug #63170). Marked ~amd64. + +*splashutils-0.9_pre09 (07 Sep 2004) + + 07 Sep 2004; Michal Januszewski + +splashutils-0.9_pre09.ebuild: + Splashutils update, includes fixes for amd64 and dithering for 15/16bpp modes. + Special thanks to Christian Roessner for his help with making it work on + amd64. + +*splashutils-0.9_pre08 (05 Sep 2004) + + 05 Sep 2004; Michal Januszewski + +splashutils-0.9_pre08.ebuild: + Version bump. Added a new theme 'gentoo' and fixed the 'emergence' theme. For + a full ChangeLog for splashutils check http://dev.gentoo.org/~spock/. Closes + bugs #61341, #61478, #61960 and possibly #61678. + + 30 Aug 2004; Michal Januszewski + splashutils-0.9_pre07.ebuild: + Updated the ebuild to display info about 'make prepare', not try to execute it. + + 22 Aug 2004; Michal Januszewski + splashutils-0.9_pre07.ebuild: + Added a fix for 8bpp silent images for the emergence theme. + +*splashutils-0.9_pre07 (21 Aug 2004) + + 21 Aug 2004; Michal Januszewski +metadata.xml, + +splashutils-0.9_pre07.ebuild: + Intial commit. + diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest new file mode 100644 index 00000000..9c1d22ed --- /dev/null +++ b/media-gfx/splashutils/Manifest @@ -0,0 +1,24 @@ +MD5 df47619f1d3505c4593906da84775dd9 ChangeLog 11735 +RMD160 9a10b29b270552a7f2bf8cd67b5c98942f98acf8 ChangeLog 11735 +SHA256 5f5489b46ea15698a77b08232a5cac90b774a9dc7e220391a8f911b59eef03d5 ChangeLog 11735 +MD5 35cc14c0e9021cf2b900e89588015f07 files/digest-splashutils-1.1.9.10-r2 1774 +RMD160 12af3f46f7d493c35d5411de6ef76478b4d34145 files/digest-splashutils-1.1.9.10-r2 1774 +SHA256 ae313288aa756133eb20f3c3f738003bcdf7176636cabd47918916dae8fbd036 files/digest-splashutils-1.1.9.10-r2 1774 +MD5 1288e7df14cc31b5a1c605f4f7a4bd52 files/splashutils-1.1.9.10-linux-2.6.16.diff 456 +RMD160 9b725213bde5fe42b61b68017c8852c06d40bbce files/splashutils-1.1.9.10-linux-2.6.16.diff 456 +SHA256 78074765fa90460b3c0c8e8bdf390d261ece23bcd93bff881d39b2fd42580866 files/splashutils-1.1.9.10-linux-2.6.16.diff 456 +MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 +RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 +SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749 +MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294 +RMD160 5fc49641fddfd9fae387c7b7d994110f506f71cf files/splashutils-1.1.9.9-external-klibc.patch 10294 +SHA256 112dab3f2d432949d3110ebb9475b1405171ab196062be6f7dd244815e64f75b files/splashutils-1.1.9.9-external-klibc.patch 10294 +MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197 +RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197 +SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9 files/splashutils-depscan.patch 2197 +MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220 +RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220 +SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d metadata.xml 220 +MD5 2086b91bb5f72055ac5db7f415e6c32d splashutils-1.1.9.10-r2.ebuild 6807 +RMD160 6ad1512792868de3e537596713272abb460b2a59 splashutils-1.1.9.10-r2.ebuild 6807 +SHA256 688c946cb363fb8aa84e476cbb904fa316f55ab91545b17188957e9b07be9357 splashutils-1.1.9.10-r2.ebuild 6807 diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r2 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r2 new file mode 100644 index 00000000..32c19a60 --- /dev/null +++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10-r2 @@ -0,0 +1,21 @@ +MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394 +RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 freetype-2.1.9.tar.bz2 992394 +SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f freetype-2.1.9.tar.bz2 992394 +MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261 +RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 jpegsrc.v6b.tar.gz 613261 +SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d jpegsrc.v6b.tar.gz 613261 +MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970 +RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970 +SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970 +MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825 +RMD160 47516ec50225ef18fd42e36d58e90e57bfc0dbac miscsplashutils-0.1.3.tar.bz2 91825 +SHA256 16fcb4d199e071a822d744bbd9238609a2175d512fc1c019018c05501cb23bdb miscsplashutils-0.1.3.tar.bz2 91825 +MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750 +RMD160 680efa24119dcf699f37a9f295e3f81faebbdc18 splashutils-gentoo-0.1.14.tar.bz2 7750 +SHA256 2515416c98bcf8e4e0d217cafc74b507295cb03d915d78b224683577159ae9dc splashutils-gentoo-0.1.14.tar.bz2 7750 +MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094 +RMD160 274cfc9a79b69091b0feba8f6d64e3eb965dfb9a splashutils-lite-1.1.9.10.tar.bz2 55094 +SHA256 de38e284103ed569360caf5d555d784309afea7625bad7acd689399d26c3955c splashutils-lite-1.1.9.10.tar.bz2 55094 +MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209 +RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 zlib-1.2.3.tar.bz2 425209 +SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca zlib-1.2.3.tar.bz2 425209 diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-linux-2.6.16.diff b/media-gfx/splashutils/files/splashutils-1.1.9.10-linux-2.6.16.diff new file mode 100644 index 00000000..859396ec --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-linux-2.6.16.diff @@ -0,0 +1,12 @@ +diff -urNp splashutils-1.1.9.10/daemon.c splashutils-1.1.9.10.new/daemon.c +--- splashutils-1.1.9.10/daemon.c 2005-09-29 02:40:24.000000000 +0300 ++++ splashutils-1.1.9.10.new/daemon.c 2006-03-21 00:46:05.000000000 +0200 +@@ -24,6 +24,8 @@ + #include + #include + #include ++#define BITS_PER_LONG (sizeof (long)*8) ++typedef unsigned long kernel_ulong_t; + #include + #include + #include diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch new file mode 100644 index 00000000..d1647e11 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch @@ -0,0 +1,13 @@ +Index: splashutils-1.1.9.10/Makefile +=================================================================== +--- splashutils-1.1.9.10.orig/Makefile ++++ splashutils-1.1.9.10/Makefile +@@ -48,7 +48,7 @@ ROOT = $(shell pwd) + + # flags for the kernel utils + K_CFLAGS = -w -ffunction-sections -fdata-sections $(MISCINCS) \ +- -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 \ ++ -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 -I$(ROOT)/linux/arch/$(ARCH)/include \ + -DWITH_ERRLIST -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER + + PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \ diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.9-external-klibc.patch b/media-gfx/splashutils/files/splashutils-1.1.9.9-external-klibc.patch new file mode 100644 index 00000000..3f1bf579 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.1.9.9-external-klibc.patch @@ -0,0 +1,297 @@ +diff -urpN splashutils-1.1.9.9/Makefile splashutils-1.1.9.9.klibc/Makefile +--- splashutils-1.1.9.9/Makefile 2005-08-26 19:43:45.000000000 +0200 ++++ splashutils-1.1.9.9.klibc/Makefile 2005-08-26 22:47:40.000000000 +0200 +@@ -12,11 +12,13 @@ DEBUG = false # set to true to preven + K_SHARED = false # set to true if you want to link to a shared klibc + QUIET = true + ++CC = gcc ++KLCC = klcc ++ + JPEGSRC ?= libs/jpeg-6b + LPNGSRC ?= libs/libpng-1.2.8 + ZLIBSRC ?= libs/zlib-1.2.1 + FT2SRC ?= libs/freetype-2.1.9 +-LIBCSRC ?= libs/klibc-1.0.8/klibc + + prefix = + sbindir = ${prefix}/sbin +@@ -29,38 +31,25 @@ INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROG} + + ifeq ($(strip $(K_SHARED)),true) +- LIBC = $(LIBCSRC)/libc.so +- CRT0 = $(LIBCSRC)/interp.o +- K_LDFLAGS = ++ K_LDFLAGS = -shared + else +- LIBC = $(LIBCSRC)/libc.a +- CRT0 = $(LIBCSRC)/crt0.o +- K_LDFLAGS = --gc-sections ++ K_LDFLAGS = -static + endif + + ifeq ($(strip $(QUIET)),true) ++ Q = @ + OUTPUT = /dev/null + else ++ Q = + OUTPUT = /dev/stdout + endif + +-LIBGCC = $(shell $(CC) --print-libgcc) + ROOT = $(shell pwd) +-ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) +- +-include $(LIBCSRC)/arch/$(ARCH)/MCONFIG + + # flags for the kernel utils +-K_CFLAGS = -w $(shell grep REQFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \ +- $(shell grep OPTFLAGS $(LIBCSRC)/../klibc.config | cut -d= -f2-) \ +- -I${ROOT}/$(LIBCSRC)/../include/arch/$(ARCH) \ +- -I${ROOT}/$(LIBCSRC)/../include/bits$(BITSIZE) \ +- -I${ROOT}/$(LIBCSRC)/../include \ +- -I${ROOT}/linux/include \ +- -I${ROOT}/linux/include2 \ +- $(MISCINCS) \ +- -DWITH_ERRLIST -I${ROOT}/$(ZLIBSRC) -I${ROOT}/$(FT2SRC)/include -I/usr/include -ffunction-sections \ +- -fdata-sections -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER ++K_CFLAGS = -w -ffunction-sections -fdata-sections $(MISCINCS) \ ++ -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 \ ++ -DWITH_ERRLIST -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER + + PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \ + -DPNG_LEGACY_SUPPORTED -DPNG_NO_PROGRESSIVE_READ -DPNG_NO_MNG_FEATURES -DPNG_NO_CONSOLE_IO \ +@@ -76,7 +65,7 @@ K_DEPS = + CFLAGS = -march=k8 -O2 -pipe -freorder-blocks -fprefetch-loop-arrays -ftracer -falign-functions=4 -fomit-frame-pointer + LDLIBS = -ljpeg -lm + LDFLAGS = +-INCLUDES = -I${ROOT}/linux/include -I/usr/include/freetype2 ++INCLUDES = -I$(ROOT)/linux/include -I/usr/include/freetype2 + OBJS = splash.o parse.o render.o image.o cmd.o common.o daemon.o list.o effects.o + + # checks whether an opton is set in config.h +@@ -112,7 +101,7 @@ endif + + KOUT = kernel + dotg = \e[32;01m*\e[0m +-info = printf " %-7s %s\n" $(1) $(2) ++info = if [ "${QUIET}" == "true" ] ; then printf " %-7s %s\n" $(1) $(2); fi + install_script = $(call info,INSTALL,$(1)) ; $(INSTALL_PROG) -D scripts/$(1) $(DESTDIR)$(usrbindir)/$(1) ; \ + sed -e 's/%PKG_VERSION%/$(PKG_VERSION)/g' -i $(DESTDIR)$(usrbindir)/$(1) + +@@ -131,8 +120,8 @@ splash_user: $(SP_UTIL) + + $(SP_UTIL): $(OBJS) + @$(call info,LD,$@) +- @$(CC) $+ $(LDLIBS) -o $@ +- @$(CC) $+ $(LDLIBS) -static -o $@.static ++ $(Q)$(CC) $+ $(LDLIBS) -o $@ ++ $(Q)$(CC) $+ $(LDLIBS) -static -o $@.static + + linux: + @if [ ! -e "$(ROOT)/linux" ]; then \ +@@ -144,26 +133,16 @@ kdir: + mkdir "$(ROOT)/$(KOUT)" ; \ + fi + +-klibc: linux +- @if [ ! -e linux ]; then \ +- echo "The 'linux' symlink does not exist!" ; \ +- exit 1 ; \ +- fi +- @cd $(LIBCSRC) ; \ +- if ! make -q; then $(call info,MAKE,klibc) ; fi ; \ +- make > $(OUTPUT) +- @cd $(LIBCSRC)/.. ; \ +- make klibc.config > $(OUTPUT) +- + zlib: config.h + @cd $(ZLIBSRC) ; \ + if [ ! -e ./Makefile ]; then \ + $(call info,CONF,zlib) ; \ ++ CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \ + ./configure > $(OUTPUT); \ + sed -i 's#^CFLAGS=\(.*\)#CFLAGS=\1 $(K_CFLAGS)#' Makefile ; \ + fi ; \ +- if ! make -q libz.a; then $(call info,MAKE,zlib) ; fi ; \ +- make libz.a > $(OUTPUT) ++ if ! make -q CC=$(KLCC) libz.a; then $(call info,MAKE,zlib) ; fi ; \ ++ make CC=$(KLCC) libz.a > $(OUTPUT) + + libpng: zlib config.h + @cd $(LPNGSRC) ; \ +@@ -174,76 +153,63 @@ libpng: zlib config.h + -e 's#^ZLIBINC=.*#ZLIBINC=$(ZLIBSRC)#' \ + -e 's#^ZLIBLIB=.*#ZLIBLIB=$(ZLIBSRC)#' Makefile ; \ + fi ; \ +- if ! make -q libpng.a; then $(call info,MAKE,libpng) ; fi ; \ +- make libpng.a > $(OUTPUT) ++ if ! make -q CC=$(KLCC) libpng.a; then $(call info,MAKE,libpng) ; fi ; \ ++ make CC=$(KLCC) libpng.a > $(OUTPUT) + + jpeglib: + @cd $(JPEGSRC) ; \ + if [ ! -e ./Makefile ]; then \ + $(call info,CONF,libjpeg) ; \ ++ CC=$(KLCC) CFLAGS="$(K_CFLAGS)" \ + ./configure > $(OUTPUT) ; \ + echo "#define NO_GETENV 1" >> jconfig.h ; \ + sed -i "s#CFLAGS=.*#CFLAGS=$(K_CFLAGS)#" Makefile ; \ + sed -i "s:#define JMESSAGE.*::" jerror.c ; \ + fi ; \ +- if ! make -q libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \ +- make libjpeg.a > $(OUTPUT) ++ if ! make -q CC=$(KLCC) libjpeg.a; then $(call info,MAKE,libjpeg) ; fi ; \ ++ make CC=$(KLCC) libjpeg.a > $(OUTPUT) + + ft2: config.h + @cd $(FT2SRC) ; \ + if [ ! -e ./config.mk ]; then \ + $(call info,CONF,freetype2) ; \ ++ CC=$(KLCC) CPPFLAGS="-I$(ROOT)/$(ZLIBSRC)" \ ++ CFLAGS="$(K_CFLAGS) -include $(ROOT)/klibc_compat.h" \ + ./configure --disable-shared > $(OUTPUT) ; \ + fi ; \ +- if ! make -q library; then $(call info,MAKE,freetype2) ; fi ; \ ++ if ! make -q CFLAGS="$(K_CFLAGS)" library; then $(call info,MAKE,freetype2) ; fi ; \ + make CFLAGS="-c $(K_CFLAGS)" library > $(OUTPUT) + +-splash_kern: klibc jpeglib kdir $(K_DEPS) $(SP_HELPER) $(LIBC) config.h $(K_LDLIBS) ++splash_kern: jpeglib kdir $(K_DEPS) $(SP_HELPER) config.h $(K_LDLIBS) + + $(SP_HELPER): $(K_OBJS) + @$(call info,LD,$@) +-ifeq ($(strip $(K_SHARED)),true) +- @ld $(K_LDFLAGS) -o $@ -e main $(CRT0) $+ $(K_LDLIBS) -R $(LIBC) $(LIBGCC) +-ifeq ($(strip $(QUIET)),false) +- @echo ld $(K_LDFLAGS) -o $@ -e main $(CRT0) $+ $(K_LDLIBS) -R $(LIBC) $(LIBGCC) +-endif +-else +- @ld $(K_LDFLAGS) -o $@ $(CRT0) $+ $(K_LDLIBS) $(LIBC) $(LIBGCC) +-ifeq ($(strip $(QUIET)),false) +- @echo ld $(K_LDFLAGS) -o $@ $(CRT0) $+ $(K_LDLIBS) $(LIBC) $(LIBGCC) +-endif +-endif +- @$(STRIP) $@ ++ $(Q)$(KLCC) $(K_LDFLAGS) -o $@ $+ $(K_LDLIBS) ++ $(Q)$(STRIP) $@ + + $(KOUT)/%.o: %.c config.h splash.h + @$(call info,CC,$@) +- @$(CC) $(K_CFLAGS) -c -o $@ $< +-ifeq ($(strip $(QUIET)),false) +- @echo $(CC) $(K_CFLAGS) -c -o $@ $< +-endif ++ $(Q)$(KLCC) $(K_CFLAGS) -I/usr/include -c -o $@ $< + + %.o: %.c config.h splash.h + @$(call info,CC,$@) +- @$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $< +-ifeq ($(strip $(QUIET)),false) +- @echo $(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $< +-endif ++ $(Q)$(CC) $(CFLAGS) $(INCLUDES) -DPKG_VERSION=\"$(PKG_VERSION)\" -c -o $@ $< + +-clean: clean_klibc clean_jpg clean_png clean_zlib clean_ft2 clean_splash ++clean: clean_jpg clean_png clean_zlib clean_ft2 clean_splash + + clean_splash: + @$(call info,CLEAN,splash) +- @rm -f *.o +- @rm -f kernel/*.o +- @rm -f splash_helper splash_util splash_util.static +- @rm -f linux ++ $(Q)rm -f *.o ++ $(Q)rm -f kernel/*.o ++ $(Q)rm -f splash_helper splash_util splash_util.static ++ $(Q)rm -f linux + + clean_jpg: + @cd $(JPEGSRC) ; \ + if [ -e Makefile ]; then \ + $(call info,CLEAN,libjpeg) ; \ + make clean > $(OUTPUT) ; \ +- rm Makefile ; \ ++ rm -f Makefile ; \ + fi + + clean_png: +@@ -251,7 +217,7 @@ clean_png: + if [ -e Makefile ]; then \ + $(call info,CLEAN,libpng) ; \ + make clean > $(OUTPUT) ; \ +- rm Makefile ; \ ++ rm -f Makefile ; \ + fi + + clean_zlib: +@@ -259,7 +225,7 @@ clean_zlib: + if [ -e Makefile ]; then \ + $(call info,CLEAN,zlib) ; \ + make clean > $(OUTPUT) ; \ +- rm Makefile ; \ ++ rm -f Makefile ; \ + fi + + clean_ft2: +@@ -267,29 +233,34 @@ clean_ft2: + if [ -e ./config.mk ]; then \ + $(call info,CLEAN,freetype2) ; \ + make clean > $(OUTPUT) ; \ +- rm config.mk ; \ ++ rm -f config.mk ; \ + fi + +-clean_klibc: +- @cd $(LIBCSRC) ; \ +- $(call info,CLEAN,klibc) ; \ +- make clean > $(OUTPUT) 2>/dev/null +- + install: all +- @$(call info,INSTALL,$(SP_HELPER)) ; $(INSTALL_PROG) -D $(SP_HELPER) $(DESTDIR)$(sbindir)/$(SP_HELPER) +- @$(call info,INSTALL,$(SP_UTIL)) ; $(INSTALL_PROG) -D $(SP_UTIL) $(DESTDIR)$(sbindir)/$(SP_UTIL) +- @$(call info,INSTALL,$(SP_UTIL).static) ; $(INSTALL_PROG) -D $(SP_UTIL).static $(DESTDIR)$(sbindir)/$(SP_UTIL).static ++ @$(call info,INSTALL,$(SP_HELPER)) ++ $(Q)$(INSTALL_PROG) -D $(SP_HELPER) $(DESTDIR)$(sbindir)/$(SP_HELPER) ++ @$(call info,INSTALL,$(SP_UTIL)) ++ $(Q)$(INSTALL_PROG) -D $(SP_UTIL) $(DESTDIR)$(sbindir)/$(SP_UTIL) ++ @$(call info,INSTALL,$(SP_UTIL).static) ++ $(Q)$(INSTALL_PROG) -D $(SP_UTIL).static $(DESTDIR)$(sbindir)/$(SP_UTIL).static + @$(call install_script,$(SP_GIRAM)) + @$(call install_script,$(SP_CONV)) + @$(call install_script,$(SP_RESIZE)) + @$(call install_script,$(SP_MNGR)) + + uninstall: +- @$(call info,UNINSTALL,$(SP_HELPER)) ; rm $(sbindir)/$(SP_HELPER) +- @$(call info,UNINSTALL,$(SP_UTIL)) ; rm $(sbindir)/$(SP_UTIL) +- @$(call info,UNINSTALL,$(SP_UTIL).static) ; rm $(sbindir)/$(SP_UTIL).static +- @$(call info,UNINSTALL,$(SP_GIRAM)) ; rm $(usrbindir)/$(SP_GIRAM) +- @$(call info,UNINSTALL,$(SP_CONV)) ; rm $(usrbindir)/$(SP_CONV) +- @$(call info,UNINSTALL,$(SP_RESIZE)) ; rm $(usrbindir)/$(SP_RESIZE) +- @$(call info,UNINSTALL,$(SP_MNGR)) ; rm $(usrbindir)/$(SP_MNGR) ++ @$(call info,UNINSTALL,$(SP_HELPER)) ++ $(Q)rm -f $(sbindir)/$(SP_HELPER) ++ @$(call info,UNINSTALL,$(SP_UTIL)) ++ $(Q)rm -f $(sbindir)/$(SP_UTIL) ++ @$(call info,UNINSTALL,$(SP_UTIL).static) ++ $(Q)rm -f $(sbindir)/$(SP_UTIL).static ++ @$(call info,UNINSTALL,$(SP_GIRAM)) ++ $(Q)rm -f $(usrbindir)/$(SP_GIRAM) ++ @$(call info,UNINSTALL,$(SP_CONV)) ++ $(Q)rm -f $(usrbindir)/$(SP_CONV) ++ @$(call info,UNINSTALL,$(SP_RESIZE)) ++ $(Q)rm -f $(usrbindir)/$(SP_RESIZE) ++ @$(call info,UNINSTALL,$(SP_MNGR)) ++ $(Q)rm -f $(usrbindir)/$(SP_MNGR) + +diff -urpN splashutils-1.1.9.9/klibc_compat.h splashutils-1.1.9.9.klibc/klibc_compat.h +--- splashutils-1.1.9.9/klibc_compat.h 1970-01-01 02:00:00.000000000 +0200 ++++ splashutils-1.1.9.9.klibc/klibc_compat.h 2005-08-26 21:31:42.000000000 +0200 +@@ -0,0 +1,5 @@ ++#ifndef __KLIBC_COMPAT_H__ ++ ++#define ferror(f) 0 ++ ++#endif /* __KLIBC_COMPAT_H__ */ diff --git a/media-gfx/splashutils/files/splashutils-depscan.patch b/media-gfx/splashutils/files/splashutils-depscan.patch new file mode 100644 index 00000000..49e81f5e --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-depscan.patch @@ -0,0 +1,50 @@ +--- splash 2005-07-08 20:14:29.000000000 +0100 ++++ splash 2005-07-08 20:14:29.000000000 +0100 +@@ -15,9 +15,9 @@ + [[ -z ${SPLASH_SHUTDOWN_MESSAGE} ]] && SPLASH_SHUTDOWN_MESSAGE="Shutting down the system (\$progress%)... Press F2 for verbose mode" + [[ -z ${SPLASH_REBOOT_MESSAGE} ]] && SPLASH_REBOOT_MESSAGE="Rebooting the system (\$progress%)... Press F2 for verbose mode" + +-[[ RC_GOT_FUNCTIONS != "yes" ]] && . /sbin/functions.sh +-[[ -f /etc/conf.d/splash ]] && . /etc/conf.d/splash +-[[ -f /etc/conf.d/rc ]] && . /etc/conf.d/rc ++[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source /sbin/functions.sh ++[[ -f $(add_suffix /etc/conf.d/splash) ]] \ ++ && source "$(add_suffix /etc/conf.d/splash)" + [[ ${RUNLEVEL} == "6" || ${RUNLEVEL} == "0" ]] && SHUTDOWN="yes" + + SPLUTIL="/sbin/splash_util.static" +--- splash-functions.sh 2005-07-18 13:48:05.000000000 +0100 ++++ splash-functions.sh 2005-07-18 13:48:05.000000000 +0100 +@@ -26,23 +26,6 @@ + spl_fifo="${spl_cachedir}/.splash" + spl_pidfile="${spl_cachedir}/daemon.pid" + +-# This is a little tricky. We need depscan.sh to create an updated cache for +-# us, and we need it in our place ($spl_cachedir), and not in $svcdir, since the +-# latter might not be writable at this moment. In order to get what we need, +-# we trick depscan.sh into thinking $svcdir is $spl_cachedir. +-# +-# Here is how it works: +-# - $svcdir is defined in /sbin/functions.sh +-# - /sbin/splash-functions.sh is sourced from /sbin/function.sh, after $svcdir +-# is defined +-# - /sbin/functions.sh is sourced from /sbin/depscan.sh +-# +-# $spl_cache_depscan is used to prevent breaking things when /sbin/depscan.sh +-# is not run by us. +-if [[ "$0" == "/sbin/depscan.sh" && "${spl_cache_depscan}" == "yes" ]]; then +- svcdir="${spl_cachedir}" +-fi +- + # This is the main function that handles all events. + # Accepted parameters: + # svc_start +@@ -203,7 +193,7 @@ + h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null) + + # Point depscan.sh to our cachedir +- spl_cache_depscan="yes" /sbin/depscan.sh -u ++ spl_cache_depscan="yes" /sbin/depscan.sh --svcdir "${spl_cachedir}" + + if [[ "$1" == "start" ]]; then + # Check whether the list of services that will be started during boot diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml new file mode 100644 index 00000000..36ec4f2b --- /dev/null +++ b/media-gfx/splashutils/metadata.xml @@ -0,0 +1,8 @@ + + + +no-herd + + spock@gentoo.org + + diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild new file mode 100644 index 00000000..5e70963d --- /dev/null +++ b/media-gfx/splashutils/splashutils-1.1.9.10-r2.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.3 2006/03/14 16:42:40 spock Exp $ + +inherit eutils multilib linux-mod + +MISCSPLASH="miscsplashutils-0.1.3" +GENTOOSPLASH="splashutils-gentoo-0.1.14" +V_JPEG="6b" +V_PNG="1.2.8" +V_ZLIB="1.2.3" +V_FT="2.1.9" + +ZLIBSRC="libs/zlib-${V_ZLIB}" +LPNGSRC="libs/libpng-${V_PNG}" +JPEGSRC="libs/jpeg-${V_JPEG}" +FT2SRC="libs/freetype-${V_FT}" + +IUSE="hardened png truetype kdgraphics" + +DESCRIPTION="Framebuffer splash utilities." +HOMEPAGE="http://dev.gentoo.org/~spock/projects/gensplash/" +SRC_URI="mirror://gentoo/${PN}-lite-${PV}.tar.bz2 + mirror://gentoo/${GENTOOSPLASH}.tar.bz2 + mirror://gentoo/${MISCSPLASH}.tar.bz2 + mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2 + ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz + mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2 + http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +RDEPEND="truetype? ( >=media-libs/freetype-2 ) + png? ( >=media-libs/libpng-1.2.7 ) + >=media-libs/jpeg-6b + >=sys-apps/baselayout-1.9.4-r5 + app-arch/cpio + !media-gfx/bootsplash + media-gfx/fbgrab" +DEPEND="${RDEPEND} + virtual/linux-sources + >=dev-libs/klibc-1.0.14-r1" + +S="${WORKDIR}/${P/_/-}" +SG="${WORKDIR}/${GENTOOSPLASH}" +SM="${WORKDIR}/${MISCSPLASH}" + +pkg_setup() { + if use hardened; then + ewarn "Due to problems with klibc, it is currently impossible to compile splashutils" + ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with" + ewarn "-fno-stack-protector. Hardened GCC features will not be used while building" + ewarn "the splash kernel helper." + fi +} + +spl_conf() { + sed -i -re "s/#.* $2([^_].*|$)//g" ${S}/config.h + + if [[ "$1" == "yes" ]]; then + echo "#define $2 1" >> ${S}/config.h + else + echo "#undef $2" >> ${S}/config.h + fi +} + +spl_conf_use() { + if use $1; then + spl_conf yes $2 + else + spl_conf no $2 + fi +} + +pkg_setup() { + check_kernel_built +} + +src_unpack() { + unpack ${A} + ln -s ${KV_DIR} ${S}/linux + + # Ensure that we call depscan with --svcdir + cd "${WORKDIR}/${GENTOOSPLASH}" + epatch "${FILESDIR}/splashutils-depscan.patch" + + mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} ${S}/libs + # We need to delete the Makefile and let it be rebuilt when splashutils + # is being configured. Either that, or we end up with a segfaulting kernel + # helper. + rm ${S}/libs/zlib-${V_ZLIB}/Makefile + cd ${S} + + epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch + + # Check whether the kernel tree has been patched with fbsplash. + if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then + ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version" + ewarn "of fbsplash. You can download the latest patch from http://dev.gentoo.org/~spock/" + echo "" + ewarn "Splashutils will be compiled without fbsplash support. Verbose mode will not" + ewarn "be supported." + spl_conf no CONFIG_FBSPLASH + else + spl_conf yes CONFIG_FBSPLASH + fi + + if built_with_use sys-devel/gcc vanilla ; then + ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile" + ewarn "splashutils, you're on your own, as this configuration is not supported." + else + # This should make splashutils compile on systems with hardened GCC. + sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i ${S}/Makefile + fi + + mkdir ${S}/kernel + + # Use tty16 as the default silent tty. + sed -i -e 's/#define TTY_SILENT.*/#define TTY_SILENT 16/' ${S}/splash.h + + if ! use truetype ; then + sed -i -e 's/fbtruetype kbd/kbd/' ${SM}/Makefile + fi + + epatch ${FILESDIR}/splashutils-1.1.9.10-linux-2.6.16.diff +} + +src_compile() { + spl_conf_use png CONFIG_PNG + spl_conf_use truetype CONFIG_TTF + spl_conf_use truetype CONFIG_TTF_KERNEL + spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS + sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile + + cd ${SM} + emake LIB=$(get_libdir) || die "failed to build miscsplashutils" + cd ${S} + export ZLIBSRC LPNGSRC JPEGSRC FT2SRC + emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils" +} + +src_install() { + cd ${SM} + make DESTDIR=${D} install || die + + export ZLIBSRC LPNGSRC JPEGSRC FT2SRC + cd ${S} + make DESTDIR=${D} install || die + + keepdir /lib/splash/{tmp,cache,bin} + dosym /lib/splash/bin/fbres /sbin/fbres + + dodir /etc/env.d + echo 'CONFIG_PROTECT_MASK="/etc/splash"' > ${D}/etc/env.d/99splash + + exeinto /sbin + doexe ${SG}/splash + + exeinto /etc/init.d + newexe ${SG}/init-splash splash + + insinto /usr/share/${PN} + doins ${SG}/initrd.splash + + insinto /sbin + doins ${SG}/splash-functions.sh + + insinto /etc/conf.d + newins ${SG}/splash.conf splash + + insinto /etc/splash + doins ${SM}/fbtruetype/luxisri.ttf + + dodoc docs/* README AUTHORS +} + +pkg_postinst() { + ebegin "Checking whether /dev/tty1 is in place" + mount --bind / ${T} + + if [[ ! -c ${T}/dev/tty1 ]]; then + eend 1 + ewarn "It appears that the /dev/tty1 character device doesn't exist on" + ewarn "the root filesystem. This will prevent the silent mode from working" + ewarn "properly. You can fix the problem by doing:" + ewarn " mount --bind / /lib/splash/tmp" + ewarn " mknod /lib/splash/tmp/dev/tty1 c 4 1" + ewarn " umount /lib/splash/tmp" + echo "" + else + eend 0 + fi + umount ${T} + + if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then + ewarn "This package has been designed with udev in mind. Other solutions, such as" + ewarn "devfs or a static /dev tree might work, but are generally discouraged and" + ewarn "not supported. If you decide to switch to udev, you might want to have a" + ewarn "look at 'The Gentoo udev Guide', which can be found at" + ewarn " http://www.gentoo.org/doc/en/udev-guide.xml" + echo "" + fi + + if has_version '