1 |
scarabeus 11/05/08 11:52:53 |
2 |
|
3 |
Modified: xorg-server-1.10.1.901.ebuild ChangeLog |
4 |
Log: |
5 |
Rather base of live ebuild for this snapshot so it does not throw qa warning anymore. |
6 |
|
7 |
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 x11-base/xorg-server/xorg-server-1.10.1.901.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: xorg-server-1.10.1.901.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- xorg-server-1.10.1.901.ebuild 7 May 2011 15:08:49 -0000 1.1 |
23 |
+++ xorg-server-1.10.1.901.ebuild 8 May 2011 11:52:53 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2011 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild,v 1.1 2011/05/07 15:08:49 scarabeus Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild,v 1.2 2011/05/08 11:52:53 scarabeus Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
@@ -26,7 +26,7 @@ |
33 |
>=x11-libs/libXdmcp-1.0.2 |
34 |
>=x11-libs/libXfont-1.4.2 |
35 |
>=x11-libs/libxkbfile-1.0.4 |
36 |
- >=x11-libs/pixman-0.15.20 |
37 |
+ >=x11-libs/pixman-0.21.8 |
38 |
>=x11-libs/xtrans-1.2.2 |
39 |
>=x11-misc/xbitmaps-1.0.1 |
40 |
>=x11-misc/xkeyboard-config-1.4 |
41 |
@@ -101,7 +101,13 @@ |
42 |
"${UPSTREAMED_PATCHES[@]}" |
43 |
"${FILESDIR}"/${PN}-disable-acpi.patch |
44 |
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch |
45 |
- ) |
46 |
+) |
47 |
+ |
48 |
+pkg_pretend() { |
49 |
+ # older gcc is not supported |
50 |
+ [[ $(gcc-major-version) -lt 4 ]] && \ |
51 |
+ die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." |
52 |
+} |
53 |
|
54 |
pkg_setup() { |
55 |
xorg-2_pkg_setup |
56 |
@@ -112,7 +118,7 @@ |
57 |
# --enable-install-setuid needed because sparcs default off |
58 |
# NOTE: fop is used for doc generating ; and i have no idea if gentoo |
59 |
# package it somewhere |
60 |
- CONFIGURE_OPTIONS=" |
61 |
+ XORG_CONFIGURE_OPTIONS=( |
62 |
$(use_enable ipv6) |
63 |
$(use_enable dmx) |
64 |
$(use_enable kdrive) |
65 |
@@ -143,11 +149,10 @@ |
66 |
--without-dtrace |
67 |
--without-fop |
68 |
--with-os-vendor=Gentoo |
69 |
- " |
70 |
+ ) |
71 |
|
72 |
# Xorg-server requires includes from OS mesa which are not visible for |
73 |
# users of binary drivers. |
74 |
- # Due to the limitations of CONFIGURE_OPTIONS, we have to export this |
75 |
mkdir -p "${T}/mesa-symlinks/GL" |
76 |
for i in gl glx glxmd glxproto glxtokens; do |
77 |
ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
78 |
@@ -156,25 +161,6 @@ |
79 |
ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die |
80 |
done |
81 |
append-cppflags "-I${T}/mesa-symlinks" |
82 |
- |
83 |
- # Incompatible with GCC 3.x SSP on x86, bug #244352 |
84 |
- if use x86 ; then |
85 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
86 |
- filter-flags -fstack-protector |
87 |
- fi |
88 |
- fi |
89 |
- |
90 |
- # Incompatible with GCC 3.x CPP, bug #314615 |
91 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
92 |
- ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x" |
93 |
- ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)" |
94 |
- fi |
95 |
- |
96 |
- # detect if we should inform user about ebuild breakage |
97 |
- if ! has_version "x11-base/xorg-server" || |
98 |
- has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then |
99 |
- INFO="yes" |
100 |
- fi |
101 |
} |
102 |
|
103 |
src_install() { |
104 |
@@ -202,7 +188,7 @@ |
105 |
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
106 |
eselect opengl set xorg-x11 --use-old |
107 |
|
108 |
- if [[ ${INFO} = yes ]]; then |
109 |
+ if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then |
110 |
elog "You should consider reading upgrade guide for this release:" |
111 |
elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" |
112 |
echo |
113 |
@@ -214,15 +200,15 @@ |
114 |
ewarn "You can generate a list of all installed packages in the x11-drivers" |
115 |
ewarn "category using this command:" |
116 |
ewarn " emerge portage-utils; qlist -I -C x11-drivers/" |
117 |
+ ewarn "or using sets from portage-2.2:" |
118 |
+ ewarn " emerge @x11-module-rebuild" |
119 |
fi |
120 |
} |
121 |
|
122 |
pkg_postrm() { |
123 |
# Get rid of module dir to ensure opengl-update works properly |
124 |
- if ! has_version x11-base/xorg-server; then |
125 |
- if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
126 |
- rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
127 |
- fi |
128 |
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
129 |
+ rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules |
130 |
fi |
131 |
} |
132 |
|
133 |
|
134 |
|
135 |
|
136 |
1.584 x11-base/xorg-server/ChangeLog |
137 |
|
138 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.584&view=markup |
139 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.584&content-type=text/plain |
140 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.583&r2=1.584 |
141 |
|
142 |
Index: ChangeLog |
143 |
=================================================================== |
144 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
145 |
retrieving revision 1.583 |
146 |
retrieving revision 1.584 |
147 |
diff -u -r1.583 -r1.584 |
148 |
--- ChangeLog 7 May 2011 15:08:49 -0000 1.583 |
149 |
+++ ChangeLog 8 May 2011 11:52:53 -0000 1.584 |
150 |
@@ -1,6 +1,11 @@ |
151 |
# ChangeLog for x11-base/xorg-server |
152 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
153 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.583 2011/05/07 15:08:49 scarabeus Exp $ |
154 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.584 2011/05/08 11:52:53 scarabeus Exp $ |
155 |
+ |
156 |
+ 08 May 2011; Tomáš Chvátal <scarabeus@g.o> |
157 |
+ xorg-server-1.10.1.901.ebuild: |
158 |
+ Rather base of live ebuild for this snapshot so it does not throw qa warning |
159 |
+ anymore. |
160 |
|
161 |
*xorg-server-1.10.1.901 (07 May 2011) |