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