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.10.6-r1.ebuild ChangeLog
Date: Tue, 29 May 2012 13:29:57
Message-Id: 20120529132947.E49612004B@flycatcher.gentoo.org
1 chithanh 12/05/29 13:29:47
2
3 Modified: ChangeLog
4 Added: xorg-server-1.10.6-r1.ebuild
5 Log:
6 Apply security bug #412609 patch to 1.10 too.
7
8 (Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.651 x11-base/xorg-server/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.651&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.651&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.650&r2=1.651
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
20 retrieving revision 1.650
21 retrieving revision 1.651
22 diff -u -r1.650 -r1.651
23 --- ChangeLog 23 May 2012 15:19:47 -0000 1.650
24 +++ ChangeLog 29 May 2012 13:29:47 -0000 1.651
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.650 2012/05/23 15:19:47 chithanh Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.651 2012/05/29 13:29:47 chithanh Exp $
30 +
31 +*xorg-server-1.10.6-r1 (29 May 2012)
32 +
33 + 29 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
34 + +xorg-server-1.10.6-r1.ebuild:
35 + Apply security bug #412609 patch to 1.10 too.
36
37 *xorg-server-1.11.4-r1 (23 May 2012)
38
39
40
41
42 1.1 x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.6-r1.ebuild?rev=1.1&content-type=text/plain
46
47 Index: xorg-server-1.10.6-r1.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.10.6-r1.ebuild,v 1.1 2012/05/29 13:29:47 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-4.0.3
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 x11-proto/xcalibrateproto )
103 udev? ( >=sys-fs/udev-150 )
104 >=x11-apps/xinit-1.3"
105
106 # dmx+doc DEPEND is a hack, a proper solution needs to be implemented in the
107 # xorg-2.eclass for next release
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-4.1
114 >=x11-proto/fontsproto-2.0.2
115 >=x11-proto/glproto-1.4.11
116 >=x11-proto/inputproto-1.9.99.902
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.17
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.3
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}-disable-acpi.patch
162 "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
163 "${FILESDIR}"/${PN}-1.11-log-format-fix.patch
164 )
165
166 pkg_pretend() {
167 # older gcc is not supported
168 [[ $(gcc-major-version) -lt 4 ]] && \
169 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
170 }
171
172 pkg_setup() {
173 xorg-2_pkg_setup
174
175 # localstatedir is used for the log location; we need to override the default
176 # from ebuild.sh
177 # sysconfdir is used for the xorg.conf location; same applies
178 # --enable-install-setuid needed because sparcs default off
179 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
180 # package it somewhere
181 XORG_CONFIGURE_OPTIONS=(
182 $(use_enable ipv6)
183 $(use_enable dmx)
184 $(use_enable kdrive)
185 $(use_enable kdrive kdrive-kbd)
186 $(use_enable kdrive kdrive-mouse)
187 $(use_enable kdrive kdrive-evdev)
188 $(use_enable tslib)
189 $(use_enable tslib xcalibrate)
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-5 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 elog "You should consider reading upgrade guide for this release:"
253 elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
254 echo
255 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
256 ewarn "because the ABI changed. If you cannot start X because"
257 ewarn "of module version mismatch errors, this is your problem."
258
259 echo
260 ewarn "You can generate a list of all installed packages in the x11-drivers"
261 ewarn "category using this command:"
262 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
263 ewarn "or using sets from portage-2.2:"
264 ewarn " emerge @x11-module-rebuild"
265 fi
266 }
267
268 pkg_postrm() {
269 # Get rid of module dir to ensure opengl-update works properly
270 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
271 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
272 fi
273 }
274
275 dynamic_libgl_install() {
276 # next section is to setup the dynamic libGL stuff
277 ebegin "Moving GL files for dynamic switching"
278 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
279 local x=""
280 for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
281 if [ -f ${x} -o -L ${x} ]; then
282 mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
283 fi
284 done
285 eend 0
286 }
287
288 server_based_install() {
289 if ! use xorg; then
290 rm "${D}"/usr/share/man/man1/Xserver.1x \
291 "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
292 "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
293 "${D}"/usr/share/man/man1/Xserver.1x
294 fi
295 }
Report Message
Find on MARC Find on Google Groups