mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 06:45:54 +03:00
* Removed splashutils 1.3 (obsolete).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19710
This commit is contained in:
Eelco Dolstra
parent
b2fed75484
commit
9f99223219
@ -1,42 +0,0 @@
|
||||
{stdenv, fetchurl, klibc, zlib, libjpeg}:
|
||||
|
||||
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 = [
|
||||
./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];
|
||||
|
||||
inherit klibc;
|
||||
|
||||
dontAddPrefix = 1;
|
||||
configureScript = "sh ./configure";
|
||||
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;
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
cp objs/splash_util objs/splash_util.static $out/bin
|
||||
ensureDir $out/sbin
|
||||
cp objs/splash_helper $out/sbin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
helperName = "sbin/splash_helper";
|
||||
controlName = "bin/splash_util";
|
||||
helperProcFile = "/proc/sys/kernel/fbsplash";
|
||||
};
|
||||
}
|
||||
@ -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>
|
||||
@ -1,67 +0,0 @@
|
||||
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 2009-01-29 16:41:00.000000000 +0100
|
||||
***************
|
||||
*** 21,40 ****
|
||||
*/
|
||||
#ifdef TARGET_KERNEL
|
||||
#include <linux/fb.h>
|
||||
- #include <linux/console_splash.h>
|
||||
#else
|
||||
#include <fb.h>
|
||||
- #include <console_splash.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Necessary to avoid compilation errors when fbsplash support is
|
||||
* disabled.
|
||||
*/
|
||||
- #if !defined(CONFIG_FBSPLASH)
|
||||
#define FB_SPLASH_IO_ORIG_USER 0
|
||||
#define FB_SPLASH_IO_ORIG_KERNEL 1
|
||||
! #endif
|
||||
|
||||
/*
|
||||
* Adjustable settings
|
||||
--- 21,60 ----
|
||||
*/
|
||||
#ifdef TARGET_KERNEL
|
||||
#include <linux/fb.h>
|
||||
#else
|
||||
#include <fb.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Necessary to avoid compilation errors when fbsplash support is
|
||||
* disabled.
|
||||
*/
|
||||
#define FB_SPLASH_IO_ORIG_USER 0
|
||||
#define FB_SPLASH_IO_ORIG_KERNEL 1
|
||||
!
|
||||
! #define FBIOSPLASH_SETCFG _IOWR('F', 0x19, struct fb_splash_iowrapper)
|
||||
! #define FBIOSPLASH_GETCFG _IOR('F', 0x1A, struct fb_splash_iowrapper)
|
||||
! #define FBIOSPLASH_SETSTATE _IOWR('F', 0x1B, struct fb_splash_iowrapper)
|
||||
! #define FBIOSPLASH_GETSTATE _IOR('F', 0x1C, struct fb_splash_iowrapper)
|
||||
! #define FBIOSPLASH_SETPIC _IOWR('F', 0x1D, struct fb_splash_iowrapper)
|
||||
!
|
||||
! #define FB_SPLASH_THEME_LEN 128 /* Maximum lenght of a theme name */
|
||||
!
|
||||
! struct fb_splash_iowrapper
|
||||
! {
|
||||
! unsigned short vc; /* Virtual console */
|
||||
! unsigned char origin; /* Point of origin of the request */
|
||||
! void *data;
|
||||
! };
|
||||
!
|
||||
! /* A structure used by the framebuffer splash code (drivers/video/fbsplash.c) */
|
||||
! struct vc_splash {
|
||||
! __u8 bg_color; /* The color that is to be treated as transparent */
|
||||
! __u8 state; /* Current splash state: 0 = off, 1 = on */
|
||||
! __u16 tx, ty; /* Top left corner coordinates of the text field */
|
||||
! __u16 twidth, theight; /* Width and height of the text field */
|
||||
! char* theme;
|
||||
! };
|
||||
|
||||
/*
|
||||
* Adjustable settings
|
||||
Only in splashutils-1.3/: splash.h~
|
||||
@ -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~
|
||||
@ -5896,10 +5896,7 @@ let
|
||||
};
|
||||
|
||||
splashutils =
|
||||
# Splashutils 1.3 is broken, so disable splash on older kernels.
|
||||
if kernel.features ? fbSplash then /* splashutils_13 */ null else
|
||||
if kernel.features ? fbConDecor then splashutils_15 else
|
||||
null;
|
||||
if kernel.features ? fbConDecor then pkgs.splashutils else null;
|
||||
|
||||
ext3cowtools = import ../os-specific/linux/ext3cow-tools {
|
||||
inherit stdenv fetchurl;
|
||||
@ -6183,13 +6180,7 @@ let
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
splashutils_13 = import ../os-specific/linux/splashutils/1.3.nix {
|
||||
inherit fetchurl stdenv klibc;
|
||||
zlib = zlibStatic;
|
||||
libjpeg = libjpegStatic;
|
||||
};
|
||||
|
||||
splashutils_15 = import ../os-specific/linux/splashutils/1.5.nix {
|
||||
splashutils = import ../os-specific/linux/splashutils/default.nix {
|
||||
inherit fetchurl stdenv klibc;
|
||||
zlib = zlibStatic;
|
||||
libjpeg = libjpegStatic;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user