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