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