From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Mar 2018 15:59:12 +0000 Subject: gentoo resync : 02.03.2018 --- media-gfx/splashutils/Manifest | 2 + .../files/splashutils-1.5.4.4-sysmacros.patch | 11 + .../splashutils/splashutils-1.5.4.4-r8.ebuild | 240 +++++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch create mode 100644 media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild (limited to 'media-gfx/splashutils') diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index 98677314024b..17f69765ed1c 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -4,6 +4,7 @@ AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 BLAKE2B 651afa1f81c8f132c47faa AUX splashutils-1.5.4.4-multi-keyboard.patch 10158 BLAKE2B 4aa0e5887fddd85ef8c3e9aee353df8365915051e97459d9ae670242e4e21017d0b51306cf601031e41971172cee29692e0bf1d440320d36455304b5b55dbf2c SHA512 71056d599f4465ef424444d717ce1597295e0228f548c69cb36ef617075af430b1ac50f5be27bca65a50ed9e7d0169ceb256dbc66cf4b635fd9f8310d32baeae AUX splashutils-1.5.4.4-no-la.patch 504 BLAKE2B 990b328d84b2fa95102c541deddf86410003fd28bd8a12f1ba6ac74b5b5bfb89870274c21905a57817c25e6db7b603bbcd24256973b3106c413bcd4f83f3a9d9 SHA512 e513e0440fa3383dd368c777ac96717ffe94b8dd2b87c36d0dc0daf890b0f7082234ff5086b4c34144c0589a2c45137ec43158605ce50e58879646cd2a68e1c0 AUX splashutils-1.5.4.4-sys-queue.patch 233 BLAKE2B 392d4ef1bc0590c1896062c4cbd8f85fcd926c22e9ae1879c055c43c6ace7ee072db45ef7df9d5ffaa2e64c69ef0369258a98a2dbb48008c63503eb3ebabdf9a SHA512 27181754bffb312360cc5834587a6cb68154cdac3a771956f3d4165db0cd079e884a7af5ee1910003882ad7b8835f8947ba9fc7dcc14800635206ac8bd7ada76 +AUX splashutils-1.5.4.4-sysmacros.patch 301 BLAKE2B 1d0cc9bff34dcd176255e0003cc61876f9c4023d8788d05570abaa64412d1c2d2335f17d354edebe198b40c1d3d4cb0f943641e16f65f81feaf38124122b2d56 SHA512 9b9ab646bec87373bed75fd44395819fb03d19b47457cd7e12de71705c3a1023e031906e4a0d67381301d4d2b322caab2723c30c620e64415724b8c204b6599a DIST freetype-2.3.12.tar.bz2 1453034 BLAKE2B f0b0da50ecd6685a5c0b645252f99399ddcdcf823b4ce712e861899dab41009308473f149646101ca59f597f99b8e7659a8605475d7c6c912a941cb76d9d65fd SHA512 becb0f138ee13181513d3f03b943f0a474e492cab151992fa78d0c84127819dc91ec6d2bd1528af7e111ab150b3a29104f2f7ab79650cebc35ce4d966b19f34b DIST jpegsrc.v8a.tar.gz 962018 BLAKE2B 6f776ca7cbe6b4d8095914f95f968cfef14e91f2b888fe92376d72c36b5b4fa72e9f1089611e2ad257bac5e77262e0523dde596f12305ccde35e51cfdea2d513 SHA512 4020e82e16b99189b1a50bad18b09616775559740b94a988692aa33f9302d4b5abe3ccaa30895b49e6950fb3d9a830deeb7df750d128ec5c7e1844583db4524d DIST libpng-1.4.3.tar.bz2 658335 BLAKE2B 21c6e134a4f0877543ae1b229a3d26348b4b8dcc7ea17a5874399c8736220969c726d64a07a8954fa9c948e4aa57802bf58a41c42a44003f4ac50ec5154198fb SHA512 aaa137ebc2312805d58caf19702d24a34ee81593d4250c4e807ce66ba7edb829926919cd0a2b0e5975421451c8eb6674798c06dbaf745175b16c9d3c92b63f61 @@ -12,4 +13,5 @@ DIST splashutils-gentoo-1.0.17.tar.bz2 15814 BLAKE2B 8c6e2fea3825e5821ab2a20d0f9 DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20f5d4f92e673f5639b674027d0e78496c06948026670e2073c9257a3a0134a18752cc1381b2ba2be2d89d66b711cc7ad68ee2b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2 EBUILD splashutils-1.5.4.4-r7.ebuild 6878 BLAKE2B 6f73a0e3a49677b336b16188f45b7d6592e08d446ef9d2de2969b7aeea8367695b1b0fe0d3b919f903a5753d60fa0cf9cea020e11614d700b422dd5321cf3610 SHA512 1b1e328e9b9b06b53d5e676c8dd79d339095194345f94fd135297bccde2afa5044c2a8c16b4ebdef523dce52b8a9075dceabdecc70765312b8baf959c9dd7713 +EBUILD splashutils-1.5.4.4-r8.ebuild 6938 BLAKE2B 9e17a33879ed4e399305e6e9f0ddd34311109bb4a28174e7f71f09c359c7d279b9a476c300383e5f0e4a4544a5af2ae28f5f1dde01cdda7b77a283bb17f4533a SHA512 ade8097914752e321d85380a6dcbe2b5f213b726114ec34fc978c3d9893a6ff8b6ea49725d8d012f45f95ea250f3948c6d0fa61137703f956c14b6980f78ebe4 MISC metadata.xml 508 BLAKE2B 821ba866d8e2913004e3eddafcedfb1663e01ca500b9335250863829ad3a2c4351ac1796ecfb78d6fa005f1349e6e01b725b41154444e597ba2e4c6792ba3df4 SHA512 6ad59793cd6d2c3542f447cf7d9557740758d276405c48a0cedd9c8258f8f7b88d110f8339c91ab57c1140c3a4fd96a7fb02ebebd84613f7b18c672b9bc6f194 diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch new file mode 100644 index 000000000000..7ed37ea6aff2 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-sysmacros.patch @@ -0,0 +1,11 @@ +--- src/common.c.old 2018-02-25 22:23:32.382369471 +0800 ++++ src/common.c 2018-02-25 22:23:02.236854316 +0800 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include + diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild new file mode 100644 index 000000000000..7abb3f77e4a5 --- /dev/null +++ b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild @@ -0,0 +1,240 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +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 gpm fbcondecor" + +DESCRIPTION="Framebuffer splash utilities" +HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/" +SRC_URI=" + mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2 + mirror://sourceforge/fbsplash.berlios/${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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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] + sys-libs/zlib[static-libs(+)] + ) + virtual/jpeg:0[static-libs] + app-arch/cpio + media-gfx/fbgrab + !sys-apps/lcdsplash + sys-apps/openrc" + +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" + epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch" + + if use truetype ; then + cd "${SM}" + epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" + cd "${WORKDIR}" + epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch" + fi + + cd "${S}" + ln -sf "${S}/src" "${WORKDIR}/core" + + #epatch "${FILESDIR}/${P}-bzip2.patch" + epatch "${FILESDIR}/${P}-multi-keyboard.patch" + # Bug #557126 + epatch "${FILESDIR}/${P}-no-la.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/* + epatch_user + export PKG_CONFIG="pkg-config --static" + eautoreconf + epatch "${FILESDIR}"/splashutils-1.5.4.4-sysmacros.patch +} + +src_configure() { + tc-export CC + cd "${SM}" + emake CC="${CC}" LIB=$(get_libdir) STRIP=true + + cd "${S}" + econf \ + $(use_with png) \ + --without-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" + + cd "${SG}" + emake LIB=$(get_libdir) +} + +src_install() { + local LIB=$(get_libdir) + + cd "${SM}" + emake DESTDIR="${D}" LIB=${LIB} install + + cd "${S}" + emake 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 + + cd "${SG}" + make DESTDIR="${D}" LIB=${LIB} install + prune_libtool_files + + 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 virtual/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 " https://wiki.gentoo.org/wiki/Udev" + 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 +} -- cgit v1.2.3