Bump internal libpng.
authorMichael Januszewski <spock@gentoo.org>
Wed, 3 Mar 2010 20:06:57 +0000 (20:06 +0000)
committerMichael Januszewski <spock@gentoo.org>
Wed, 3 Mar 2010 20:06:57 +0000 (20:06 +0000)
Package-Manager: portage-2.2_rc64/cvs/Linux x86_64

media-gfx/splashutils/ChangeLog
media-gfx/splashutils/Manifest
media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild [new file with mode: 0644]

index edebe88f65cd347c90a2bcd2e40b6b4bbb1f9b01..b8604493d7d269ebb92dbb3c51e45a2451d09a54 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.168 2010/03/02 20:55:23 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.169 2010/03/03 20:06:57 spock Exp $
+
+*splashutils-1.5.4.3-r2 (03 Mar 2010)
+
+  03 Mar 2010; MichaƂ Januszewski <spock@gentoo.org>
+  +splashutils-1.5.4.3-r2.ebuild:
+  Bump internal libpng.
 
 *splashutils-1.5.4.3-r1 (02 Mar 2010)
 
index fa22e23e4665a14fb7bdade39e5fe8720157070c..3b3dd085c7b124efdc2fc34e5291a4aea3623c11 100644 (file)
@@ -15,18 +15,20 @@ DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 S
 DIST jpegsrc.v8a.tar.gz 962018 RMD160 cdf6c356ea1a631e37256893e80206ad6ecc3fab SHA1 78077fb22f0b526a506c21199fbca941d5c671a9 SHA256 bf86a5eaafa79b5d60feb27bee08df2db4c9ca2fb40d453e7a2080f7663a713b
 DIST libpng-1.2.18.tar.bz2 623690 RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e SHA1 42156e45fa999b242dc63c261e9253ce0dd810ab SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62
 DIST libpng-1.2.42.tar.bz2 670811 RMD160 37e297f139ec91017c92990ca4c0f376f548853d SHA1 e41cea7a6f5e3065f4289de3742db87ded05b99d SHA256 a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7
+DIST libpng-1.2.43.tar.bz2 678799 RMD160 6c108f06ae32a86ddd8571e9031f143932f19531 SHA1 28ea29305d233669ce565894a95151e4427d1f34 SHA256 c76d5540b0c09e130497be8906e0acadbbf9e299d0aa2258d912c4ee7cacc82a
 DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94e44149ab SHA1 d3d0df74b4f613e505d662134a7af5c0cc488108 SHA256 38e8434c7266126477237c4d9e6cbeca152089ab33c14a7761089b7970f8d336
 DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
 DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 EBUILD splashutils-1.5.4.3-r1.ebuild 7594 RMD160 41e2cf5d1bb3dab6f8763deabe62d4e75fe55c04 SHA1 99236658bd21a41f56868b89c5196396c2caf117 SHA256 ce6720c9a7cbec69db2e7d266da2a05d2ba9bdc89c6d48ae84d9bfaa179669ff
+EBUILD splashutils-1.5.4.3-r2.ebuild 7594 RMD160 27d8fed21bababa19a931fe9bc4d75a0af1ef4dc SHA1 ef959634be687d92eb6d3fd50dedf830ee938b2d SHA256 30dd458deaf1be95b310fd3e8beb19c1505ac90abde053ccd07c818232feee1e
 EBUILD splashutils-1.5.4.3.ebuild 7536 RMD160 8304b9aba69d5e880487aebe09e9a85ba6df5904 SHA1 8e723f00e5474d067617dc7bcf2a6a0c4c47b6b6 SHA256 13c18b7c2e841d89e9a4247d2b74472907e3720b5f963867d67465959a115b9c
-MISC ChangeLog 31049 RMD160 38312f05e843b4b6825deac476a465061611d686 SHA1 9aea448a3416488bbad8cdd97a7bf94c44744416 SHA256 901aec4dd9bc8a62e47df9ebb755e0809ded76c585e609b9c51d36660b35dbd6
+MISC ChangeLog 31201 RMD160 9491052e5d218b01215d3621fd6fde61e6237a3a SHA1 27818889148033f6928f3ab66e94da0eecc8ffa7 SHA256 25f211fd9d0d8cdf4047bff9c2b48751d6de9a5a2de9299bb7765e28359a8f2c
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuNewwACgkQchej4aZK9/dDBQCfR+H9oD8+wkV1g+37iFrNgYA2
-F4gAni9kpwGHp7kbT2urZLFsjncUklFr
-=l3/q
+iEYEARECAAYFAkuOwTQACgkQchej4aZK9/cIMgCfdRcNFw/bphUCzuV0ws5QiPlQ
+v2UAn2jGdNnAsda0dpWc5opNJ5OuLZWP
+=lmkh
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r2.ebuild
new file mode 100644 (file)
index 0000000..ecb9a68
--- /dev/null
@@ -0,0 +1,234 @@
+# Copyright 1999-2010 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.3-r2.ebuild,v 1.1 2010/03/03 20:06:57 spock Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib toolchain-funcs
+
+MISCSPLASH="miscsplashutils-0.1.8"
+GENTOOSPLASH="splashutils-gentoo-1.0.16"
+V_JPEG="8a"
+V_PNG="1.2.43"
+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 )
+       truetype? ( >=media-libs/freetype-2 )
+       png? ( >=media-libs/libpng-1.2.7 )
+       mng? ( media-libs/lcms media-libs/libmng )
+       >=media-libs/jpeg-6b:0
+       >=sys-apps/baselayout-1.9.4-r5
+       app-arch/cpio
+       media-gfx/fbgrab
+       !sys-apps/lcdsplash"
+DEPEND="${RDEPEND}
+       >=dev-libs/klibc-1.5
+       dev-util/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 "${S}"
+       ln -sf "${S}/src" "${WORKDIR}/core"
+
+       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
+
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-libjpeg.patch
+
+       cd "${SG}"
+       if has_version ">=sys-apps/openrc-0.4.0"; then
+               epatch "${FILESDIR}"/splashutils-openrc-0.4-fix.patch
+               if has_version ">=sys-apps/openrc-0.4.3"; then
+                       epatch "${FILESDIR}"/splashutils-openrc-0.4.3-runlevel-fix.patch
+               fi
+       fi
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-fix_rc_var.patch
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch
+       epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch
+       cd "${S}"
+
+       rm -f m4/*
+       eautoreconf
+}
+
+src_configure() {
+       tc-export CC
+       cd "${SM}"
+       emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
+
+       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) || die "failed to configure splashutils"
+}
+
+src_compile() {
+       emake CC="${CC}" STRIP="true" || die "failed to build splashutils"
+
+       if has_version ">=sys-apps/baselayout-1.13.99"; then
+               cd "${SG}"
+               emake LIB=$(get_libdir) || die "failed to build the splash plugin"
+       fi
+}
+
+src_install() {
+       local LIB=$(get_libdir)
+
+       cd "${SM}"
+       make DESTDIR="${D}" LIB=${LIB} install || die
+
+       cd "${S}"
+       make DESTDIR="${D}" STRIP="true" install || die
+
+       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 || die "failed to install the splash plugin"
+       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}
+       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."
+}