* Splashutils 1.4.

svn path=/nixpkgs/trunk/; revision=8579

4 files changed, 13 insertions, 90 deletions

diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix
index 7af2f882f958..7703cb26f8d9 100644
--- a/pkgs/os-specific/linux/splashutils/default.nix
+++ b/pkgs/os-specific/linux/splashutils/default.nix
@@ -1,17 +1,11 @@
 {stdenv, fetchurl, klibc, zlib, libjpeg}:
 
 stdenv.mkDerivation {
-  name = "splashutils-1.3";
+  name = "splashutils-1.4";
   src = fetchurl {
-    url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2;
-    md5 = "c7c92b98e34b860511aa57bd29d62f76";
+    url = http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-1.4.tar.bz2;
+    sha256 = "1j4jv8yyfdl2nbl6r2kgw5pznih55v7zsxzywcg28z7cyrf49jg2";
   };
-  patches = [
-    ./purity.patch
-    ./no-fbsplash.patch
-    # Borrowed from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-gfx/splashutils/files/splashutils-1.3-fdset.patch?rev=1.1.
-    ./fdset.patch
-  ];
 
   buildInputs = [klibc zlib libjpeg];
   
@@ -19,11 +13,19 @@ stdenv.mkDerivation {
   
   dontAddPrefix = 1;
   configureScript = "sh ./configure";
-  configureFlags = "--without-ttf --without-png --with-fifo=/var/run/splash_fifo";
+  configureFlags = "--without-ttf --without-png --without-gpm --with-fifo=/var/run/splash_fifo";
 
   # QUIET = false doesn't work due to the use of /dev/stdout (which
   # doesn't work when the build user doesn't own stdout). 
   #makeFlags = "QUIET=false;
 
-  installPhase = "ensureDir $out/bin; cp objs/splash_helper objs/splash_util objs/splash_util.static $out/bin";
+  preBuild = "
+    makeFlagsArray=(INSTALL='install -c')
+    substituteInPlace Makefile --replace '/usr/$(LIB)/klibc' ${klibc}/lib/klibc
+  ";
+
+  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/fdset.patch b/pkgs/os-specific/linux/splashutils/fdset.patch
deleted file mode 100644
index 44c61339c454..000000000000
--- a/pkgs/os-specific/linux/splashutils/fdset.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/core/render.c b/core/render.c
-index 290ea97..47319a8 100644
---- a/render.c
-+++ b/render.c
-@@ -9,8 +9,15 @@
-  *
-  */
- 
-+/* 
-+ * HACK WARNING: 
-+ * This is necessary to get FD_SET and FD_ZERO on platforms other than x86. 
-+ */
-+
- #ifdef TARGET_KERNEL
-+#define __KERNEL__
- #include <linux/posix_types.h>
-+#undef __KERNEL__
- #endif
- 
- #include <stdio.h>
diff --git a/pkgs/os-specific/linux/splashutils/no-fbsplash.patch b/pkgs/os-specific/linux/splashutils/no-fbsplash.patch
deleted file mode 100644
index a39fda6591c3..000000000000
--- a/pkgs/os-specific/linux/splashutils/no-fbsplash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 45cbafb7161a..000000000000
--- a/pkgs/os-specific/linux/splashutils/purity.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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~