/[gentoo-x86]/x11-base/xorg-server/xorg-server-1.10.1.901.ebuild
Gentoo

Diff of /x11-base/xorg-server/xorg-server-1.10.1.901.ebuild

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.1 Revision 1.2
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/Attic/xorg-server-1.10.1.901.ebuild,v 1.1 2011/05/07 15:08:49 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/Attic/xorg-server-1.10.1.901.ebuild,v 1.2 2011/05/08 11:52:53 scarabeus Exp $
4 4
5EAPI=4 5EAPI=4
6 6
7XORG_DOC=doc 7XORG_DOC=doc
8inherit xorg-2 multilib versionator 8inherit xorg-2 multilib versionator
24 >=x11-libs/libpciaccess-0.10.3 24 >=x11-libs/libpciaccess-0.10.3
25 >=x11-libs/libXau-1.0.4 25 >=x11-libs/libXau-1.0.4
26 >=x11-libs/libXdmcp-1.0.2 26 >=x11-libs/libXdmcp-1.0.2
27 >=x11-libs/libXfont-1.4.2 27 >=x11-libs/libXfont-1.4.2
28 >=x11-libs/libxkbfile-1.0.4 28 >=x11-libs/libxkbfile-1.0.4
29 >=x11-libs/pixman-0.15.20 29 >=x11-libs/pixman-0.21.8
30 >=x11-libs/xtrans-1.2.2 30 >=x11-libs/xtrans-1.2.2
31 >=x11-misc/xbitmaps-1.0.1 31 >=x11-misc/xbitmaps-1.0.1
32 >=x11-misc/xkeyboard-config-1.4 32 >=x11-misc/xkeyboard-config-1.4
33 dmx? ( 33 dmx? (
34 x11-libs/libXt 34 x11-libs/libXt
99 99
100PATCHES=( 100PATCHES=(
101 "${UPSTREAMED_PATCHES[@]}" 101 "${UPSTREAMED_PATCHES[@]}"
102 "${FILESDIR}"/${PN}-disable-acpi.patch 102 "${FILESDIR}"/${PN}-disable-acpi.patch
103 "${FILESDIR}"/${PN}-1.9-nouveau-default.patch 103 "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
104 ) 104)
105
106pkg_pretend() {
107 # older gcc is not supported
108 [[ $(gcc-major-version) -lt 4 ]] && \
109 die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
110}
105 111
106pkg_setup() { 112pkg_setup() {
107 xorg-2_pkg_setup 113 xorg-2_pkg_setup
108 114
109 # localstatedir is used for the log location; we need to override the default 115 # localstatedir is used for the log location; we need to override the default
110 # from ebuild.sh 116 # from ebuild.sh
111 # sysconfdir is used for the xorg.conf location; same applies 117 # sysconfdir is used for the xorg.conf location; same applies
112 # --enable-install-setuid needed because sparcs default off 118 # --enable-install-setuid needed because sparcs default off
113 # NOTE: fop is used for doc generating ; and i have no idea if gentoo 119 # NOTE: fop is used for doc generating ; and i have no idea if gentoo
114 # package it somewhere 120 # package it somewhere
115 CONFIGURE_OPTIONS=" 121 XORG_CONFIGURE_OPTIONS=(
116 $(use_enable ipv6) 122 $(use_enable ipv6)
117 $(use_enable dmx) 123 $(use_enable dmx)
118 $(use_enable kdrive) 124 $(use_enable kdrive)
119 $(use_enable kdrive kdrive-kbd) 125 $(use_enable kdrive kdrive-kbd)
120 $(use_enable kdrive kdrive-mouse) 126 $(use_enable kdrive kdrive-mouse)
141 --with-xkb-output=/var/lib/xkb 147 --with-xkb-output=/var/lib/xkb
142 --disable-config-hal 148 --disable-config-hal
143 --without-dtrace 149 --without-dtrace
144 --without-fop 150 --without-fop
145 --with-os-vendor=Gentoo 151 --with-os-vendor=Gentoo
146 " 152 )
147 153
148 # Xorg-server requires includes from OS mesa which are not visible for 154 # Xorg-server requires includes from OS mesa which are not visible for
149 # users of binary drivers. 155 # users of binary drivers.
150 # Due to the limitations of CONFIGURE_OPTIONS, we have to export this
151 mkdir -p "${T}/mesa-symlinks/GL" 156 mkdir -p "${T}/mesa-symlinks/GL"
152 for i in gl glx glxmd glxproto glxtokens; do 157 for i in gl glx glxmd glxproto glxtokens; do
153 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die 158 ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
154 done 159 done
155 for i in glext glxext; do 160 for i in glext glxext; do
156 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die 161 ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
157 done 162 done
158 append-cppflags "-I${T}/mesa-symlinks" 163 append-cppflags "-I${T}/mesa-symlinks"
159
160 # Incompatible with GCC 3.x SSP on x86, bug #244352
161 if use x86 ; then
162 if [[ $(gcc-major-version) -lt 4 ]]; then
163 filter-flags -fstack-protector
164 fi
165 fi
166
167 # Incompatible with GCC 3.x CPP, bug #314615
168 if [[ $(gcc-major-version) -lt 4 ]]; then
169 ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
170 ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
171 fi
172
173 # detect if we should inform user about ebuild breakage
174 if ! has_version "x11-base/xorg-server" ||
175 has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
176 INFO="yes"
177 fi
178} 164}
179 165
180src_install() { 166src_install() {
181 xorg-2_src_install 167 xorg-2_src_install
182 168
200 186
201pkg_postinst() { 187pkg_postinst() {
202 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) 188 # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
203 eselect opengl set xorg-x11 --use-old 189 eselect opengl set xorg-x11 --use-old
204 190
205 if [[ ${INFO} = yes ]]; then 191 if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
206 elog "You should consider reading upgrade guide for this release:" 192 elog "You should consider reading upgrade guide for this release:"
207 elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml" 193 elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
208 echo 194 echo
209 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)" 195 ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
210 ewarn "because the ABI changed. If you cannot start X because" 196 ewarn "because the ABI changed. If you cannot start X because"
212 198
213 echo 199 echo
214 ewarn "You can generate a list of all installed packages in the x11-drivers" 200 ewarn "You can generate a list of all installed packages in the x11-drivers"
215 ewarn "category using this command:" 201 ewarn "category using this command:"
216 ewarn " emerge portage-utils; qlist -I -C x11-drivers/" 202 ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
203 ewarn "or using sets from portage-2.2:"
204 ewarn " emerge @x11-module-rebuild"
217 fi 205 fi
218} 206}
219 207
220pkg_postrm() { 208pkg_postrm() {
221 # Get rid of module dir to ensure opengl-update works properly 209 # Get rid of module dir to ensure opengl-update works properly
222 if ! has_version x11-base/xorg-server; then
223 if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then 210 if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
224 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules 211 rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
225 fi
226 fi 212 fi
227} 213}
228 214
229dynamic_libgl_install() { 215dynamic_libgl_install() {
230 # next section is to setup the dynamic libGL stuff 216 # next section is to setup the dynamic libGL stuff

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

  ViewVC Help
Powered by ViewVC 1.1.20