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.10.2.ebuild xorg-server-1.10.1.902.ebuild xorg-server-1.10.1.ebuild
Date: Sun, 29 May 2011 08:19:38
Message-Id: 20110529081928.EB1A420054@flycatcher.gentoo.org
1 scarabeus 11/05/29 08:19:28
2
3 Modified: ChangeLog
4 Added: xorg-server-1.10.2.ebuild
5 Removed: xorg-server-1.10.1.902.ebuild
6 xorg-server-1.10.1.ebuild
7 Log:
8 Version bump to release. Drop older.
9
10 (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.590 x11-base/xorg-server/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.590&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.590&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.589&r2=1.590
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
22 retrieving revision 1.589
23 retrieving revision 1.590
24 diff -u -r1.589 -r1.590
25 --- ChangeLog 21 May 2011 18:01:26 -0000 1.589
26 +++ ChangeLog 29 May 2011 08:19:28 -0000 1.590
27 @@ -1,6 +1,13 @@
28 # ChangeLog for x11-base/xorg-server
29 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.589 2011/05/21 18:01:26 scarabeus Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.590 2011/05/29 08:19:28 scarabeus Exp $
32 +
33 +*xorg-server-1.10.2 (29 May 2011)
34 +
35 + 29 May 2011; Tomáš Chvátal <scarabeus@g.o>
36 + -xorg-server-1.10.1.ebuild, -xorg-server-1.10.1.902.ebuild,
37 + +xorg-server-1.10.2.ebuild:
38 + Version bump to release. Drop older.
39
40 *xorg-server-1.10.1.902 (21 May 2011)
41
42
43
44
45 1.1 x11-base/xorg-server/xorg-server-1.10.2.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild?rev=1.1&content-type=text/plain
49
50 Index: xorg-server-1.10.2.ebuild
51 ===================================================================
52 # Copyright 1999-2011 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.2.ebuild,v 1.1 2011/05/29 08:19:28 scarabeus Exp $
55
56 EAPI=4
57
58 XORG_DOC=doc
59 inherit xorg-2 multilib versionator
60 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
61
62 DESCRIPTION="X.Org X servers"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
64
65 IUSE_SERVERS="dmx kdrive xorg"
66 IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
67
68 RDEPEND=">=app-admin/eselect-opengl-1.0.8
69 dev-libs/openssl
70 media-libs/freetype
71 >=x11-apps/iceauth-1.0.2
72 >=x11-apps/rgb-1.0.3
73 >=x11-apps/xauth-1.0.3
74 x11-apps/xkbcomp
75 >=x11-libs/libpciaccess-0.10.3
76 >=x11-libs/libXau-1.0.4
77 >=x11-libs/libXdmcp-1.0.2
78 >=x11-libs/libXfont-1.4.2
79 >=x11-libs/libxkbfile-1.0.4
80 >=x11-libs/pixman-0.21.8
81 >=x11-libs/xtrans-1.2.2
82 >=x11-misc/xbitmaps-1.0.1
83 >=x11-misc/xkeyboard-config-1.4
84 dmx? (
85 x11-libs/libXt
86 >=x11-libs/libdmx-1.0.99.1
87 >=x11-libs/libX11-1.1.5
88 >=x11-libs/libXaw-1.0.4
89 >=x11-libs/libXext-1.0.99.4
90 >=x11-libs/libXfixes-4.0.3
91 >=x11-libs/libXi-1.2.99.1
92 >=x11-libs/libXmu-1.0.3
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 x11-proto/xcalibrateproto )
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-4.1
115 >=x11-proto/fontsproto-2.0.2
116 >=x11-proto/glproto-1.4.11
117 >=x11-proto/inputproto-1.9.99.902
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.17
133 dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
134 !minimal? (
135 >=x11-proto/xf86driproto-2.1.0
136 >=x11-proto/dri2proto-2.3
137 >=x11-libs/libdrm-2.4.20
138 )"
139
140 PDEPEND="
141 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
142
143 REQUIRED_USE="!minimal? (
144 || ( ${IUSE_SERVERS} )
145 )"
146
147 #UPSTREAMED_PATCHES=(
148 # "${WORKDIR}/patches/"
149 #)
150
151 PATCHES=(
152 "${UPSTREAMED_PATCHES[@]}"
153 "${FILESDIR}"/${PN}-disable-acpi.patch
154 "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
155 )
156
157 pkg_pretend() {
158 # older gcc is not supported
159 [[ $(gcc-major-version) -lt 4 ]] && \
160 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
161 }
162
163 pkg_setup() {
164 xorg-2_pkg_setup
165
166 # localstatedir is used for the log location; we need to override the default
167 # from ebuild.sh
168 # sysconfdir is used for the xorg.conf location; same applies
169 # --enable-install-setuid needed because sparcs default off
170 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
171 # package it somewhere
172 XORG_CONFIGURE_OPTIONS=(
173 $(use_enable ipv6)
174 $(use_enable dmx)
175 $(use_enable kdrive)
176 $(use_enable kdrive kdrive-kbd)
177 $(use_enable kdrive kdrive-mouse)
178 $(use_enable kdrive kdrive-evdev)
179 $(use_enable tslib)
180 $(use_enable tslib xcalibrate)
181 $(use_enable !minimal xvfb)
182 $(use_enable !minimal xnest)
183 $(use_enable !minimal record)
184 $(use_enable !minimal xfree86-utils)
185 $(use_enable !minimal install-libxf86config)
186 $(use_enable !minimal dri)
187 $(use_enable !minimal dri2)
188 $(use_enable !minimal glx)
189 $(use_enable xorg)
190 $(use_enable nptl glx-tls)
191 $(use_enable udev config-udev)
192 $(use_with doc doxygen)
193 $(use_with doc xmlto)
194 --sysconfdir=/etc/X11
195 --localstatedir=/var
196 --enable-install-setuid
197 --with-fontrootdir=/usr/share/fonts
198 --with-xkb-output=/var/lib/xkb
199 --disable-config-hal
200 --without-dtrace
201 --without-fop
202 --with-os-vendor=Gentoo
203 )
204
205 # Xorg-server requires includes from OS mesa which are not visible for
206 # users of binary drivers.
207 mkdir -p "${T}/mesa-symlinks/GL"
208 for i in gl glx glxmd glxproto glxtokens; do
209 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
210 done
211 for i in glext glxext; do
212 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
213 done
214 append-cppflags "-I${T}/mesa-symlinks"
215 }
216
217 src_install() {
218 xorg-2_src_install
219
220 dynamic_libgl_install
221
222 server_based_install
223
224 if ! use minimal && use xorg; then
225 # Install xorg.conf.example into docs
226 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
227 fi
228
229 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
230 newinitd "${FILESDIR}"/xdm.initd-3 xdm
231 newconfd "${FILESDIR}"/xdm.confd-3 xdm
232
233 # install the @x11-module-rebuild set for Portage
234 insinto /usr/share/portage/config/sets
235 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
236 }
237
238 pkg_postinst() {
239 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
240 eselect opengl set xorg-x11 --use-old
241
242 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
243 elog "You should consider reading upgrade guide for this release:"
244 elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
245 echo
246 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
247 ewarn "because the ABI changed. If you cannot start X because"
248 ewarn "of module version mismatch errors, this is your problem."
249
250 echo
251 ewarn "You can generate a list of all installed packages in the x11-drivers"
252 ewarn "category using this command:"
253 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
254 ewarn "or using sets from portage-2.2:"
255 ewarn " emerge @x11-module-rebuild"
256 fi
257 }
258
259 pkg_postrm() {
260 # Get rid of module dir to ensure opengl-update works properly
261 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
262 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
263 fi
264 }
265
266 dynamic_libgl_install() {
267 # next section is to setup the dynamic libGL stuff
268 ebegin "Moving GL files for dynamic switching"
269 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
270 local x=""
271 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
272 if [ -f ${x} -o -L ${x} ]; then
273 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
274 fi
275 done
276 eend 0
277 }
278
279 server_based_install() {
280 if ! use xorg; then
281 rm "${D}"/usr/share/man/man1/Xserver.1x \
282 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
283 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
284 "${D}"/usr/share/man/man1/Xserver.1x
285 fi
286 }
Report Message
Find on MARC Find on Google Groups