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.1.ebuild ChangeLog
Date: Tue, 01 May 2012 22:09:03
Message-Id: 20120501220846.48BC52004B@flycatcher.gentoo.org
1 chithanh 12/05/01 22:08:46
2
3 Modified: ChangeLog
4 Added: xorg-server-1.12.1.ebuild
5 Log:
6 Version bump, bug #413371.
7
8 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.647 x11-base/xorg-server/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.647&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.647&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.646&r2=1.647
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
20 retrieving revision 1.646
21 retrieving revision 1.647
22 diff -u -r1.646 -r1.647
23 --- ChangeLog 20 Mar 2012 16:02:52 -0000 1.646
24 +++ ChangeLog 1 May 2012 22:08:46 -0000 1.647
25 @@ -1,6 +1,12 @@
26 # ChangeLog for x11-base/xorg-server
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.646 2012/03/20 16:02:52 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.647 2012/05/01 22:08:46 chithanh Exp $
30 +
31 +*xorg-server-1.12.1 (01 May 2012)
32 +
33 + 01 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
34 + +files/xdm.initd-8, +xorg-server-1.12.1.ebuild:
35 + Version bump, bug #413371.
36
37 *xorg-server-1.12.0-r1 (20 Mar 2012)
38
39
40
41
42 1.1 x11-base/xorg-server/xorg-server-1.12.1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: xorg-server-1.12.1.ebuild
48 ===================================================================
49 # Copyright 1999-2012 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.12.1.ebuild,v 1.1 2012/05/01 22:08:46 chithanh Exp $
52
53 EAPI=4
54
55 XORG_DOC=doc
56 inherit xorg-2 multilib versionator flag-o-matic
57 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
58
59 DESCRIPTION="X.Org X servers"
60 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
61
62 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
63 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
64
65 RDEPEND=">=app-admin/eselect-opengl-1.0.8
66 dev-libs/openssl
67 media-libs/freetype
68 >=x11-apps/iceauth-1.0.2
69 >=x11-apps/rgb-1.0.3
70 >=x11-apps/xauth-1.0.3
71 x11-apps/xkbcomp
72 >=x11-libs/libpciaccess-0.12.901
73 >=x11-libs/libXau-1.0.4
74 >=x11-libs/libXdmcp-1.0.2
75 >=x11-libs/libXfont-1.4.2
76 >=x11-libs/libxkbfile-1.0.4
77 >=x11-libs/pixman-0.21.8
78 >=x11-libs/xtrans-1.2.2
79 >=x11-misc/xbitmaps-1.0.1
80 >=x11-misc/xkeyboard-config-2.4.1-r3
81 dmx? (
82 x11-libs/libXt
83 >=x11-libs/libdmx-1.0.99.1
84 >=x11-libs/libX11-1.1.5
85 >=x11-libs/libXaw-1.0.4
86 >=x11-libs/libXext-1.0.99.4
87 >=x11-libs/libXfixes-5.0
88 >=x11-libs/libXi-1.2.99.1
89 >=x11-libs/libXmu-1.0.3
90 x11-libs/libXrender
91 >=x11-libs/libXres-1.0.3
92 >=x11-libs/libXtst-1.0.99.2
93 )
94 kdrive? (
95 >=x11-libs/libXext-1.0.5
96 x11-libs/libXv
97 )
98 !minimal? (
99 >=x11-libs/libX11-1.1.5
100 >=x11-libs/libXext-1.0.5
101 >=media-libs/mesa-7.8_rc[nptl=]
102 )
103 tslib? ( >=x11-libs/tslib-1.0 )
104 udev? ( >=sys-fs/udev-150 )
105 >=x11-apps/xinit-1.3
106 selinux? ( sec-policy/selinux-xserver )"
107
108 DEPEND="${RDEPEND}
109 sys-devel/flex
110 >=x11-proto/bigreqsproto-1.1.0
111 >=x11-proto/compositeproto-0.4
112 >=x11-proto/damageproto-1.1
113 >=x11-proto/fixesproto-5.0
114 >=x11-proto/fontsproto-2.0.2
115 >=x11-proto/glproto-1.4.14
116 >=x11-proto/inputproto-2.1.99.3
117 >=x11-proto/kbproto-1.0.3
118 >=x11-proto/randrproto-1.2.99.3
119 >=x11-proto/recordproto-1.13.99.1
120 >=x11-proto/renderproto-0.11
121 >=x11-proto/resourceproto-1.0.2
122 >=x11-proto/scrnsaverproto-1.1
123 >=x11-proto/trapproto-3.4.3
124 >=x11-proto/videoproto-2.2.2
125 >=x11-proto/xcmiscproto-1.2.0
126 >=x11-proto/xextproto-7.1.99
127 >=x11-proto/xf86dgaproto-2.0.99.1
128 >=x11-proto/xf86rushproto-1.1.2
129 >=x11-proto/xf86vidmodeproto-2.2.99.1
130 >=x11-proto/xineramaproto-1.1.3
131 >=x11-proto/xproto-7.0.22
132 dmx? (
133 >=x11-proto/dmxproto-2.2.99.1
134 doc? (
135 || (
136 www-client/links
137 www-client/lynx
138 www-client/w3m
139 )
140 )
141 )
142 !minimal? (
143 >=x11-proto/xf86driproto-2.1.0
144 >=x11-proto/dri2proto-2.6
145 >=x11-libs/libdrm-2.4.20
146 )"
147
148 PDEPEND="
149 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
150
151 REQUIRED_USE="!minimal? (
152 || ( ${IUSE_SERVERS} )
153 )"
154
155 #UPSTREAMED_PATCHES=(
156 # "${WORKDIR}/patches/"
157 #)
158
159 PATCHES=(
160 "${UPSTREAMED_PATCHES[@]}"
161 "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
162 )
163
164 pkg_pretend() {
165 # older gcc is not supported
166 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
167 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
168 }
169
170 pkg_setup() {
171 xorg-2_pkg_setup
172
173 # localstatedir is used for the log location; we need to override the default
174 # from ebuild.sh
175 # sysconfdir is used for the xorg.conf location; same applies
176 # --enable-install-setuid needed because sparcs default off
177 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
178 # package it somewhere
179 XORG_CONFIGURE_OPTIONS=(
180 $(use_enable ipv6)
181 $(use_enable dmx)
182 $(use_enable kdrive)
183 $(use_enable kdrive kdrive-kbd)
184 $(use_enable kdrive kdrive-mouse)
185 $(use_enable kdrive kdrive-evdev)
186 $(use_enable tslib)
187 $(use_enable !minimal record)
188 $(use_enable !minimal xfree86-utils)
189 $(use_enable !minimal install-libxf86config)
190 $(use_enable !minimal dri)
191 $(use_enable !minimal dri2)
192 $(use_enable !minimal glx)
193 $(use_enable xnest)
194 $(use_enable xorg)
195 $(use_enable xvfb)
196 $(use_enable nptl glx-tls)
197 $(use_enable udev config-udev)
198 $(use_with doc doxygen)
199 $(use_with doc xmlto)
200 --sysconfdir=/etc/X11
201 --localstatedir=/var
202 --enable-install-setuid
203 --with-fontrootdir=/usr/share/fonts
204 --with-xkb-output=/var/lib/xkb
205 --disable-config-hal
206 --without-dtrace
207 --without-fop
208 --with-os-vendor=Gentoo
209 )
210
211 # Xorg-server requires includes from OS mesa which are not visible for
212 # users of binary drivers.
213 mkdir -p "${T}/mesa-symlinks/GL"
214 for i in gl glx glxmd glxproto glxtokens; do
215 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
216 done
217 for i in glext glxext; do
218 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
219 done
220 append-cppflags "-I${T}/mesa-symlinks"
221
222 # Make breakage less obvious, bug #402285.
223 replace-flags -O3 -O2
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