1 |
remi 09/09/28 08:18:38 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xorg-server-1.6.4.ebuild |
5 |
Log: |
6 |
x11-base/xorg-server: bump to 1.6.4 |
7 |
(Portage version: 2.2_rc42/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.447 x11-base/xorg-server/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.447&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.447&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.446&r2=1.447 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
19 |
retrieving revision 1.446 |
20 |
retrieving revision 1.447 |
21 |
diff -u -r1.446 -r1.447 |
22 |
--- ChangeLog 28 Sep 2009 07:41:02 -0000 1.446 |
23 |
+++ ChangeLog 28 Sep 2009 08:18:37 -0000 1.447 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-base/xorg-server |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.446 2009/09/28 07:41:02 remi Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.447 2009/09/28 08:18:37 remi Exp $ |
29 |
+ |
30 |
+*xorg-server-1.6.4 (28 Sep 2009) |
31 |
+ |
32 |
+ 28 Sep 2009; Rémi Cardona <remi@g.o> +xorg-server-1.6.4.ebuild: |
33 |
+ bump to 1.6.4 |
34 |
|
35 |
28 Sep 2009; Rémi Cardona <remi@g.o> |
36 |
-files/1.2.0-fix-amd-cpu-detection.patch, |
37 |
|
38 |
|
39 |
|
40 |
1.1 x11-base/xorg-server/xorg-server-1.6.4.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.4.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.4.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: xorg-server-1.6.4.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2009 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.4.ebuild,v 1.1 2009/09/28 08:18:37 remi Exp $ |
50 |
|
51 |
EAPI="2" |
52 |
|
53 |
# Must be before x-modular eclass is inherited |
54 |
#SNAPSHOT="yes" |
55 |
|
56 |
inherit x-modular multilib versionator |
57 |
|
58 |
SRC_URI="${SRC_URI}" |
59 |
# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2 |
60 |
|
61 |
OPENGL_DIR="xorg-x11" |
62 |
|
63 |
DESCRIPTION="X.Org X servers" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
65 |
|
66 |
IUSE_SERVERS="dmx kdrive xorg" |
67 |
IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" |
68 |
RDEPEND="hal? ( sys-apps/hal ) |
69 |
tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) |
70 |
dev-libs/openssl |
71 |
>=x11-libs/libXfont-1.4.0 |
72 |
>=x11-libs/xtrans-1.2.3 |
73 |
>=x11-libs/libXau-1.0.4 |
74 |
>=x11-libs/libXext-1.0.4 |
75 |
>=x11-libs/libX11-1.1.5 |
76 |
>=x11-libs/libxkbfile-1.0.4 |
77 |
>=x11-libs/libXdmcp-1.0.2 |
78 |
>=x11-libs/libXmu-1.0.3 |
79 |
>=x11-libs/libXrender-0.9.4 |
80 |
>=x11-libs/libXi-1.2.1 |
81 |
>=x11-libs/pixman-0.14.0 |
82 |
media-libs/freetype |
83 |
>=x11-misc/xbitmaps-1.0.1 |
84 |
>=x11-misc/xkeyboard-config-1.4 |
85 |
x11-apps/xkbcomp |
86 |
>=x11-apps/iceauth-1.0.2 |
87 |
>=x11-apps/rgb-1.0.3 |
88 |
>=x11-apps/xauth-1.0.3 |
89 |
>=x11-apps/xinit-1.0.8-r3 |
90 |
>=app-admin/eselect-opengl-1.0.8 |
91 |
>=x11-libs/libXaw-1.0.5 |
92 |
>=x11-libs/libXpm-3.5.7 |
93 |
>=x11-libs/libpciaccess-0.10.3 |
94 |
dmx? ( |
95 |
>=x11-libs/libdmx-1.0.2 |
96 |
>=x11-libs/libXfixes-4.0.3 |
97 |
) |
98 |
!minimal? ( |
99 |
>=x11-libs/libXtst-1.0.3 |
100 |
>=x11-libs/libXres-1.0.3 |
101 |
>=media-libs/mesa-7.3_rc1[nptl=] |
102 |
) |
103 |
>=x11-libs/libxkbui-1.0.2 |
104 |
kdrive? ( sdl? ( media-libs/libsdl ) )" |
105 |
# Xres is dmx-dependent |
106 |
# Xaw is dmx-dependent |
107 |
# Xpm is dmx-dependent, pulls in Xt |
108 |
# xkbcomp is launched at startup but not checked by ./configure |
109 |
DEPEND="${RDEPEND} |
110 |
!net-dialup/dtrace |
111 |
sys-devel/flex |
112 |
>=x11-proto/randrproto-1.2.99.4 |
113 |
>=x11-proto/renderproto-0.9.3 |
114 |
>=x11-proto/fixesproto-4 |
115 |
>=x11-proto/damageproto-1.1 |
116 |
>=x11-proto/xextproto-7.0.4 |
117 |
>=x11-proto/xproto-7.0.14 |
118 |
>=x11-proto/xf86dgaproto-2.0.3 |
119 |
>=x11-proto/xf86rushproto-1.1.2 |
120 |
>=x11-proto/xf86vidmodeproto-2.2.2 |
121 |
>=x11-proto/compositeproto-0.4 |
122 |
>=x11-proto/recordproto-1.13.2 |
123 |
>=x11-proto/resourceproto-1.0.2 |
124 |
>=x11-proto/videoproto-2.2.2 |
125 |
>=x11-proto/scrnsaverproto-1.1.0 |
126 |
>=x11-proto/trapproto-3.4.3 |
127 |
>=x11-proto/xineramaproto-1.1.2 |
128 |
>=x11-proto/fontsproto-2.0.2 |
129 |
>=x11-proto/kbproto-1.0.3 |
130 |
>=x11-proto/inputproto-1.5.0 |
131 |
>=x11-proto/bigreqsproto-1.0.2 |
132 |
>=x11-proto/xcmiscproto-1.1.2 |
133 |
>=x11-proto/glproto-1.4.9 |
134 |
dmx? ( >=x11-proto/dmxproto-2.2.2 ) |
135 |
!minimal? ( |
136 |
>=x11-proto/xf86driproto-2.0.4 |
137 |
>=x11-proto/dri2proto-2.1 |
138 |
>=x11-libs/libdrm-2.3 |
139 |
)" |
140 |
|
141 |
PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
142 |
LICENSE="${LICENSE} MIT" |
143 |
|
144 |
EPATCH_FORCE="yes" |
145 |
EPATCH_SUFFIX="patch" |
146 |
|
147 |
# These have been sent upstream |
148 |
#UPSTREAMED_PATCHES=( |
149 |
# "${WORKDIR}/patches/" |
150 |
# ) |
151 |
|
152 |
PATCHES=( |
153 |
"${UPSTREAMED_PATCHES[@]}" |
154 |
) |
155 |
|
156 |
pkg_setup() { |
157 |
use minimal || ensure_a_server_is_building |
158 |
|
159 |
# SDL only available in kdrive build |
160 |
if use kdrive && use sdl; then |
161 |
conf_opts="${conf_opts} --enable-xsdl" |
162 |
else |
163 |
conf_opts="${conf_opts} --disable-xsdl" |
164 |
fi |
165 |
|
166 |
# localstatedir is used for the log location; we need to override the default |
167 |
# from ebuild.sh |
168 |
# sysconfdir is used for the xorg.conf location; same applies |
169 |
# --enable-install-setuid needed because sparcs default off |
170 |
CONFIGURE_OPTIONS=" |
171 |
$(use_enable ipv6) |
172 |
$(use_enable dmx) |
173 |
$(use_enable kdrive) |
174 |
$(use_enable tslib) |
175 |
$(use_enable tslib xcalibrate) |
176 |
$(use_enable !minimal xvfb) |
177 |
$(use_enable !minimal xnest) |
178 |
$(use_enable !minimal record) |
179 |
$(use_enable !minimal xfree86-utils) |
180 |
$(use_enable !minimal install-libxf86config) |
181 |
$(use_enable !minimal dri) |
182 |
$(use_enable !minimal dri2) |
183 |
$(use_enable !minimal glx) |
184 |
$(use_enable xorg) |
185 |
$(use_enable nptl glx-tls) |
186 |
$(use_enable hal config-hal) |
187 |
--sysconfdir=/etc/X11 |
188 |
--localstatedir=/var |
189 |
--enable-install-setuid |
190 |
--with-fontdir=/usr/share/fonts |
191 |
--with-xkb-output=/var/lib/xkb |
192 |
--without-dtrace |
193 |
${conf_opts}" |
194 |
|
195 |
# (#121394) Causes window corruption |
196 |
filter-flags -fweb |
197 |
|
198 |
# Incompatible with GCC 3.x SSP on x86, bug #244352 |
199 |
if use x86 ; then |
200 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
201 |
filter-flags -fstack-protector |
202 |
fi |
203 |
fi |
204 |
|
205 |
OLD_IMPLEM="$(eselect opengl show)" |
206 |
eselect opengl set --impl-headers ${OPENGL_DIR} |
207 |
} |
208 |
|
209 |
src_install() { |
210 |
x-modular_src_install |
211 |
|
212 |
dynamic_libgl_install |
213 |
|
214 |
server_based_install |
215 |
|
216 |
# Install video mode files for system-config-display |
217 |
insinto /usr/share/xorg |
218 |
doins hw/xfree86/common/{extra,vesa}modes \ |
219 |
|| die "couldn't install extra modes" |
220 |
|
221 |
# Bug #151421 - this file is not built with USE="minimal" |
222 |
# Bug #151670 - this file is also not build if USE="-xorg" |
223 |
if ! use minimal && use xorg; then |
224 |
# Install xorg.conf.example |
225 |
insinto /etc/X11 |
226 |
doins hw/xfree86/xorg.conf.example \ |
227 |
|| die "couldn't install xorg.conf.example" |
228 |
fi |
229 |
} |
230 |
|
231 |
pkg_postinst() { |
232 |
switch_opengl_implem |
233 |
|
234 |
# Bug #135544 |
235 |
ewarn "Users of reduced blanking now need:" |
236 |
ewarn " Option \"ReducedBlanking\"" |
237 |
ewarn "In the relevant Monitor section(s)." |
238 |
ewarn "Make sure your reduced blanking modelines are safe!" |
239 |
|
240 |
echo |
241 |
ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5" |
242 |
ewarn "or earlier, because the ABI changed. If you cannot start X because" |
243 |
ewarn "of module version mismatch errors, this is your problem." |
244 |
|
245 |
echo |
246 |
ewarn "You can generate a list of all installed packages in the x11-drivers" |
247 |
ewarn "category using this command:" |
248 |
ewarn "emerge portage-utils; qlist -I -C x11-drivers/" |
249 |
|
250 |
ebeep 5 |
251 |
epause 10 |
252 |
} |
253 |
|
254 |
pkg_postrm() { |
255 |
# Get rid of module dir to ensure opengl-update works properly |
256 |
if ! has_version x11-base/xorg-server; then |
257 |
if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
258 |
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
259 |
fi |
260 |
fi |
261 |
} |
262 |
|
263 |
dynamic_libgl_install() { |
264 |
# next section is to setup the dynamic libGL stuff |
265 |
ebegin "Moving GL files for dynamic switching" |
266 |
dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
267 |
local x="" |
268 |
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
269 |
if [ -f ${x} -o -L ${x} ]; then |
270 |
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
271 |
fi |
272 |
done |
273 |
eend 0 |
274 |
} |
275 |
|
276 |
server_based_install() { |
277 |
if ! use xorg; then |
278 |
rm "${D}"/usr/share/man/man1/Xserver.1x \ |
279 |
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
280 |
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
281 |
"${D}"/usr/share/man/man1/Xserver.1x |
282 |
fi |
283 |
} |
284 |
|
285 |
switch_opengl_implem() { |
286 |
# Switch to the xorg implementation. |
287 |
# Use new opengl-update that will not reset user selected |
288 |
# OpenGL interface ... |
289 |
echo |
290 |
eselect opengl set ${OLD_IMPLEM} |
291 |
} |
292 |
|
293 |
ensure_a_server_is_building() { |
294 |
for server in ${IUSE_SERVERS}; do |
295 |
use ${server} && return; |
296 |
done |
297 |
eerror "You need to specify at least one server to build." |
298 |
eerror "Valid servers are: ${IUSE_SERVERS}." |
299 |
die "No servers were specified to build." |
300 |
} |