BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Revert to Splashutils 1.3.

Browse source 
svn path=/nixpkgs/trunk/; revision=8582
This commit is contained in:
Eelco Dolstra 2007-04-16 14:20:29 +00:00
parent 7523c79bb8
commit 2261f6d265
4 changed files with 90 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/os-specific/linux/splashutils/default.nix
View file

@ -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";
}

20
pkgs/os-specific/linux/splashutils/fdset.patch Normal file
View file

@ -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 <linux/posix_types.h>
+#undef __KERNEL__
#endif
#include <stdio.h>

21
pkgs/os-specific/linux/splashutils/no-fbsplash.patch Normal file
View file

@ -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 <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
/*

38
pkgs/os-specific/linux/splashutils/purity.patch Normal file
View file

@ -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~