diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2006-09-25 18:33:13 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2006-09-25 18:33:13 +0000 |
| commit | 1c4c3df552ff716f92679de52390c6262ac85ea3 (patch) | |
| tree | ec0b12740f8ab324f06a602a8d0be300e5be014c /media-gfx/splashutils | |
| parent | Fixed libraw1394 dependency, bug #149095. Thanks a lot to Torsten Kaiser. (diff) | |
| download | gentoo-2-1c4c3df552ff716f92679de52390c6262ac85ea3.tar.gz gentoo-2-1c4c3df552ff716f92679de52390c6262ac85ea3.tar.bz2 gentoo-2-1c4c3df552ff716f92679de52390c6262ac85ea3.zip | |
Make it possible to compile splashutils without support for fbsplash (bug #149094).
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'media-gfx/splashutils')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.3-r2-fbsplash.patch | 21 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.3-r2.ebuild | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 5cbf0386e6f8..c5929a7b8c20 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.66 2006/08/21 19:41:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.67 2006/09/25 18:33:13 spock Exp $ + + 25 Sep 2006; Michał Januszewski <spock@gentoo.org> + +files/splashutils-1.3-r2-fbsplash.patch, splashutils-1.3-r2.ebuild: + Make it possible to compile splashutils without support for fbsplash (bug + #149094). 21 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org> splashutils-1.1.9.10-r1.ebuild: diff --git a/media-gfx/splashutils/files/splashutils-1.3-r2-fbsplash.patch b/media-gfx/splashutils/files/splashutils-1.3-r2-fbsplash.patch new file mode 100644 index 000000000000..a39fda6591c3 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.3-r2-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 <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/media-gfx/splashutils/splashutils-1.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.3-r2.ebuild index a83ae0c3da5c..6d41782f2f70 100644 --- a/media-gfx/splashutils/splashutils-1.3-r2.ebuild +++ b/media-gfx/splashutils/splashutils-1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.3 2006/08/11 18:37:47 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.4 2006/09/25 18:33:13 spock Exp $ inherit eutils multilib toolchain-funcs @@ -66,6 +66,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/splashutils-1.3-r2.patch + epatch ${FILESDIR}/splashutils-1.3-r2-fbsplash.patch # Make sure the static version of splash_util is linked against the nptl # libraries and not the linuxthreads ones. |