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