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