Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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