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