diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-25 00:28:15 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-25 00:28:15 +0000 |
| commit | 491f5058487e2a502f12b55a5b3423c7038728b9 (patch) | |
| tree | c38f4acd07125f8e50c9086a9617c0cdd7e197d3 /pkgs/os-specific/linux/splashutils | |
| parent | 53d285263f7d05247488aada0d1333a068897b1e (diff) | |
| download | nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar.gz nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar.bz2 nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar.lz nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar.xz nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.tar.zst nixlib-491f5058487e2a502f12b55a5b3423c7038728b9.zip | |
* Splashutils.
svn path=/nixpkgs/trunk/; revision=7126
Diffstat (limited to 'pkgs/os-specific/linux/splashutils')
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/splashutils/no-fbsplash.patch | 48 |
2 files changed, 68 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix new file mode 100644 index 000000000000..63b6a9a21320 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "splashutils-1.3"; + src = fetchurl { + url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2; + md5 = "c7c92b98e34b860511aa57bd29d62f76"; + }; + patches = [./no-fbsplash.patch]; + + dontAddPrefix = 1; + configureFlags = "--without-ttf --without-png --without-fbsplash"; + + # Hack hack hack. + makeFlags = "KLCC=gcc"; + NIX_CFLAGS_COMPILE = "-Iobjs/jpeglib -Ilibs/jpeg-6b -Ilibs/freetype-2.1.9/include -Ilibs/libpng-1.2.8 -Ilibs/zlib-1.2.3"; + NIX_CFLAGS_LINK = "-Lobjs/jpeglib -Lobjs/freetype2/.libs -Llibs/zlib-1.2.3 -Llibs/libpng-1.2.8"; + + installPhase = "ensureDir $out/bin; cp objs/splash_helper objs/splash_util objs/splash_util.static $out/bin"; +} diff --git a/pkgs/os-specific/linux/splashutils/no-fbsplash.patch b/pkgs/os-specific/linux/splashutils/no-fbsplash.patch new file mode 100644 index 000000000000..c175280c8899 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/no-fbsplash.patch @@ -0,0 +1,48 @@ +diff -rc splashutils-1.3-orig/Makefile splashutils-1.3/Makefile +*** splashutils-1.3-orig/Makefile 2006-07-15 00:02:22.000000000 +0200 +--- splashutils-1.3/Makefile 2006-11-25 01:22:03.000000000 +0100 +*************** +*** 57,63 **** + 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 \ + -DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \ +! -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_TRANSFORMS -DPNG_NO_READ_ANCILLARY_CHUNKS + + K_LDLIBS = $(OBJDIR)/jpeglib/libjpeg.a + K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \ +--- 57,63 ---- + 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 \ + -DPNG_NO_ERROR_NUMBERS -DPNG_READ_GRAY_TO_RGB_SUPPORTED -DPNG_READ_16_TO_8_SUPPORTED \ +! -DPNG_READ_STRIP_ALPHA_SUPPORTED -DPNG_NO_INFO_IMAGE -DPNG_NO_READ_ANCILLARY_CHUNKS + + K_LDLIBS = $(OBJDIR)/jpeglib/libjpeg.a + K_OBJS = $(KOUT)/kernel.o $(KOUT)/dev.o $(KOUT)/parse.o $(KOUT)/render.o $(KOUT)/image.o \ +Only in splashutils-1.3/: Makefile~ +diff -rc splashutils-1.3-orig/splash.h splashutils-1.3/splash.h +*** splashutils-1.3-orig/splash.h 2006-07-15 00:02:23.000000000 +0200 +--- splashutils-1.3/splash.h 2006-11-25 00:42:08.000000000 +0100 +*************** +*** 21,30 **** + */ + #ifdef TARGET_KERNEL + #include <linux/fb.h> +! #include <linux/console_splash.h> + #else +! #include <fb.h> +! #include <console_splash.h> + #endif + + /* +--- 21,30 ---- + */ + #ifdef TARGET_KERNEL + #include <linux/fb.h> +! //#include <linux/console_splash.h> + #else +! #include <linux/fb.h> +! //#include <console_splash.h> + #endif + + /* +Only in splashutils-1.3/: splash.h~ |