Gentoo Archives: gentoo-commits

From: "Michael Januszewski (spock)" <spock@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.ebuild
Date: Mon, 25 Feb 2008 23:04:00
Message-Id: E1JTmMX-0003iz-2E@stork.gentoo.org
1 spock 08/02/25 23:03:57
2
3 Modified: ChangeLog
4 Added: splashutils-1.5.4.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.1.4.4)
8
9 Revision Changes Path
10 1.130 media-gfx/splashutils/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.130&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.130&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?r1=1.129&r2=1.130
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
19 retrieving revision 1.129
20 retrieving revision 1.130
21 diff -u -r1.129 -r1.130
22 --- ChangeLog 19 Feb 2008 22:57:13 -0000 1.129
23 +++ ChangeLog 25 Feb 2008 23:03:56 -0000 1.130
24 @@ -1,6 +1,12 @@
25 # ChangeLog for media-gfx/splashutils
26 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.129 2008/02/19 22:57:13 opfer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.130 2008/02/25 23:03:56 spock Exp $
29 +
30 +*splashutils-1.5.4 (25 Feb 2008)
31 +
32 + 25 Feb 2008; MichaƂ Januszewski <spock@g.o>
33 + +splashutils-1.5.4.ebuild:
34 + Version bump.
35
36 19 Feb 2008; Christian Faulhammer <opfer@g.o>
37 splashutils-1.5.3.4.ebuild:
38
39
40
41 1.1 media-gfx/splashutils/splashutils-1.5.4.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.ebuild?rev=1.1&content-type=text/plain
45
46 Index: splashutils-1.5.4.ebuild
47 ===================================================================
48 # Copyright 1999-2008 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.ebuild,v 1.1 2008/02/25 23:03:56 spock Exp $
51
52 EAPI="1"
53
54 inherit eutils multilib toolchain-funcs
55
56 MISCSPLASH="miscsplashutils-0.1.8"
57 GENTOOSPLASH="splashutils-gentoo-1.0.12"
58 V_JPEG="6b"
59 V_PNG="1.2.18"
60 V_ZLIB="1.2.3"
61 V_FT="2.3.5"
62
63 ZLIBSRC="libs/zlib-${V_ZLIB}"
64 LPNGSRC="libs/libpng-${V_PNG}"
65 JPEGSRC="libs/jpeg-${V_JPEG}"
66 FT2SRC="libs/freetype-${V_FT}"
67
68 IUSE="hardened +png +truetype +mng gpm fbcondecor"
69
70 DESCRIPTION="Framebuffer splash utilities."
71 HOMEPAGE="http://fbsplash.berlios.de"
72 SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
73 mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
74 mirror://gentoo/${MISCSPLASH}.tar.bz2
75 mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
76 ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
77 mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
78 http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"
79
80 LICENSE="GPL-2"
81 SLOT="0"
82 KEYWORDS="~amd64 ~ppc ~x86"
83 RDEPEND="gpm? ( sys-libs/gpm )
84 truetype? ( >=media-libs/freetype-2 )
85 png? ( >=media-libs/libpng-1.2.7 )
86 mng? ( media-libs/lcms media-libs/libmng )
87 >=media-libs/jpeg-6b
88 >=sys-apps/baselayout-1.9.4-r5
89 app-arch/cpio
90 media-gfx/fbgrab"
91 DEPEND="${RDEPEND}
92 >=dev-libs/klibc-1.5
93 dev-util/pkgconfig"
94
95 S="${WORKDIR}/${P/_/-}"
96 SG="${WORKDIR}/${GENTOOSPLASH}"
97 SM="${WORKDIR}/${MISCSPLASH}"
98
99 pkg_setup() {
100 if use hardened; then
101 ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
102 ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
103 ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
104 ewarn "the splash kernel helper."
105 fi
106 }
107
108 src_unpack() {
109 unpack ${A}
110
111 mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
112 # We need to delete the Makefile and let it be rebuilt when splashutils
113 # is being configured. Either that, or we end up with a segfaulting kernel
114 # helper.
115 rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
116
117 cd "${S}"
118 ln -sf "${S}/src" "${WORKDIR}/core"
119
120 if built_with_use sys-devel/gcc vanilla ; then
121 ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
122 ewarn "splashutils, you're on your own, as this configuration is not supported."
123 else
124 # This should make splashutils compile on systems with hardened GCC.
125 sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
126 fi
127
128 if ! use truetype ; then
129 sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
130 fi
131 }
132
133 src_compile() {
134 cd "${SM}"
135 emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
136
137 cd "${S}"
138 econf \
139 $(use_with png) \
140 $(use_with mng) \
141 $(use_with gpm) \
142 $(use_with truetype ttf) \
143 $(use_with truetype ttf-kernel) \
144 $(use_enable fbcondecor) \
145 --with-freetype2-src=${FT2SRC} \
146 --with-jpeg-src=${JPEGSRC} \
147 --with-lpng-src=${LPNGSRC} \
148 --with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
149
150 emake -j1 || die "failed to build splashutils"
151
152 if has_version ">=sys-apps/baselayout-1.13.99"; then
153 cd "${SG}"
154 emake LIB=$(get_libdir) || die "failed to build the splash plugin"
155 fi
156 }
157
158 src_install() {
159 local LIB=$(get_libdir)
160
161 cd "${SM}"
162 make DESTDIR="${D}" LIB=${LIB} install || die
163
164 cd "${S}"
165 make DESTDIR="${D}" install || die
166
167 mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
168 gen_usr_ldscript libfbsplash.so
169
170 echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
171 doenvd 99splash
172
173 if use fbcondecor ; then
174 newinitd "${SG}"/init-fbcondecor fbcondecor
175 newconfd "${SG}"/fbcondecor.conf fbcondecor
176 fi
177 newconfd "${SG}"/splash.conf splash
178
179 insinto /usr/share/${PN}
180 doins "${SG}"/initrd.splash
181
182 insinto /etc/splash
183 doins "${SM}"/fbtruetype/luxisri.ttf
184
185 if has_version ">=sys-apps/baselayout-1.13.99"; then
186 cd "${SG}"
187 make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
188 else
189 cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
190 fi
191
192 sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
193 keepdir /${LIB}/splash/{tmp,cache,bin}
194 dosym /${LIB}/splash/bin/fbres /sbin/fbres
195 }
196
197 pkg_postinst() {
198 if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
199 elog "This package has been designed with udev in mind. Other solutions, such as"
200 elog "devfs or a static /dev tree might work, but are generally discouraged and"
201 elog "not supported. If you decide to switch to udev, you might want to have a"
202 elog "look at 'The Gentoo udev Guide', which can be found at"
203 elog " http://www.gentoo.org/doc/en/udev-guide.xml"
204 elog ""
205 fi
206
207 if has_version '<media-gfx/splashutils-1.0' ; then
208 elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
209 elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
210 elog ""
211 fi
212
213 if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
214 elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
215 elog "is optional and dependent on the the 'fbcondecor' USE flag. If you wish"
216 elog "to use fbcondecor, run:"
217 elog " echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
218 elog "and re-emerge splashutils."
219 fi
220
221 if ! test -f /proc/cmdline ||
222 ! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
223 elog "It is required that you add 'console=tty1' to your kernel"
224 elog "command line parameters."
225 elog ""
226 elog "After these modifications, the relevant part of the kernel command"
227 elog "line might look like:"
228 elog " splash=silent,fadein,theme:emergence console=tty1"
229 elog ""
230 fi
231
232 if ! has_version 'media-gfx/splash-themes-livecd' &&
233 ! has_version 'media-gfx/splash-themes-gentoo'; then
234 elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
235 elog "core splashutils package. To get some themes you might want to emerge:"
236 elog " media-gfx/splash-themes-livecd"
237 elog " media-gfx/splash-themes-gentoo"
238 fi
239
240 elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
241 elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called"
242 elog "'fbcondecor'. Make sure you update your system. See:"
243 elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
244 elog "for further info about the name changes."
245 elog ""
246 elog "Also note that splash_util has now been split into splash_util, fbsplashd"
247 elog "and fbcondecor_ctl."
248 }
249
250
251
252 --
253 gentoo-commits@l.g.o mailing list