From 2261f6d2658f95bda690d153186250ea2d5cfb6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Apr 2007 14:20:29 +0000 Subject: [PATCH] * Revert to Splashutils 1.3. svn path=/nixpkgs/trunk/; revision=8582 --- .../os-specific/linux/splashutils/default.nix | 24 ++++++------ .../os-specific/linux/splashutils/fdset.patch | 20 ++++++++++ .../linux/splashutils/no-fbsplash.patch | 21 ++++++++++ .../linux/splashutils/purity.patch | 38 +++++++++++++++++++ 4 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 pkgs/os-specific/linux/splashutils/fdset.patch create mode 100644 pkgs/os-specific/linux/splashutils/no-fbsplash.patch create mode 100644 pkgs/os-specific/linux/splashutils/purity.patch diff --git a/pkgs/os-specific/linux/splashutils/default.nix b/pkgs/os-specific/linux/splashutils/default.nix index 7703cb26f8d9..7af2f882f958 100644 --- a/pkgs/os-specific/linux/splashutils/default.nix +++ b/pkgs/os-specific/linux/splashutils/default.nix @@ -1,11 +1,17 @@ {stdenv, fetchurl, klibc, zlib, libjpeg}: stdenv.mkDerivation { - name = "splashutils-1.4"; + name = "splashutils-1.3"; src = fetchurl { - url = http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-1.4.tar.bz2; - sha256 = "1j4jv8yyfdl2nbl6r2kgw5pznih55v7zsxzywcg28z7cyrf49jg2"; + url = http://dev.gentoo.org/~spock/projects/splashutils/archive/splashutils-1.3.tar.bz2; + md5 = "c7c92b98e34b860511aa57bd29d62f76"; }; + 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]; @@ -13,19 +19,11 @@ stdenv.mkDerivation { dontAddPrefix = 1; configureScript = "sh ./configure"; - configureFlags = "--without-ttf --without-png --without-gpm --with-fifo=/var/run/splash_fifo"; + configureFlags = "--without-ttf --without-png --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; - 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 - "; + 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 new file mode 100644 index 000000000000..44c61339c454 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/fdset.patch @@ -0,0 +1,20 @@ +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 ++#undef __KERNEL__ + #endif + + #include 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..a39fda6591c3 --- /dev/null +++ b/pkgs/os-specific/linux/splashutils/no-fbsplash.patch @@ -0,0 +1,21 @@ +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 +- #include ++ #ifdef CONFIG_FBSPLASH ++ #include ++ #endif + #else + #include +- #include ++ #ifdef CONFIG_FBSPLASH ++ #include ++ #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~