From 9f992232194adea70e58e7c4620c42c1c329a23e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Jan 2010 14:35:38 +0000 Subject: [PATCH] * Removed splashutils 1.3 (obsolete). svn path=/nixpkgs/branches/stdenv-updates/; revision=19710 --- pkgs/os-specific/linux/splashutils/1.3.nix | 42 ------------ .../splashutils/{1.5.nix => default.nix} | 0 .../os-specific/linux/splashutils/fdset.patch | 20 ------ .../linux/splashutils/no-fbsplash.patch | 67 ------------------- .../linux/splashutils/purity.patch | 38 ----------- pkgs/top-level/all-packages.nix | 13 +--- 6 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 pkgs/os-specific/linux/splashutils/1.3.nix rename pkgs/os-specific/linux/splashutils/{1.5.nix => default.nix} (100%) delete mode 100644 pkgs/os-specific/linux/splashutils/fdset.patch delete mode 100644 pkgs/os-specific/linux/splashutils/no-fbsplash.patch delete mode 100644 pkgs/os-specific/linux/splashutils/purity.patch diff --git a/pkgs/os-specific/linux/splashutils/1.3.nix b/pkgs/os-specific/linux/splashutils/1.3.nix deleted file mode 100644 index 51c53dd2a79..00000000000 --- a/pkgs/os-specific/linux/splashutils/1.3.nix +++ /dev/null @@ -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"; - }; -} diff --git a/pkgs/os-specific/linux/splashutils/1.5.nix b/pkgs/os-specific/linux/splashutils/default.nix similarity index 100% rename from pkgs/os-specific/linux/splashutils/1.5.nix rename to pkgs/os-specific/linux/splashutils/default.nix diff --git a/pkgs/os-specific/linux/splashutils/fdset.patch b/pkgs/os-specific/linux/splashutils/fdset.patch deleted file mode 100644 index 44c61339c45..00000000000 --- 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 -+#undef __KERNEL__ - #endif - - #include 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 f83275ea84a..00000000000 --- a/pkgs/os-specific/linux/splashutils/no-fbsplash.patch +++ /dev/null @@ -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 -- #include - #else - #include -- #include - #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 - #else - #include - #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~ diff --git a/pkgs/os-specific/linux/splashutils/purity.patch b/pkgs/os-specific/linux/splashutils/purity.patch deleted file mode 100644 index 45cbafb7161..00000000000 --- 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~ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ff135b2c9c..c965d60a203 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;