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

Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: xorg-server-1.12.2.ebuild ChangeLog xorg-server-1.12.1.902.ebuild
Date: Tue, 29 May 2012 23:46:16
Message-Id: 20120529234602.4FC822004C@flycatcher.gentoo.org
1 chithanh 12/05/29 23:46:02
2
3 Modified: ChangeLog
4 Added: xorg-server-1.12.2.ebuild
5 Removed: xorg-server-1.12.1.902.ebuild
6 Log:
7 Version bump. Add patch for bug #402285.
8
9 (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.652 x11-base/xorg-server/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.652&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.652&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.651&r2=1.652
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
21 retrieving revision 1.651
22 retrieving revision 1.652
23 diff -u -r1.651 -r1.652
24 --- ChangeLog 29 May 2012 13:29:47 -0000 1.651
25 +++ ChangeLog 29 May 2012 23:46:01 -0000 1.652
26 @@ -1,6 +1,13 @@
27 # ChangeLog for x11-base/xorg-server
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.651 2012/05/29 13:29:47 chithanh Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.652 2012/05/29 23:46:01 chithanh Exp $
31 +
32 +*xorg-server-1.12.2 (29 May 2012)
33 +
34 + 29 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
35 + +files/xorg-server-1.12-xf86edidmodes-array-bounds.patch,
36 + +xorg-server-1.12.2.ebuild, -xorg-server-1.12.1.902.ebuild:
37 + Version bump. Add patch for bug #402285.
38
39 *xorg-server-1.10.6-r1 (29 May 2012)
40
41
42
43
44 1.1 x11-base/xorg-server/xorg-server-1.12.2.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild?rev=1.1&content-type=text/plain
48
49 Index: xorg-server-1.12.2.ebuild
50 ===================================================================
51 # Copyright 1999-2012 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.1 2012/05/29 23:46:01 chithanh Exp $
54
55 EAPI=4
56
57 XORG_DOC=doc
58 inherit xorg-2 multilib versionator
59 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
60
61 DESCRIPTION="X.Org X servers"
62 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
63
64 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
65 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
66
67 RDEPEND=">=app-admin/eselect-opengl-1.0.8
68 dev-libs/openssl
69 media-libs/freetype
70 >=x11-apps/iceauth-1.0.2
71 >=x11-apps/rgb-1.0.3
72 >=x11-apps/xauth-1.0.3
73 x11-apps/xkbcomp
74 >=x11-libs/libpciaccess-0.12.901
75 >=x11-libs/libXau-1.0.4
76 >=x11-libs/libXdmcp-1.0.2
77 >=x11-libs/libXfont-1.4.2
78 >=x11-libs/libxkbfile-1.0.4
79 >=x11-libs/pixman-0.21.8
80 >=x11-libs/xtrans-1.2.2
81 >=x11-misc/xbitmaps-1.0.1
82 >=x11-misc/xkeyboard-config-2.4.1-r3
83 dmx? (
84 x11-libs/libXt
85 >=x11-libs/libdmx-1.0.99.1
86 >=x11-libs/libX11-1.1.5
87 >=x11-libs/libXaw-1.0.4
88 >=x11-libs/libXext-1.0.99.4
89 >=x11-libs/libXfixes-5.0
90 >=x11-libs/libXi-1.2.99.1
91 >=x11-libs/libXmu-1.0.3
92 x11-libs/libXrender
93 >=x11-libs/libXres-1.0.3
94 >=x11-libs/libXtst-1.0.99.2
95 )
96 kdrive? (
97 >=x11-libs/libXext-1.0.5
98 x11-libs/libXv
99 )
100 !minimal? (
101 >=x11-libs/libX11-1.1.5
102 >=x11-libs/libXext-1.0.5
103 >=media-libs/mesa-7.8_rc[nptl=]
104 )
105 tslib? ( >=x11-libs/tslib-1.0 )
106 udev? ( >=sys-fs/udev-150 )
107 >=x11-apps/xinit-1.3
108 selinux? ( sec-policy/selinux-xserver )"
109
110 DEPEND="${RDEPEND}
111 sys-devel/flex
112 >=x11-proto/bigreqsproto-1.1.0
113 >=x11-proto/compositeproto-0.4
114 >=x11-proto/damageproto-1.1
115 >=x11-proto/fixesproto-5.0
116 >=x11-proto/fontsproto-2.0.2
117 >=x11-proto/glproto-1.4.14
118 >=x11-proto/inputproto-2.1.99.3
119 >=x11-proto/kbproto-1.0.3
120 >=x11-proto/randrproto-1.2.99.3
121 >=x11-proto/recordproto-1.13.99.1
122 >=x11-proto/renderproto-0.11
123 >=x11-proto/resourceproto-1.0.2
124 >=x11-proto/scrnsaverproto-1.1
125 >=x11-proto/trapproto-3.4.3
126 >=x11-proto/videoproto-2.2.2
127 >=x11-proto/xcmiscproto-1.2.0
128 >=x11-proto/xextproto-7.1.99
129 >=x11-proto/xf86dgaproto-2.0.99.1
130 >=x11-proto/xf86rushproto-1.1.2
131 >=x11-proto/xf86vidmodeproto-2.2.99.1
132 >=x11-proto/xineramaproto-1.1.3
133 >=x11-proto/xproto-7.0.22
134 dmx? (
135 >=x11-proto/dmxproto-2.2.99.1
136 doc? (
137 || (
138 www-client/links
139 www-client/lynx
140 www-client/w3m
141 )
142 )
143 )
144 !minimal? (
145 >=x11-proto/xf86driproto-2.1.0
146 >=x11-proto/dri2proto-2.6
147 >=x11-libs/libdrm-2.4.20
148 )"
149
150 PDEPEND="
151 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
152
153 REQUIRED_USE="!minimal? (
154 || ( ${IUSE_SERVERS} )
155 )"
156
157 #UPSTREAMED_PATCHES=(
158 # "${WORKDIR}/patches/"
159 #)
160
161 PATCHES=(
162 "${UPSTREAMED_PATCHES[@]}"
163 "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
164 "${FILESDIR}"/${PN}-1.12-xf86edidmodes-array-bounds.patch
165 )
166
167 pkg_pretend() {
168 # older gcc is not supported
169 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
170 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
171 }
172
173 pkg_setup() {
174 xorg-2_pkg_setup
175
176 # localstatedir is used for the log location; we need to override the default
177 # from ebuild.sh
178 # sysconfdir is used for the xorg.conf location; same applies
179 # --enable-install-setuid needed because sparcs default off
180 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
181 # package it somewhere
182 XORG_CONFIGURE_OPTIONS=(
183 $(use_enable ipv6)
184 $(use_enable dmx)
185 $(use_enable kdrive)
186 $(use_enable kdrive kdrive-kbd)
187 $(use_enable kdrive kdrive-mouse)
188 $(use_enable kdrive kdrive-evdev)
189 $(use_enable tslib)
190 $(use_enable !minimal record)
191 $(use_enable !minimal xfree86-utils)
192 $(use_enable !minimal install-libxf86config)
193 $(use_enable !minimal dri)
194 $(use_enable !minimal dri2)
195 $(use_enable !minimal glx)
196 $(use_enable xnest)
197 $(use_enable xorg)
198 $(use_enable xvfb)
199 $(use_enable nptl glx-tls)
200 $(use_enable udev config-udev)
201 $(use_with doc doxygen)
202 $(use_with doc xmlto)
203 --sysconfdir=/etc/X11
204 --localstatedir=/var
205 --enable-install-setuid
206 --with-fontrootdir=/usr/share/fonts
207 --with-xkb-output=/var/lib/xkb
208 --disable-config-hal
209 --without-dtrace
210 --without-fop
211 --with-os-vendor=Gentoo
212 )
213
214 # Xorg-server requires includes from OS mesa which are not visible for
215 # users of binary drivers.
216 mkdir -p "${T}/mesa-symlinks/GL"
217 for i in gl glx glxmd glxproto glxtokens; do
218 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
219 done
220 for i in glext glxext; do
221 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
222 done
223 append-cppflags "-I${T}/mesa-symlinks"
224 }
225
226 src_install() {
227 xorg-2_src_install
228
229 dynamic_libgl_install
230
231 server_based_install
232
233 if ! use minimal && use xorg; then
234 # Install xorg.conf.example into docs
235 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
236 fi
237
238 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
239 newinitd "${FILESDIR}"/xdm.initd-8 xdm
240 newconfd "${FILESDIR}"/xdm.confd-4 xdm
241
242 # install the @x11-module-rebuild set for Portage
243 insinto /usr/share/portage/config/sets
244 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
245 }
246
247 pkg_postinst() {
248 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
249 eselect opengl set xorg-x11 --use-old
250
251 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
252 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
253 ewarn "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 ewarn "or using sets from portage-2.2:"
261 ewarn " emerge @x11-module-rebuild"
262 fi
263 }
264
265 pkg_postrm() {
266 # Get rid of module dir to ensure opengl-update works properly
267 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
268 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
269 fi
270 }
271
272 dynamic_libgl_install() {
273 # next section is to setup the dynamic libGL stuff
274 ebegin "Moving GL files for dynamic switching"
275 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
276 local x=""
277 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
278 if [ -f ${x} -o -L ${x} ]; then
279 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
280 fi
281 done
282 eend 0
283 }
284
285 server_based_install() {
286 if ! use xorg; then
287 rm "${D}"/usr/share/man/man1/Xserver.1x \
288 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
289 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
290 "${D}"/usr/share/man/man1/Xserver.1x
291 fi
292 }
Report Message
Find on MARC Find on Google Groups