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