* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: splashutils-1.5.4.4-r3.ebuild ChangeLog
@ 2012-11-30 1:22 Michael Weber (xmw)
0 siblings, 0 replies; only message in thread
From: Michael Weber (xmw) @ 2012-11-30 1:22 UTC (permalink / raw
To: gentoo-commits
xmw 12/11/30 01:22:46
Modified: ChangeLog
Added: splashutils-1.5.4.4-r3.ebuild
Log:
Revbump to add -lbz2 to libfbsplashrender.pc (bug 408283)
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path
1.206 media-gfx/splashutils/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.206&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.206&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/ChangeLog?r1=1.205&r2=1.206
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- ChangeLog 28 Oct 2012 16:20:50 -0000 1.205
+++ ChangeLog 30 Nov 2012 01:22:46 -0000 1.206
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.205 2012/10/28 16:20:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.206 2012/11/30 01:22:46 xmw Exp $
+
+*splashutils-1.5.4.4-r3 (30 Nov 2012)
+
+ 30 Nov 2012; Michael Weber <xmw@gentoo.org> +splashutils-1.5.4.4-r3.ebuild,
+ +files/splashutils-1.5.4.4-r3-bzip2.patch:
+ Revbump to add -lbz2 to libfbsplashrender.pc (bug 408283)
28 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
splashutils-1.5.4.4-r1.ebuild:
1.1 media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild?rev=1.1&content-type=text/plain
Index: splashutils-1.5.4.4-r3.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r3.ebuild,v 1.1 2012/11/30 01:22:46 xmw Exp $
EAPI=4
inherit autotools eutils multilib toolchain-funcs
MISCSPLASH="miscsplashutils-0.1.8"
GENTOOSPLASH="splashutils-gentoo-1.0.17"
V_JPEG="8a"
V_PNG="1.4.3"
V_ZLIB="1.2.3"
V_FT="2.3.12"
ZLIBSRC="libs/zlib-${V_ZLIB}"
LPNGSRC="libs/libpng-${V_PNG}"
JPEGSRC="libs/jpeg-${V_JPEG}"
FT2SRC="libs/freetype-${V_FT}"
RESTRICT="test"
IUSE="hardened +png +truetype +mng gpm fbcondecor"
DESCRIPTION="Framebuffer splash utilities."
HOMEPAGE="http://fbsplash.berlios.de"
SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
mirror://gentoo/${MISCSPLASH}.tar.bz2
mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="gpm? ( sys-libs/gpm[static-libs(+)] )
truetype? (
>=media-libs/freetype-2[static-libs]
app-arch/bzip2[static-libs(+)]
sys-libs/zlib[static-libs(+)]
)
png? ( >=media-libs/libpng-1.4.3[static-libs] )
mng? (
media-libs/lcms:0[static-libs]
media-libs/libmng[static-libs(+)]
)
virtual/jpeg[static-libs]
>=sys-apps/baselayout-1.9.4-r5
app-arch/cpio
media-gfx/fbgrab
!sys-apps/lcdsplash"
DEPEND="${RDEPEND}
>=dev-libs/klibc-1.5
virtual/pkgconfig"
S="${WORKDIR}/${P/_/-}"
SG="${WORKDIR}/${GENTOOSPLASH}"
SM="${WORKDIR}/${MISCSPLASH}"
pkg_setup() {
if use hardened; then
ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
ewarn "the splash kernel helper."
fi
}
src_prepare() {
mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
# We need to delete the Makefile and let it be rebuilt when splashutils
# is being configured. Either that, or we end up with a segfaulting kernel
# helper.
rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
cd "${SG}"
epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
if use truetype ; then
cd "${SM}"
epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
fi
cd "${S}"
ln -sf "${S}/src" "${WORKDIR}/core"
epatch "${FILESDIR}/${P}-r3-bzip2.patch"
if ! tc-is-cross-compiler && \
has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
ewarn "splashutils, you're on your own, as this configuration is not supported."
else
# This should make splashutils compile on systems with hardened GCC.
sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
fi
if ! use truetype ; then
sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
fi
# Latest version of klibc defined its own version of ferror, so there is
# not need for the hack in klibc_compat.h
if has_version ">=dev-libs/klibc-1.5.20"; then
echo > "libs/klibc_compat.h"
fi
rm -f m4/*
eautoreconf
}
src_configure() {
tc-export CC
cd "${SM}"
emake CC="${CC}" LIB=$(get_libdir) STRIP=true
cd "${S}"
econf \
$(use_with png) \
$(use_with mng) \
$(use_with gpm) \
$(use_with truetype ttf) \
$(use_with truetype ttf-kernel) \
$(use_enable fbcondecor) \
--docdir=/usr/share/doc/${PF} \
--with-freetype2-src=${FT2SRC} \
--with-jpeg-src=${JPEGSRC} \
--with-lpng-src=${LPNGSRC} \
--with-zlib-src=${ZLIBSRC} \
--with-essential-libdir=/$(get_libdir)
}
src_compile() {
emake CC="${CC}" STRIP="true"
if has_version ">=sys-apps/baselayout-1.13.99"; then
cd "${SG}"
emake LIB=$(get_libdir)
fi
}
src_install() {
local LIB=$(get_libdir)
cd "${SM}"
make DESTDIR="${D}" LIB=${LIB} install
cd "${S}"
make DESTDIR="${D}" STRIP="true" install
mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
gen_usr_ldscript libfbsplash.so
echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
doenvd 99splash
if use fbcondecor ; then
newinitd "${SG}"/init-fbcondecor fbcondecor
newconfd "${SG}"/fbcondecor.conf fbcondecor
fi
newconfd "${SG}"/splash.conf splash
insinto /usr/share/${PN}
doins "${SG}"/initrd.splash
insinto /etc/splash
doins "${SM}"/fbtruetype/luxisri.ttf
if has_version ">=sys-apps/baselayout-1.13.99"; then
cd "${SG}"
make DESTDIR="${D}" LIB=${LIB} install
else
cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
fi
sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
keepdir /${LIB}/splash/{tmp,cache,bin,sys}
dosym /${LIB}/splash/bin/fbres /sbin/fbres
}
pkg_preinst() {
has_version "<${CATEGORY}/${PN}-1.0"
previous_less_than_1_0=$?
has_version "<${CATEGORY}/${PN}-1.5.3"
previous_less_than_1_5_3=$?
}
pkg_postinst() {
if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
elog "This package has been designed with udev in mind. Other solutions, such as"
elog "devfs or a static /dev tree might work, but are generally discouraged and"
elog "not supported. If you decide to switch to udev, you might want to have a"
elog "look at 'The Gentoo udev Guide', which can be found at"
elog " http://www.gentoo.org/doc/en/udev-guide.xml"
elog ""
fi
if [[ $previous_less_than_1_0 = 0 ]] ; then
elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
elog ""
fi
if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish"
elog "to use fbcondecor, run:"
elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
elog "and re-emerge splashutils."
fi
if ! test -f /proc/cmdline ||
! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
elog "It is required that you add 'console=tty1' to your kernel"
elog "command line parameters."
elog ""
elog "After these modifications, the relevant part of the kernel command"
elog "line might look like:"
elog " splash=silent,fadein,theme:emergence console=tty1"
elog ""
fi
if ! has_version 'media-gfx/splash-themes-livecd' &&
! has_version 'media-gfx/splash-themes-gentoo'; then
elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
elog "core splashutils package. To get some themes you might want to emerge:"
elog " media-gfx/splash-themes-livecd"
elog " media-gfx/splash-themes-gentoo"
fi
elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called"
elog "'fbcondecor'. Make sure you update your system. See:"
elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
elog "for further info about the name changes."
elog ""
elog "Also note that splash_util has now been split into splash_util, fbsplashd"
elog "and fbcondecor_ctl."
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-11-30 1:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-30 1:22 [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: splashutils-1.5.4.4-r3.ebuild ChangeLog Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox