Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

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