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: xorg-server-1.15.0.ebuild ChangeLog xorg-server-1.14.99.904.ebuild
Date: Mon, 30 Dec 2013 19:59:22
Message-Id: 20131230195917.C2C5C2004B@flycatcher.gentoo.org
1 mattst88 13/12/30 19:59:17
2
3 Modified: ChangeLog
4 Added: xorg-server-1.15.0.ebuild
5 Removed: xorg-server-1.14.99.904.ebuild
6 Log:
7 Version bump to 1.15, bug 496226.
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)
10
11 Revision Changes Path
12 1.779 x11-base/xorg-server/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.779&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.779&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.778&r2=1.779
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
21 retrieving revision 1.778
22 retrieving revision 1.779
23 diff -u -r1.778 -r1.779
24 --- ChangeLog 16 Dec 2013 22:45:39 -0000 1.778
25 +++ ChangeLog 30 Dec 2013 19:59:17 -0000 1.779
26 @@ -1,6 +1,12 @@
27 # ChangeLog for x11-base/xorg-server
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.778 2013/12/16 22:45:39 chithanh Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.779 2013/12/30 19:59:17 mattst88 Exp $
31 +
32 +*xorg-server-1.15.0 (30 Dec 2013)
33 +
34 + 30 Dec 2013; Matt Turner <mattst88@g.o> +xorg-server-1.15.0.ebuild,
35 + -xorg-server-1.14.99.904.ebuild:
36 + Version bump to 1.15, bug 496226.
37
38 *xorg-server-1.14.99.904 (16 Dec 2013)
39 *xorg-server-1.14.5 (16 Dec 2013)
40
41
42
43 1.1 x11-base/xorg-server/xorg-server-1.15.0.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild?rev=1.1&content-type=text/plain
47
48 Index: xorg-server-1.15.0.ebuild
49 ===================================================================
50 # Copyright 1999-2013 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.15.0.ebuild,v 1.1 2013/12/30 19:59:17 mattst88 Exp $
53
54 EAPI=5
55
56 XORG_EAUTORECONF=yes
57 XORG_DOC=doc
58 inherit xorg-2 multilib versionator flag-o-matic
59 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
60
61 DESCRIPTION="X.Org X servers"
62 SLOT="0/${PV}"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
64
65 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
66 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid 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/libdrm-2.4.20
76 >=x11-libs/libpciaccess-0.12.901
77 >=x11-libs/libXau-1.0.4
78 >=x11-libs/libXdmcp-1.0.2
79 >=x11-libs/libXfont-1.4.2
80 >=x11-libs/libxkbfile-1.0.4
81 >=x11-libs/libxshmfence-1.1
82 >=x11-libs/pixman-0.27.2
83 >=x11-libs/xtrans-1.3.2
84 >=x11-misc/xbitmaps-1.0.1
85 >=x11-misc/xkeyboard-config-2.4.1-r3
86 dmx? (
87 x11-libs/libXt
88 >=x11-libs/libdmx-1.0.99.1
89 >=x11-libs/libX11-1.1.5
90 >=x11-libs/libXaw-1.0.4
91 >=x11-libs/libXext-1.0.99.4
92 >=x11-libs/libXfixes-5.0
93 >=x11-libs/libXi-1.2.99.1
94 >=x11-libs/libXmu-1.0.3
95 x11-libs/libXrender
96 >=x11-libs/libXres-1.0.3
97 >=x11-libs/libXtst-1.0.99.2
98 )
99 kdrive? (
100 >=x11-libs/libXext-1.0.5
101 x11-libs/libXv
102 )
103 !minimal? (
104 >=x11-libs/libX11-1.1.5
105 >=x11-libs/libXext-1.0.5
106 >=media-libs/mesa-9.2.0[nptl=]
107 )
108 tslib? ( >=x11-libs/tslib-1.0 )
109 udev? ( >=virtual/udev-150 )
110 >=x11-apps/xinit-1.3
111 selinux? ( sec-policy/selinux-xserver )"
112
113 DEPEND="${RDEPEND}
114 sys-devel/flex
115 >=x11-proto/bigreqsproto-1.1.0
116 >=x11-proto/compositeproto-0.4
117 >=x11-proto/damageproto-1.1
118 >=x11-proto/fixesproto-5.0
119 >=x11-proto/fontsproto-2.0.2
120 >=x11-proto/glproto-1.4.17
121 >=x11-proto/inputproto-2.2.99.1
122 >=x11-proto/kbproto-1.0.3
123 >=x11-proto/randrproto-1.4.0
124 >=x11-proto/recordproto-1.13.99.1
125 >=x11-proto/renderproto-0.11
126 >=x11-proto/resourceproto-1.2.0
127 >=x11-proto/scrnsaverproto-1.1
128 >=x11-proto/trapproto-3.4.3
129 >=x11-proto/videoproto-2.2.2
130 >=x11-proto/xcmiscproto-1.2.0
131 >=x11-proto/xextproto-7.2.99.901
132 >=x11-proto/xf86dgaproto-2.0.99.1
133 >=x11-proto/xf86rushproto-1.1.2
134 >=x11-proto/xf86vidmodeproto-2.2.99.1
135 >=x11-proto/xineramaproto-1.1.3
136 >=x11-proto/xproto-7.0.22
137 >=x11-proto/presentproto-1.0
138 >=x11-proto/dri3proto-1.0
139 dmx? (
140 >=x11-proto/dmxproto-2.2.99.1
141 doc? (
142 || (
143 www-client/links
144 www-client/lynx
145 www-client/w3m
146 )
147 )
148 )
149 !minimal? (
150 >=x11-proto/xf86driproto-2.1.0
151 >=x11-proto/dri2proto-2.8
152 )"
153
154 PDEPEND="
155 xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
156
157 REQUIRED_USE="!minimal? (
158 || ( ${IUSE_SERVERS} )
159 )"
160
161 #UPSTREAMED_PATCHES=(
162 # "${WORKDIR}/patches/"
163 #)
164
165 PATCHES=(
166 "${UPSTREAMED_PATCHES[@]}"
167 "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
168 "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
169 )
170
171 pkg_pretend() {
172 # older gcc is not supported
173 [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
174 die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
175 }
176
177 src_configure() {
178 # localstatedir is used for the log location; we need to override the default
179 # from ebuild.sh
180 # sysconfdir is used for the xorg.conf location; same applies
181 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
182 # package it somewhere
183 XORG_CONFIGURE_OPTIONS=(
184 $(use_enable ipv6)
185 $(use_enable dmx)
186 $(use_enable kdrive)
187 $(use_enable kdrive kdrive-kbd)
188 $(use_enable kdrive kdrive-mouse)
189 $(use_enable kdrive kdrive-evdev)
190 $(use_enable suid install-setuid)
191 $(use_enable tslib)
192 $(use_enable !minimal record)
193 $(use_enable !minimal xfree86-utils)
194 $(use_enable !minimal install-libxf86config)
195 $(use_enable !minimal dri)
196 $(use_enable !minimal dri2)
197 $(use_enable !minimal glx)
198 $(use_enable xnest)
199 $(use_enable xorg)
200 $(use_enable xvfb)
201 $(use_enable nptl glx-tls)
202 $(use_enable udev config-udev)
203 $(use_with doc doxygen)
204 $(use_with doc xmlto)
205 --enable-libdrm
206 --sysconfdir="${EPREFIX}"/etc/X11
207 --localstatedir="${EPREFIX}"/var
208 --with-fontrootdir="${EPREFIX}"/usr/share/fonts
209 --with-xkb-output="${EPREFIX}"/var/lib/xkb
210 --disable-config-hal
211 --disable-linux-acpi
212 --without-dtrace
213 --without-fop
214 --with-os-vendor=Gentoo
215 )
216
217 # Xorg-server requires includes from OS mesa which are not visible for
218 # users of binary drivers.
219 mkdir -p "${T}/mesa-symlinks/GL"
220 for i in gl glx glxmd glxproto glxtokens; do
221 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
222 done
223 for i in glext glxext; do
224 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
225 done
226 append-cppflags "-I${T}/mesa-symlinks"
227
228 xorg-2_src_configure
229 }
230
231 src_install() {
232 xorg-2_src_install
233
234 dynamic_libgl_install
235
236 server_based_install
237
238 if ! use minimal && use xorg; then
239 # Install xorg.conf.example into docs
240 dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
241 fi
242
243 newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
244 newinitd "${FILESDIR}"/xdm.initd-10 xdm
245 newconfd "${FILESDIR}"/xdm.confd-4 xdm
246
247 # install the @x11-module-rebuild set for Portage
248 insinto /usr/share/portage/config/sets
249 newins "${FILESDIR}"/xorg-sets.conf xorg.conf
250 }
251
252 pkg_postinst() {
253 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
254 eselect opengl set xorg-x11 --use-old
255
256 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
257 elog "You should consider reading upgrade guide for this release:"
258 elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
259 echo
260 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
261 ewarn "because the ABI changed. If you cannot start X because"
262 ewarn "of module version mismatch errors, this is your problem."
263
264 echo
265 ewarn "You can rebuild all installed packages in the x11-drivers"
266 ewarn "category using this command:"
267 ewarn " emerge @x11-module-rebuild"
268 fi
269
270 if use udev && has_version virtual/udev[-keymap]; then
271 ewarn "virtual/udev was built without keymap support. This may cause input device"
272 ewarn "autoconfiguration to fail."
273 fi
274 }
275
276 pkg_postrm() {
277 # Get rid of module dir to ensure opengl-update works properly
278 if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
279 rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
280 fi
281 }
282
283 dynamic_libgl_install() {
284 # next section is to setup the dynamic libGL stuff
285 ebegin "Moving GL files for dynamic switching"
286 dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
287 local x=""
288 for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
289 if [ -f ${x} -o -L ${x} ]; then
290 mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
291 fi
292 done
293 eend 0
294 }
295
296 server_based_install() {
297 if ! use xorg; then
298 rm "${ED}"/usr/share/man/man1/Xserver.1x \
299 "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
300 "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
301 "${ED}"/usr/share/man/man1/Xserver.1x
302 fi
303 }
Report Message
Find on MARC Find on Google Groups