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