Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matt Turner (mattst88)" <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.12.99.905.ebuild xorg-server-1.12.99.904.ebuild
Date: Fri, 24 Aug 2012 19:23:20
Message-Id: 20120824192310.790D2205E4@flycatcher.gentoo.org
1 mattst88 12/08/24 19:23:10
2
3 Modified: ChangeLog
4 Added: xorg-server-1.12.99.905.ebuild
5 Removed: xorg-server-1.12.99.904.ebuild
6 Log:
7 Bump to new prerelease.
8
9 (Portage version: 2.1.11.9/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.680 x11-base/xorg-server/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.680&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.680&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.679&r2=1.680
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
21 retrieving revision 1.679
22 retrieving revision 1.680
23 diff -u -r1.679 -r1.680
24 --- ChangeLog 8 Aug 2012 13:37:07 -0000 1.679
25 +++ ChangeLog 24 Aug 2012 19:23:10 -0000 1.680
26 @@ -1,6 +1,12 @@
27 # ChangeLog for x11-base/xorg-server
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.679 2012/08/08 13:37:07 chithanh Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.680 2012/08/24 19:23:10 mattst88 Exp $
31 +
32 +*xorg-server-1.12.99.905 (24 Aug 2012)
33 +
34 + 24 Aug 2012; Matt Turner <mattst88@g.o>
35 + -xorg-server-1.12.99.904.ebuild, +xorg-server-1.12.99.905.ebuild:
36 + Bump to new prerelease.
37
38 *xorg-server-1.12.99.904 (08 Aug 2012)
39
40
41
42
43 1.1 x11-base/xorg-server/xorg-server-1.12.99.905.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.99.905.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.99.905.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xorg-server-1.12.99.905.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.99.905.ebuild,v 1.1 2012/08/24 19:23:10 mattst88 Exp $
53
54 EAPI=4
55
56 XORG_DOC=doc
57 inherit xorg-2 multilib versionator flag-o-matic
58 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
59
60 DESCRIPTION="X.Org X servers"
61 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
62
63 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
64 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
65
66 RDEPEND=">=app-admin/eselect-opengl-1.0.8
67 dev-libs/openssl
68 media-libs/freetype
69 >=x11-apps/iceauth-1.0.2
70 >=x11-apps/rgb-1.0.3
71 >=x11-apps/xauth-1.0.3
72 x11-apps/xkbcomp
73 >=x11-libs/libpciaccess-0.12.901
74 >=x11-libs/libXau-1.0.4
75 >=x11-libs/libXdmcp-1.0.2
76 >=x11-libs/libXfont-1.4.2
77 >=x11-libs/libxkbfile-1.0.4
78 >=x11-libs/pixman-0.21.8
79 >=x11-libs/xtrans-1.2.2
80 >=x11-misc/xbitmaps-1.0.1
81 >=x11-misc/xkeyboard-config-2.4.1-r3
82 dmx? (
83 x11-libs/libXt
84 >=x11-libs/libdmx-1.0.99.1
85 >=x11-libs/libX11-1.1.5
86 >=x11-libs/libXaw-1.0.4
87 >=x11-libs/libXext-1.0.99.4
88 >=x11-libs/libXfixes-5.0
89 >=x11-libs/libXi-1.2.99.1
90 >=x11-libs/libXmu-1.0.3
91 x11-libs/libXrender
92 >=x11-libs/libXres-1.0.3
93 >=x11-libs/libXtst-1.0.99.2
94 )
95 kdrive? (
96 >=x11-libs/libXext-1.0.5
97 x11-libs/libXv
98 )
99 !minimal? (
100 >=x11-libs/libX11-1.1.5
101 >=x11-libs/libXext-1.0.5
102 >=media-libs/mesa-7.8_rc[nptl=]
103 )
104 tslib? ( >=x11-libs/tslib-1.0 )
105 udev? ( >=sys-fs/udev-150 )
106 >=x11-apps/xinit-1.3
107 selinux? ( sec-policy/selinux-xserver )"
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.16
117 >=x11-proto/inputproto-2.1.99.3
118 >=x11-proto/kbproto-1.0.3
119 >=x11-proto/randrproto-1.4.0
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.8
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 src_configure() {
172 # localstatedir is used for the log location; we need to override the default
173 # from ebuild.sh
174 # sysconfdir is used for the xorg.conf location; same applies
175 # --enable-install-setuid needed because sparcs default off
176 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
177 # package it somewhere
178 XORG_CONFIGURE_OPTIONS=(
179 $(use_enable ipv6)
180 $(use_enable dmx)
181 $(use_enable kdrive)
182 $(use_enable kdrive kdrive-kbd)
183 $(use_enable kdrive kdrive-mouse)
184 $(use_enable kdrive kdrive-evdev)
185 $(use_enable tslib)
186 $(use_enable !minimal record)
187 $(use_enable !minimal xfree86-utils)
188 $(use_enable !minimal install-libxf86config)
189 $(use_enable !minimal dri)
190 $(use_enable !minimal dri2)
191 $(use_enable !minimal glx)
192 $(use_enable xnest)
193 $(use_enable xorg)
194 $(use_enable xvfb)
195 $(use_enable nptl glx-tls)
196 $(use_enable udev config-udev)
197 $(use_with doc doxygen)
198 $(use_with doc xmlto)
199 --sysconfdir=/etc/X11
200 --localstatedir=/var
201 --enable-install-setuid
202 --with-fontrootdir=/usr/share/fonts
203 --with-xkb-output=/var/lib/xkb
204 --disable-config-hal
205 --without-dtrace
206 --without-fop
207 --with-os-vendor=Gentoo
208 )
209
210 # Xorg-server requires includes from OS mesa which are not visible for
211 # users of binary drivers.
212 mkdir -p "${T}/mesa-symlinks/GL"
213 for i in gl glx glxmd glxproto glxtokens; do
214 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
215 done
216 for i in glext glxext; do
217 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
218 done
219 append-cppflags "-I${T}/mesa-symlinks"
220
221 xorg-2_src_configure
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-8 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 if use udev && has_version sys-fs/udev[-keymap]; then
263 ewarn "sys-fs/udev was built without keymap support. This may cause input device"
264 ewarn "autoconfiguration to fail."
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