New bugfix bootsplash release.

4 files changed, 238 insertions, 2 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 72f6711299b0..a4bee0eca959 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/bootsplash 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.37 2004/04/14 15:40:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.38 2004/04/25 19:43:19 spock Exp $
+
+*bootsplash-0.6-r15 (25 Apr 2004)
+
+  25 Apr 2004; Michal Januszewski <spock@gentoo.org>
+  +bootsplash-0.6-r15.ebuild:
+  New version. Updated the kernel patches (>=2.4.25, 2.6.6-rc2 - a fix for the
+  config system), fixed a few minor bugs (including #47888). This will hopefully
+  be the last release before 0.6.1.
 
   14 Apr 2004; Michal Januszewski <spock@gentoo.org>
   bootsplash-0.6-r10.ebuild, bootsplash-0.6-r11.ebuild,
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index 468244379add..7d5e983b915e 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -1,10 +1,12 @@
 MD5 ae6a0a2fc3e040dcade924f41eae0daf bootsplash-0.6-r14.ebuild 6368
 MD5 a3cdeba2a10a151c2729e77dead863bf bootsplash-0.6-r8.ebuild 5172
 MD5 d1363d23b1dee12deb2b3f0d252bbc65 bootsplash-0.6-r13.ebuild 6368
+MD5 065764c2837998e7c6b3784efdd63669 bootsplash-0.6-r15.ebuild 6740
 MD5 bc46bccf320a9befc8b8ad536f6a6a10 bootsplash-0.6-r10.ebuild 5589
-MD5 d635f773b2c329fd7edd4f09227699ca ChangeLog 7375
+MD5 a7a1fc11257b5456601545fadce8bda0 ChangeLog 7690
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 6a993c12a7aad0735a4783e1f7c2c968 files/digest-bootsplash-0.6-r8 70
 MD5 415eead25ab7491fad79afd276c53124 files/digest-bootsplash-0.6-r10 71
 MD5 76ccf0b26a417828b751dacf918ec867 files/digest-bootsplash-0.6-r13 71
 MD5 eced1f4f52f6c503e51583475b899d31 files/digest-bootsplash-0.6-r14 71
+MD5 ea86420ce78486c9a0c6b4a0b0a83bd8 files/digest-bootsplash-0.6-r15 71
diff --git a/media-gfx/bootsplash/bootsplash-0.6-r15.ebuild b/media-gfx/bootsplash/bootsplash-0.6-r15.ebuild
new file mode 100644
index 000000000000..dfcb56f44098
--- /dev/null
+++ b/media-gfx/bootsplash/bootsplash-0.6-r15.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6-r15.ebuild,v 1.1 2004/04/25 19:43:19 spock Exp $
+
+IUSE="livecd"
+S=${WORKDIR}/${PF}
+DESCRIPTION="Graphical backgrounds for frame buffer consoles"
+HOMEPAGE="http://www.bootsplash.org/ http://linux.tkdack.com/"
+SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${PF}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+
+DEPEND=">=media-libs/freetype-2
+	media-libs/libmng"
+
+src_compile() {
+	# compile utils
+	# the util builds but the rc scripts have not been modified
+	# animated boot up require patches to the baselayout package
+	cd ${S}/utils
+
+	emake -C fbmngplay || die
+	emake -C fbtruetype || die
+	emake -C splashutils || die
+
+	cd ${S}
+}
+
+src_install() {
+	# Splash utilities
+	exeinto /sbin
+	doexe utils/fbmngplay/fbmngplay{,.static}
+	doexe utils/fbtruetype/fbtruetype{,.static}
+	doexe misc/bootsplash_resize
+	newexe utils/splashutils/splash splash.bin
+	doexe misc/splash
+	doexe utils/splashutils/{fbresolution,getkey,progress}
+
+	exeinto /usr/lib/${PN}
+	doexe misc/bootsplash_resizer.pl
+
+	dodir /etc/${PN}
+	cp -pR themes/* ${D}/etc/${PN}
+
+	# link default config for boot images if not already set
+	if [ ! -e ${ROOT}/etc/bootsplash/default ]; then
+		use livecd \
+			&& dosym ./livecd-2004.1 /etc/bootsplash/default \
+			|| dosym ./gentoo /etc/bootsplash/default
+	fi
+
+	exeinto /etc/init.d
+	doexe misc/bootsplash
+
+	insinto /etc/conf.d
+	newins misc/bootsplash.conf bootsplash
+
+	insinto /usr/share/${PN}
+	doins kernel/*.bz2 misc/grub.conf.sample
+
+	sed -i "s:${PN}:${PF}:g" misc/bootsplash_patch
+	into /
+	dosbin misc/bootsplash_patch
+	fperms 0754 /sbin/bootsplash_patch
+}
+
+pkg_postinst() {
+	# has to be done here so that the initrd images are created properly
+	if [ "${ROOT}" = "/" ]
+	then
+		for THEME in `ls /etc/bootsplash`
+		do
+			if [ -d /etc/bootsplash/${THEME} ] && [ "${THEME}" != "default" ]
+			then
+				for SIZE in 800x600 1024x768 1280x1024 1600x1200
+				do
+					/sbin/splash -s -f \
+						/etc/bootsplash/${THEME}/config/bootsplash-${SIZE}.cfg \
+						> /usr/share/${PN}/initrd-${THEME}-${SIZE}
+				done
+			fi
+		done
+	fi
+
+	# rename bootsplash config file to fit with the standard
+	if [ -f ${ROOT}/etc/conf.d/bootsplash.conf ]
+	then
+		mv -f ${ROOT}/etc/conf.d/bootsplash.conf ${ROOT}/etc/conf.d/bootsplash
+	fi
+
+	echo ""
+	einfo "Execute \`bootsplash_patch\` to have your kernel sources in"
+	einfo "/usr/src/linux patched with the Framebuffer Bootsplash patches."
+	einfo
+	einfo "You can also use:"
+	einfo "    bootsplash_patch /path/to/your/custom/kernel/"
+	einfo "to patch your custom kernel sources."
+	echo ""
+	ewarn "If you have already patched the kernel then you only need to copy"
+	ewarn "an initrd from /usr/share/${PN} to /boot"
+	echo ""
+	einfo "Run:"
+	einfo "    rc-update add bootsplash default"
+	einfo "to change the console images after startup"
+	echo ""
+	einfo "Please note that in case /sbin is a separate partition"
+	einfo "you'll need to use the statically linked versions of Bootplash"
+	einfo 'utilities (fbmngplay.static, fbtruetype.static) during boot-time.'
+	echo ""
+	einfo "If you would like to have a better quality background picture"
+	einfo "from the Gentoo theme and you don't care about a few more kilobytes"
+	einfo "of used memory, try the gentoo-highquality theme which you can"
+	einfo "download from:"
+	einfo "http://dev.gentoo.org/~spock/stuff/bootsplash/gentoo-highquality.tar.bz2"
+	echo ""
+	einfo "After the download is complete, unpack the files to /etc/bootsplash/"
+	echo ""
+	einfo "If you want to automatically generate configs for a new resolution"
+	einfo "you can use the \`bootsplash_resize\` script. More info:"
+	einfo "    bootsplash_resize -h"
+	echo ""
+}
+
+pkg_config() {
+
+	if [ "${LINUX}" == "" ]; then
+		LINUX='/usr/src/linux'
+	fi
+
+	eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' ${LINUX}/Makefile`
+
+	if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ]
+	then
+		die "Unable to determine kernel version in ${LINUX}"
+	fi
+
+	KB="${VERSION}.${PATCHLEVEL}"
+	KV_MINOR="${SUBLEVEL}"
+
+	ewarn
+	ewarn "Patching the kernel (branch: ${KB}) in ${LINUX} ..."
+	ewarn
+
+	cd ${ROOT}/${LINUX}
+
+	if [ "${KB}" == "2.4" ]; then
+
+		if [ -f drivers/video/fbcon-splash.c ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 25 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.25.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 22 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.22-vanilla.diff.bz2 \
+					| patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.0.7-2.4.20-vanilla.diff.bz2 \
+					| patch -p1 || die
+		fi
+
+	elif [ "${KB}" == "2.6" ]; then
+
+		if [ -d drivers/video/bootsplash ]; then
+			eerror
+			eerror "It appears your kernel has already been patched."
+			eerror
+			exit 1
+		fi
+
+		if [ ${KV_MINOR} -ge 6 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.6-rc2.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 5 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.5.patch.bz2 \
+					| patch -p1 || die
+		elif [ ${KV_MINOR} -ge 3 ]; then
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.4-2.6.3.diff.bz2 \
+					| patch -p1 || die
+		else
+			bzip2 -dc ${ROOT}/usr/share/${PN}/${PN}-3.1.3-2.6.0-test9.diff.bz2 \
+					| patch -p1 || die
+		fi
+	else
+		die "Sorry, this kernel branch is not supported."
+	fi
+
+	ewarn
+	ewarn " ... complete."
+	einfo
+	einfo "Your kernel has been patched, rebuild with the following options"
+	einfo "enabled (do not build them as modules!):"
+	einfo "		Block Devices ->"
+	einfo "			[*] RAM disk support"
+	einfo "			[*] Loopback device support"
+	einfo "			[*] Initial RAM disk (initrd) support"
+	einfo
+	einfo "		Console Drivers ->"
+	einfo "			[*] Video mode selection support"
+	einfo "			Frame-buffer support ->"
+	einfo "				[*] Support for frame buffer devices"
+	einfo "				[*] VESA VGA graphics console"
+	einfo "				[*] Use splash screen instead of boot logo"
+	einfo
+	einfo "Copy an initrd from /usr/share/${PN} to /boot"
+	einfo
+	einfo "Look at \"/usr/share/${PN}/grub.conf.sample\" for an example"
+	einfo "grub.conf file with the appropriate changes to enable the"
+	einfo "framebuffer boot screens"
+	einfo
+	einfo "Ensure you make the appropriate changes to your grub.conf"
+	echo ""
+	ewarn "Note that bootsplash will not work with kernels which have CONFIG_REGPARM"
+	ewarn "(Processor type and features -> Use register arguments) option enabled."
+	ewarn "You will also need framebuffer console support compiled into the kernel"
+	ewarn "(and not as a module)."
+	echo ""
+
+}
diff --git a/media-gfx/bootsplash/files/digest-bootsplash-0.6-r15 b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r15
new file mode 100644
index 000000000000..be1acbe2389a
--- /dev/null
+++ b/media-gfx/bootsplash/files/digest-bootsplash-0.6-r15
@@ -0,0 +1 @@
+MD5 ff7b6229f17ef07ffb0a8cf591e6c862 bootsplash-0.6-r15.tar.bz2 959793