about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/splashutils
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-11-25 23:41:53 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-11-25 23:41:53 +0000
commit88f1d8af8e8a52597dd129581c26a7e18e972e4f (patch)
treed0f937f3395af525fcc99451e4e0da3fc9ea0526 /pkgs/os-specific/linux/splashutils
parent66b646d7e70ffd8943fcc4017ffd29942dfb1bcf (diff)
downloadnixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar.gz
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar.bz2
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar.lz
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar.xz
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.tar.zst
nixlib-88f1d8af8e8a52597dd129581c26a7e18e972e4f.zip
* Build splashutils properly.
svn path=/nixpkgs/trunk/; revision=7134
Diffstat (limited to 'pkgs/os-specific/linux/splashutils')
-rw-r--r--pkgs/os-specific/linux/splashutils/default.nix16
-rw-r--r--pkgs/os-specific/linux/splashutils/no-fbsplash.patch69
-rw-r--r--pkgs/os-specific/linux/splashutils/purity.patch38
3 files changed, 69 insertions, 54 deletions
diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix
index 605b9a4fbb1c..1fc8003b5b0a 100644
--- a/pkgs/os-specific/linux/splashutils/default.nix
+++ b/pkgs/os-specific/linux/splashutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, klibc, zlib, libjpeg}:
 
 stdenv.mkDerivation {
   name = "splashutils-1.3";
@@ -6,16 +6,20 @@ stdenv.mkDerivation {
     url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2;
     md5 = "c7c92b98e34b860511aa57bd29d62f76";
   };
-  patches = [./no-fbsplash.patch];
+  patches = [./purity.patch ./no-fbsplash.patch];
+
+  buildInputs = [klibc zlib libjpeg];
+  
+  inherit klibc;
   
   dontAddPrefix = 1;
   configureScript = "sh ./configure";
   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";
+  makeFlags = "QUIET=false";
+
+  #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
index c175280c8899..a39fda6591c3 100644
--- a/pkgs/os-specific/linux/splashutils/no-fbsplash.patch
+++ b/pkgs/os-specific/linux/splashutils/no-fbsplash.patch
@@ -1,48 +1,21 @@
-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~
+diff --git a/splash.h b/splash.h
+index 5dccfe0..eae2939 100644
+--- a/splash.h
++++ b/splash.h
+@@ -30,10 +30,14 @@ #endif
+  */
+ #ifdef TARGET_KERNEL
+ 	#include <linux/fb.h>
+-	#include <linux/console_splash.h>
++	#ifdef CONFIG_FBSPLASH
++		#include <linux/console_splash.h>
++	#endif
+ #else
+ 	#include <fb.h>
+-	#include <console_splash.h>
++	#ifdef CONFIG_FBSPLASH
++		#include <console_splash.h>
++	#endif
+ #endif
+ 
+ /*
diff --git a/pkgs/os-specific/linux/splashutils/purity.patch b/pkgs/os-specific/linux/splashutils/purity.patch
new file mode 100644
index 000000000000..45cbafb7161a
--- /dev/null
+++ b/pkgs/os-specific/linux/splashutils/purity.patch
@@ -0,0 +1,38 @@
+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-26 00:25:48.000000000 +0100
+***************
+*** 28,34 ****
+  usrbindir  = ${prefix}/usr/bin
+  mandir 	   = ${prefix}/usr/share/man
+  
+! INSTALL 		= /usr/bin/install -c
+  INSTALL_PROG 	= ${INSTALL}
+  INSTALL_DATA 	= ${INSTALL} -m 644
+  INSTALL_SCRIPT 	= ${INSTALL_PROG}
+--- 28,34 ----
+  usrbindir  = ${prefix}/usr/bin
+  mandir 	   = ${prefix}/usr/share/man
+  
+! INSTALL 		= install -c
+  INSTALL_PROG 	= ${INSTALL}
+  INSTALL_DATA 	= ${INSTALL} -m 644
+  INSTALL_SCRIPT 	= ${INSTALL_PROG}
+***************
+*** 71,77 ****
+  
+  # Include the klibc header files so that we can compile against fb.h
+  # from a kernel thee patched with fbsplash.
+! INCLUDES = -I/usr/include/freetype2 -idirafter /usr/lib/klibc/include/linux
+  OBJS     = $(OBJDIR)/splash.o $(OBJDIR)/parse.o $(OBJDIR)/render.o $(OBJDIR)/image.o \
+  		   $(OBJDIR)/cmd.o $(OBJDIR)/common.o $(OBJDIR)/daemon.o $(OBJDIR)/daemon_cmd.o \
+  	       $(OBJDIR)/list.o $(OBJDIR)/effects.o
+--- 71,77 ----
+  
+  # Include the klibc header files so that we can compile against fb.h
+  # from a kernel thee patched with fbsplash.
+! INCLUDES = -I${freetype}/include/freetype2 -idirafter ${klibc}/lib/klibc/include/linux
+  OBJS     = $(OBJDIR)/splash.o $(OBJDIR)/parse.o $(OBJDIR)/render.o $(OBJDIR)/image.o \
+  		   $(OBJDIR)/cmd.o $(OBJDIR)/common.o $(OBJDIR)/daemon.o $(OBJDIR)/daemon_cmd.o \
+  	       $(OBJDIR)/list.o $(OBJDIR)/effects.o
+Only in splashutils-1.3/: Makefile~