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.ebuild
Date: Sun, 25 Nov 2007 12:16:51
Message-Id: E1IwGPm-0005Xa-JF@stork.gentoo.org
1 spock 07/11/25 12:16:46
2
3 Modified: ChangeLog
4 Added: splashutils-1.5.3.ebuild
5 Log:
6 Version bump.
7 (Portage version: 2.1.4_rc3)
8
9 Revision Changes Path
10 1.117 media-gfx/splashutils/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.117&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?rev=1.117&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/ChangeLog?r1=1.116&r2=1.117
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
19 retrieving revision 1.116
20 retrieving revision 1.117
21 diff -u -r1.116 -r1.117
22 --- ChangeLog 21 Oct 2007 20:33:01 -0000 1.116
23 +++ ChangeLog 25 Nov 2007 12:16:46 -0000 1.117
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.116 2007/10/21 20:33:01 beandog Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.117 2007/11/25 12:16:46 spock Exp $
29 +
30 +*splashutils-1.5.3 (25 Nov 2007)
31 +
32 + 25 Nov 2007; Michał Januszewski <spock@g.o>
33 + +splashutils-1.5.3.ebuild:
34 + Version bump.
35
36 21 Oct 2007; Steve Dibb <beandog@g.o> splashutils-1.5.2.ebuild,
37 splashutils-1.5.2.1.ebuild:
38
39
40
41 1.1 media-gfx/splashutils/splashutils-1.5.3.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.3.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/splashutils/splashutils-1.5.3.ebuild?rev=1.1&content-type=text/plain
45
46 Index: splashutils-1.5.3.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.3.ebuild,v 1.1 2007/11/25 12:16:46 spock Exp $
51
52 inherit eutils multilib toolchain-funcs
53
54 MISCSPLASH="miscsplashutils-0.1.8"
55 GENTOOSPLASH="splashutils-gentoo-1.0.9"
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 fbcondecor"
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 mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
109 # We need to delete the Makefile and let it be rebuilt when splashutils
110 # is being configured. Either that, or we end up with a segfaulting kernel
111 # helper.
112 rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
113
114 cd "${S}"
115 ln -sf "${S}" "${WORKDIR}/core"
116
117 if built_with_use sys-devel/gcc vanilla ; then
118 ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
119 ewarn "splashutils, you're on your own, as this configuration is not supported."
120 else
121 # This should make splashutils compile on systems with hardened GCC.
122 sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
123 fi
124
125 if ! use truetype ; then
126 sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
127 fi
128 }
129
130 src_compile() {
131 cd "${SM}"
132 emake LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"
133
134 cd "${S}"
135 econf \
136 $(use_with png) \
137 $(use_with mng) \
138 $(use_with gpm) \
139 $(use_with truetype ttf) \
140 $(use_with truetype ttf-kernel) \
141 $(use_enable fbcondecor) \
142 --with-freetype2-src=${FT2SRC} \
143 --with-jpeg-src=${JPEGSRC} \
144 --with-lpng-src=${LPNGSRC} \
145 --with-zlib-src=${ZLIBSRC} || die "failed to configure splashutils"
146
147 emake -j1 || die "failed to build splashutils"
148
149 if has_version ">=sys-apps/baselayout-1.13.99"; then
150 cd "${SG}"
151 emake LIB=$(get_libdir) || die "failed to build the splash plugin"
152 fi
153 }
154
155 src_install() {
156 local LIB=$(get_libdir)
157
158 cd "${SM}"
159 make DESTDIR="${D}" LIB=${LIB} install || die
160
161 cd "${S}"
162 make DESTDIR="${D}" install || die
163
164 mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
165 gen_usr_ldscript libfbsplash.so
166
167 echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
168 doenvd 99splash
169
170 if use fbcondecor ; then
171 newinitd "${SG}"/init-fbcondecor fbcondecor
172 newconfd "${SG}"/fbcondecor.conf fbcondecor
173 fi
174 newconfd "${SG}"/splash.conf splash
175
176 insinto /usr/share/${PN}
177 doins "${SG}"/initrd.splash
178
179 insinto /etc/splash
180 doins "${SM}"/fbtruetype/luxisri.ttf
181
182 dodoc docs/* README AUTHORS
183
184 if has_version ">=sys-apps/baselayout-1.13.99"; then
185 cd "${SG}"
186 make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
187 else
188 cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/splash-functions.sh
189 fi
190
191 sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
192 keepdir /${LIB}/splash/{tmp,cache,bin}
193 dosym /${LIB}/splash/bin/fbres /sbin/fbres
194 }
195
196 pkg_postinst() {
197 if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
198 elog "This package has been designed with udev in mind. Other solutions, such as"
199 elog "devfs or a static /dev tree might work, but are generally discouraged and"
200 elog "not supported. If you decide to switch to udev, you might want to have a"
201 elog "look at 'The Gentoo udev Guide', which can be found at"
202 elog " http://www.gentoo.org/doc/en/udev-guide.xml"
203 elog ""
204 fi
205
206 if has_version '<media-gfx/splashutils-1.0' ; then
207 elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
208 elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
209 elog ""
210 fi
211
212 if ! test -f /proc/cmdline ||
213 ! egrep -q '(console|CONSOLE)=(tty1|/dev/tty1)' /proc/cmdline ; then
214 elog "It is required that you add 'console=tty1' to your kernel"
215 elog "command line parameters."
216 elog ""
217 elog "After these modifications, the relevant part of the kernel command"
218 elog "line might look like:"
219 elog " splash=silent,fadein,theme:emergence console=tty1"
220 elog ""
221 fi
222
223 if ! has_version 'media-gfx/splash-themes-livecd' &&
224 ! has_version 'media-gfx/splash-themes-gentoo'; then
225 elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
226 elog "core splashutils package. To get some themes you might want to emerge:"
227 elog " media-gfx/splash-themes-livecd"
228 elog " media-gfx/splash-themes-gentoo"
229 fi
230
231 elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
232 elog "'fbcondecor'. Accordingly, the old 'splash' initscript is now called"
233 elog "'fbcondecor'. Make sure you update your system. See:"
234 elog " http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
235 elog "for further info about the name changes."
236 elog ""
237 elog "Also note that splash_util has now been split into splash_util, fbsplashd"
238 elog "and fbcondecor_ctl."
239 }
240
241
242
243 --
244 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups