1 |
scarabeus 10/10/05 13:46:06 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: xorg-server-1.9.0.901.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.542 x11-base/xorg-server/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.542&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.542&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.541&r2=1.542 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
20 |
retrieving revision 1.541 |
21 |
retrieving revision 1.542 |
22 |
diff -u -r1.541 -r1.542 |
23 |
--- ChangeLog 4 Oct 2010 20:33:59 -0000 1.541 |
24 |
+++ ChangeLog 5 Oct 2010 13:46:06 -0000 1.542 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for x11-base/xorg-server |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.541 2010/10/04 20:33:59 mgorny Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.542 2010/10/05 13:46:06 scarabeus Exp $ |
30 |
+ |
31 |
+*xorg-server-1.9.0.901 (05 Oct 2010) |
32 |
+ |
33 |
+ 05 Oct 2010; Tomáš Chvátal <scarabeus@g.o> |
34 |
+ +xorg-server-1.9.0.901.ebuild: |
35 |
+ Version bump. |
36 |
|
37 |
04 Oct 2010; Michał Górny <mgorny@g.o> xorg-server-1.7.6.ebuild, |
38 |
xorg-server-1.7.7-r1.ebuild, xorg-server-1.8.2.ebuild, |
39 |
|
40 |
|
41 |
|
42 |
1.1 x11-base/xorg-server/xorg-server-1.9.0.901.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0.901.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0.901.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: xorg-server-1.9.0.901.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2010 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.9.0.901.ebuild,v 1.1 2010/10/05 13:46:06 scarabeus Exp $ |
52 |
|
53 |
EAPI=3 |
54 |
inherit xorg-2 multilib versionator |
55 |
|
56 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
57 |
|
58 |
OPENGL_DIR="xorg-x11" |
59 |
|
60 |
DESCRIPTION="X.Org X servers" |
61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
62 |
|
63 |
IUSE_SERVERS="dmx kdrive xorg" |
64 |
IUSE="${IUSE_SERVERS} doc ipv6 minimal nptl tslib +udev" |
65 |
RDEPEND=">=app-admin/eselect-opengl-1.0.8 |
66 |
dev-libs/openssl |
67 |
media-libs/freetype |
68 |
>=x11-apps/iceauth-1.0.2 |
69 |
>=x11-apps/rgb-1.0.3 |
70 |
>=x11-apps/xauth-1.0.3 |
71 |
x11-apps/xkbcomp |
72 |
>=x11-libs/libpciaccess-0.10.3 |
73 |
>=x11-libs/libXau-1.0.4 |
74 |
>=x11-libs/libXdmcp-1.0.2 |
75 |
>=x11-libs/libXfont-1.4.2 |
76 |
>=x11-libs/libxkbfile-1.0.4 |
77 |
>=x11-libs/pixman-0.15.20 |
78 |
>=x11-libs/xtrans-1.2.2 |
79 |
>=x11-misc/xbitmaps-1.0.1 |
80 |
>=x11-misc/xkeyboard-config-1.4 |
81 |
dmx? ( |
82 |
x11-libs/libXt |
83 |
>=x11-libs/libdmx-1.0.99.1 |
84 |
>=x11-libs/libX11-1.1.5 |
85 |
>=x11-libs/libXaw-1.0.4 |
86 |
>=x11-libs/libXext-1.0.5 |
87 |
>=x11-libs/libXfixes-4.0.3 |
88 |
>=x11-libs/libXi-1.2.99.1 |
89 |
>=x11-libs/libXmu-1.0.3 |
90 |
>=x11-libs/libXres-1.0.3 |
91 |
>=x11-libs/libXtst-1.0.3 |
92 |
) |
93 |
kdrive? ( |
94 |
>=x11-libs/libXext-1.0.5 |
95 |
x11-libs/libXv |
96 |
) |
97 |
!minimal? ( |
98 |
>=x11-libs/libX11-1.1.5 |
99 |
>=x11-libs/libXext-1.0.5 |
100 |
>=media-libs/mesa-7.8_rc[nptl=] |
101 |
) |
102 |
tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) |
103 |
udev? ( >=sys-fs/udev-150 )" |
104 |
|
105 |
DEPEND="${RDEPEND} |
106 |
sys-devel/flex |
107 |
>=x11-proto/bigreqsproto-1.1.0 |
108 |
>=x11-proto/compositeproto-0.4 |
109 |
>=x11-proto/damageproto-1.1 |
110 |
>=x11-proto/fixesproto-4.1 |
111 |
>=x11-proto/fontsproto-2.0.2 |
112 |
>=x11-proto/glproto-1.4.11 |
113 |
>=x11-proto/inputproto-1.9.99.902 |
114 |
>=x11-proto/kbproto-1.0.3 |
115 |
>=x11-proto/randrproto-1.2.99.3 |
116 |
>=x11-proto/recordproto-1.13.99.1 |
117 |
>=x11-proto/renderproto-0.11 |
118 |
>=x11-proto/resourceproto-1.0.2 |
119 |
>=x11-proto/scrnsaverproto-1.1 |
120 |
>=x11-proto/trapproto-3.4.3 |
121 |
>=x11-proto/videoproto-2.2.2 |
122 |
>=x11-proto/xcmiscproto-1.2.0 |
123 |
>=x11-proto/xextproto-7.0.99.3 |
124 |
>=x11-proto/xf86dgaproto-2.0.99.1 |
125 |
>=x11-proto/xf86rushproto-1.1.2 |
126 |
>=x11-proto/xf86vidmodeproto-2.2.99.1 |
127 |
>=x11-proto/xineramaproto-1.1.3 |
128 |
>=x11-proto/xproto-7.0.17 |
129 |
dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) |
130 |
doc? ( |
131 |
>=app-doc/doxygen-1.6.1 |
132 |
app-text/xmlto |
133 |
) |
134 |
!minimal? ( |
135 |
>=x11-proto/xf86driproto-2.1.0 |
136 |
>=x11-proto/dri2proto-2.3 |
137 |
>=x11-libs/libdrm-2.4.20 |
138 |
)" |
139 |
|
140 |
PDEPEND=" |
141 |
>=x11-apps/xinit-1.2.1-r1 |
142 |
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
143 |
|
144 |
EPATCH_FORCE="yes" |
145 |
EPATCH_SUFFIX="patch" |
146 |
|
147 |
# These have been sent upstream |
148 |
#UPSTREAMED_PATCHES=( |
149 |
# "${WORKDIR}/patches/" |
150 |
# ) |
151 |
|
152 |
PATCHES=( |
153 |
"${UPSTREAMED_PATCHES[@]}" |
154 |
"${FILESDIR}"/${PN}-disable-acpi.patch |
155 |
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch |
156 |
"${FILESDIR}"/1.9.0-fix-VbeModeInfoBlock-memcpy.patch |
157 |
|
158 |
# Fixes for bug #318609 |
159 |
"${FILESDIR}"/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch |
160 |
"${FILESDIR}"/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch |
161 |
) |
162 |
|
163 |
pkg_setup() { |
164 |
xorg-2_pkg_setup |
165 |
|
166 |
use minimal || ensure_a_server_is_building |
167 |
|
168 |
# localstatedir is used for the log location; we need to override the default |
169 |
# from ebuild.sh |
170 |
# sysconfdir is used for the xorg.conf location; same applies |
171 |
# --enable-install-setuid needed because sparcs default off |
172 |
# NOTE: fop is used for doc generating ; and i have no idea if gentoo |
173 |
# package it somewhere |
174 |
CONFIGURE_OPTIONS=" |
175 |
$(use_enable ipv6) |
176 |
$(use_enable dmx) |
177 |
$(use_enable kdrive) |
178 |
$(use_enable kdrive kdrive-kbd) |
179 |
$(use_enable kdrive kdrive-mouse) |
180 |
$(use_enable kdrive kdrive-evdev) |
181 |
$(use_enable tslib) |
182 |
$(use_enable tslib xcalibrate) |
183 |
$(use_enable !minimal xvfb) |
184 |
$(use_enable !minimal xnest) |
185 |
$(use_enable !minimal record) |
186 |
$(use_enable !minimal xfree86-utils) |
187 |
$(use_enable !minimal install-libxf86config) |
188 |
$(use_enable !minimal dri) |
189 |
$(use_enable !minimal dri2) |
190 |
$(use_enable !minimal glx) |
191 |
$(use_enable xorg) |
192 |
$(use_enable nptl glx-tls) |
193 |
$(use_enable udev config-udev) |
194 |
$(use_with doc doxygen) |
195 |
$(use_with doc xmlto) |
196 |
--sysconfdir=/etc/X11 |
197 |
--localstatedir=/var |
198 |
--enable-install-setuid |
199 |
--with-fontrootdir=/usr/share/fonts |
200 |
--with-xkb-output=/var/lib/xkb |
201 |
--disable-config-hal |
202 |
--without-dtrace |
203 |
--without-fop |
204 |
--with-os-vendor=Gentoo |
205 |
${conf_opts}" |
206 |
|
207 |
if use kdrive && use tslib; then |
208 |
XORG_EAUTORECONF=yes |
209 |
fi |
210 |
|
211 |
# Xorg-server requires includes from OS mesa which are not visible for |
212 |
# users of binary drivers. |
213 |
# Due to the limitations of CONFIGURE_OPTIONS, we have to export this |
214 |
mkdir -p "${T}/mesa-symlinks/GL" |
215 |
for i in gl glx glxmd glxproto glxtokens; do |
216 |
ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
217 |
done |
218 |
for i in glext glxext; do |
219 |
ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
220 |
done |
221 |
append-cppflags "-I${T}/mesa-symlinks" |
222 |
|
223 |
# (#121394) Causes window corruption |
224 |
filter-flags -fweb |
225 |
|
226 |
# Incompatible with GCC 3.x SSP on x86, bug #244352 |
227 |
if use x86 ; then |
228 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
229 |
filter-flags -fstack-protector |
230 |
fi |
231 |
fi |
232 |
|
233 |
# Incompatible with GCC 3.x CPP, bug #314615 |
234 |
if [[ $(gcc-major-version) -lt 4 ]]; then |
235 |
ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x" |
236 |
ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)" |
237 |
fi |
238 |
|
239 |
# detect if we should inform user about ebuild breakage |
240 |
if ! has_version "x11-base/xorg-server" || |
241 |
has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then |
242 |
INFO="yes" |
243 |
fi |
244 |
} |
245 |
|
246 |
src_install() { |
247 |
xorg-2_src_install |
248 |
|
249 |
dynamic_libgl_install |
250 |
|
251 |
server_based_install |
252 |
|
253 |
if ! use minimal && use xorg; then |
254 |
# Install xorg.conf.example into docs |
255 |
dodoc hw/xfree86/xorg.conf.example \ |
256 |
|| die "couldn't install xorg.conf.example" |
257 |
fi |
258 |
|
259 |
newinitd "${FILESDIR}"/xdm.initd-3 xdm || die "initd file install failed" |
260 |
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die |
261 |
newconfd "${FILESDIR}"/xdm.confd-3 xdm || die |
262 |
|
263 |
# install the @x11-module-rebuild set for Portage |
264 |
insinto /usr/share/portage/config/sets |
265 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf || die |
266 |
} |
267 |
|
268 |
pkg_postinst() { |
269 |
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
270 |
eselect opengl set --use-old xorg-x11 |
271 |
|
272 |
if [[ ${INFO} = yes ]]; then |
273 |
einfo "You should consider reading upgrade guide for this release:" |
274 |
einfo " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" |
275 |
echo |
276 |
ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" |
277 |
ewarn "because the ABI changed. If you cannot start X because" |
278 |
ewarn "of module version mismatch errors, this is your problem." |
279 |
|
280 |
echo |
281 |
ewarn "You can generate a list of all installed packages in the x11-drivers" |
282 |
ewarn "category using this command:" |
283 |
ewarn " emerge portage-utils; qlist -I -C x11-drivers/" |
284 |
fi |
285 |
} |
286 |
|
287 |
pkg_postrm() { |
288 |
# Get rid of module dir to ensure opengl-update works properly |
289 |
if ! has_version x11-base/xorg-server; then |
290 |
if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
291 |
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
292 |
fi |
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/${OPENGL_DIR}/extensions |
300 |
local x="" |
301 |
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do |
302 |
if [ -f ${x} -o -L ${x} ]; then |
303 |
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions |
304 |
fi |
305 |
done |
306 |
eend 0 |
307 |
} |
308 |
|
309 |
server_based_install() { |
310 |
if ! use xorg; then |
311 |
rm "${D}"/usr/share/man/man1/Xserver.1x \ |
312 |
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
313 |
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
314 |
"${D}"/usr/share/man/man1/Xserver.1x |
315 |
fi |
316 |
} |
317 |
|
318 |
ensure_a_server_is_building() { |
319 |
for server in ${IUSE_SERVERS}; do |
320 |
use ${server} && return; |
321 |
done |
322 |
eerror "You need to specify at least one server to build." |
323 |
eerror "Valid servers are: ${IUSE_SERVERS}." |
324 |
die "No servers were specified to build." |
325 |
} |