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: ChangeLog xorg-server-1.11.99.901.ebuild xorg-server-1.11.99.2.ebuild
Date: Sun, 01 Jan 2012 14:28:43
Message-Id: 20120101142833.0F4BB2004B@flycatcher.gentoo.org
1 chithanh 12/01/01 14:28:33
2
3 Modified: ChangeLog
4 Added: xorg-server-1.11.99.901.ebuild
5 Removed: xorg-server-1.11.99.2.ebuild
6 Log:
7 Version bump.
8
9 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.634 x11-base/xorg-server/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.634&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.634&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.633&r2=1.634
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
21 retrieving revision 1.633
22 retrieving revision 1.634
23 diff -u -r1.633 -r1.634
24 --- ChangeLog 27 Dec 2011 21:01:04 -0000 1.633
25 +++ ChangeLog 1 Jan 2012 14:28:32 -0000 1.634
26 @@ -1,6 +1,12 @@
27 # ChangeLog for x11-base/xorg-server
28 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.633 2011/12/27 21:01:04 maekke Exp $
30 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.634 2012/01/01 14:28:32 chithanh Exp $
32 +
33 +*xorg-server-1.11.99.901 (01 Jan 2012)
34 +
35 + 01 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
36 + -xorg-server-1.11.99.2.ebuild, +xorg-server-1.11.99.901.ebuild:
37 + Version bump.
38
39 27 Dec 2011; Markus Meier <maekke@g.o> xorg-server-1.11.2-r2.ebuild:
40 x86 stable, bug #394393
41
42
43
44 1.1 x11-base/xorg-server/xorg-server-1.11.99.901.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.99.901.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.99.901.ebuild?rev=1.1&content-type=text/plain
48
49 Index: xorg-server-1.11.99.901.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.11.99.901.ebuild,v 1.1 2012/01/01 14:28:32 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 ~x86-fbsd"
63
64 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
65 IUSE="${IUSE_SERVERS} ipv6 minimal nptl 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-1.4
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
109 DEPEND="${RDEPEND}
110 sys-devel/flex
111 >=x11-proto/bigreqsproto-1.1.0
112 >=x11-proto/compositeproto-0.4
113 >=x11-proto/damageproto-1.1
114 >=x11-proto/fixesproto-5.0
115 >=x11-proto/fontsproto-2.0.2
116 >=x11-proto/glproto-1.4.14
117 >=x11-proto/inputproto-2.1.99.3
118 >=x11-proto/kbproto-1.0.3
119 >=x11-proto/randrproto-1.2.99.3
120 >=x11-proto/recordproto-1.13.99.1
121 >=x11-proto/renderproto-0.11
122 >=x11-proto/resourceproto-1.0.2
123 >=x11-proto/scrnsaverproto-1.1
124 >=x11-proto/trapproto-3.4.3
125 >=x11-proto/videoproto-2.2.2
126 >=x11-proto/xcmiscproto-1.2.0
127 >=x11-proto/xextproto-7.1.99
128 >=x11-proto/xf86dgaproto-2.0.99.1
129 >=x11-proto/xf86rushproto-1.1.2
130 >=x11-proto/xf86vidmodeproto-2.2.99.1
131 >=x11-proto/xineramaproto-1.1.3
132 >=x11-proto/xproto-7.0.22
133 dmx? (
134 >=x11-proto/dmxproto-2.2.99.1
135 doc? (
136 || (
137 www-client/links
138 www-client/lynx
139 www-client/w3m
140 )
141 )
142 )
143 !minimal? (
144 >=x11-proto/xf86driproto-2.1.0
145 >=x11-proto/dri2proto-2.6
146 >=x11-libs/libdrm-2.4.20
147 )"
148
149 PDEPEND="
150 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
151
152 REQUIRED_USE="!minimal? (
153 || ( ${IUSE_SERVERS} )
154 )"
155
156 #UPSTREAMED_PATCHES=(
157 # "${WORKDIR}/patches/"
158 #)
159
160 PATCHES=(
161 "${UPSTREAMED_PATCHES[@]}"
162 "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
163 )
164
165 pkg_pretend() {
166 # older gcc is not supported
167 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
168 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
169 }
170
171 pkg_setup() {
172 xorg-2_pkg_setup
173
174 # localstatedir is used for the log location; we need to override the default
175 # from ebuild.sh
176 # sysconfdir is used for the xorg.conf location; same applies
177 # --enable-install-setuid needed because sparcs default off
178 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
179 # package it somewhere
180 XORG_CONFIGURE_OPTIONS=(
181 $(use_enable ipv6)
182 $(use_enable dmx)
183 $(use_enable kdrive)
184 $(use_enable kdrive kdrive-kbd)
185 $(use_enable kdrive kdrive-mouse)
186 $(use_enable kdrive kdrive-evdev)
187 $(use_enable tslib)
188 $(use_enable !minimal record)
189 $(use_enable !minimal xfree86-utils)
190 $(use_enable !minimal install-libxf86config)
191 $(use_enable !minimal dri)
192 $(use_enable !minimal dri2)
193 $(use_enable !minimal glx)
194 $(use_enable xnest)
195 $(use_enable xorg)
196 $(use_enable xvfb)
197 $(use_enable nptl glx-tls)
198 $(use_enable udev config-udev)
199 $(use_with doc doxygen)
200 $(use_with doc xmlto)
201 --sysconfdir=/etc/X11
202 --localstatedir=/var
203 --enable-install-setuid
204 --with-fontrootdir=/usr/share/fonts
205 --with-xkb-output=/var/lib/xkb
206 --disable-config-hal
207 --without-dtrace
208 --without-fop
209 --with-os-vendor=Gentoo
210 )
211
212 # Xorg-server requires includes from OS mesa which are not visible for
213 # users of binary drivers.
214 mkdir -p "${T}/mesa-symlinks/GL"
215 for i in gl glx glxmd glxproto glxtokens; do
216 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
217 done
218 for i in glext glxext; do
219 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
220 done
221 append-cppflags "-I${T}/mesa-symlinks"
222 }
223
224 src_install() {
225 xorg-2_src_install
226
227 dynamic_libgl_install
228
229 server_based_install
230
231 if ! use minimal && use xorg; then
232 # Install xorg.conf.example into docs
233 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
234 fi
235
236 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
237 newinitd "${FILESDIR}"/xdm.initd-5 xdm
238 newconfd "${FILESDIR}"/xdm.confd-4 xdm
239
240 # install the @x11-module-rebuild set for Portage
241 insinto /usr/share/portage/config/sets
242 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
243 }
244
245 pkg_postinst() {
246 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
247 eselect opengl set xorg-x11 --use-old
248
249 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
250 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
251 ewarn "because the ABI changed. If you cannot start X because"
252 ewarn "of module version mismatch errors, this is your problem."
253
254 echo
255 ewarn "You can generate a list of all installed packages in the x11-drivers"
256 ewarn "category using this command:"
257 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
258 ewarn "or using sets from portage-2.2:"
259 ewarn " emerge @x11-module-rebuild"
260 fi
261 }
262
263 pkg_postrm() {
264 # Get rid of module dir to ensure opengl-update works properly
265 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
266 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
267 fi
268 }
269
270 dynamic_libgl_install() {
271 # next section is to setup the dynamic libGL stuff
272 ebegin "Moving GL files for dynamic switching"
273 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
274 local x=""
275 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
276 if [ -f ${x} -o -L ${x} ]; then
277 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
278 fi
279 done
280 eend 0
281 }
282
283 server_based_install() {
284 if ! use xorg; then
285 rm "${D}"/usr/share/man/man1/Xserver.1x \
286 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
287 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
288 "${D}"/usr/share/man/man1/Xserver.1x
289 fi
290 }
Report Message
Find on MARC Find on Google Groups