diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 12 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-0.99.4 | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-0.99.4.ebuild | 157 |
4 files changed, 168 insertions, 11 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 3c1f2797fe7b..aceb80975a02 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.69 2005/11/14 16:37:02 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.70 2005/12/04 20:46:24 joshuabaergen Exp $ + +*xorg-server-0.99.4 (04 Dec 2005) + + 04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> + +xorg-server-0.99.4.ebuild: + Bump for 7.0RC3. 14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch, diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 130922576c0a..b97a5c9193c3 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,19 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 c3501e991bbc8f09e3a903e8f08510ad ChangeLog 13931 MD5 a4667dca1eda69c90ff9dede2d1c4e00 files/digest-xorg-server-0.99.2-r2 137 MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3 137 MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3-r1 137 +MD5 c3af0cd9c857876e83ffed042ffe723d files/digest-xorg-server-0.99.4 137 MD5 a659ef5f3be42a4e35146f7026f65864 files/fix-xkb-compile-path-2.patch 710 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 MD5 a01a1416152f751b32b2ac812defee06 xorg-server-0.99.2-r2.ebuild 4014 MD5 03a5d02913e8550e82561cb555d37ad6 xorg-server-0.99.3-r1.ebuild 4073 MD5 c2c289a801304b85e5e623df89362c92 xorg-server-0.99.3.ebuild 4068 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDjSeTgIKl8Uu19MoRAj7cAJwPSi5CDaPGf3sYCLSah84thLQYNQCePMEm -/93HV49J4WD4UaPnLdZHCRA= -=pywv ------END PGP SIGNATURE----- +MD5 396c6b9d227f4e4e91a3149b10f6066f xorg-server-0.99.4.ebuild 4075 diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.4 b/x11-base/xorg-server/files/digest-xorg-server-0.99.4 new file mode 100644 index 000000000000..e276da4cd394 --- /dev/null +++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.4 @@ -0,0 +1,2 @@ +MD5 85a84e47a3f718f752f306b9e0954ef6 MesaLib-6.4.tar.bz2 2928503 +MD5 a4354b15e6ef7462c070f74bcc7532da xorg-server-0.99.4.tar.bz2 5804941 diff --git a/x11-base/xorg-server/xorg-server-0.99.4.ebuild b/x11-base/xorg-server/xorg-server-0.99.4.ebuild new file mode 100644 index 000000000000..8a22e2e3ed0f --- /dev/null +++ b/x11-base/xorg-server/xorg-server-0.99.4.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.4.ebuild,v 1.1 2005/12/04 20:46:24 joshuabaergen Exp $ + +# Must be before x-modular eclass is inherited +# Hack to make sure autoreconf gets run +#SNAPSHOT="yes" + +inherit flag-o-matic x-modular multilib + +OPENGL_DIR="xorg-x11" + +MESA_PN="Mesa" +MESA_PV="6.4" +MESA_P="${MESA_PN}-${MESA_PV}" +MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}" + +#PATCHES="${FILESDIR}/fix-xkb-compile-path-2.patch" + +SRC_URI="${SRC_URI} + mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2" +DESCRIPTION="X.Org X servers" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86" +IUSE="dri ipv6 minimal xprint" +RDEPEND="x11-libs/libXfont + x11-libs/xtrans + x11-libs/libXau + x11-libs/libXext + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/libXdmcp + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXi + media-libs/freetype + >=media-libs/mesa-6 + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + x11-misc/xbitmaps + x11-misc/xkbdata + x11-apps/iceauth + x11-apps/rgb + x11-apps/xauth + x11-apps/xinit + app-admin/eselect-opengl + x11-libs/libXaw + x11-libs/libXpm + x11-libs/libXxf86misc + x11-libs/libXxf86vm + !minimal? ( x11-libs/libdmx + x11-libs/libXtst + x11-libs/libXres ) + x11-libs/libxkbui + x11-libs/liblbxutil" + # Xres is dmx-dependent, xkbui is xorgcfg-dependent + # Xaw is dmx- and xorgcfg-dependent + # Xpm is dmx- and xorgcfg-dependent, pulls in Xt + # Xxf86misc and Xxf86vm are xorgcfg-dependent + # liblbxutil is lbx- dependent +DEPEND="${RDEPEND} + x11-proto/randrproto + x11-proto/renderproto + x11-proto/fixesproto + x11-proto/damageproto + x11-proto/xextproto + x11-proto/xproto + x11-proto/xf86dgaproto + x11-proto/xf86miscproto + x11-proto/xf86rushproto + x11-proto/xf86vidmodeproto + x11-proto/xf86bigfontproto + x11-proto/compositeproto + x11-proto/recordproto + x11-proto/resourceproto + x11-proto/videoproto + x11-proto/scrnsaverproto + x11-proto/evieext + x11-proto/trapproto + >=x11-proto/xineramaproto-1.1-r1 + x11-proto/fontsproto + >=x11-proto/kbproto-1.0-r1 + x11-proto/inputproto + x11-proto/bigreqsproto + x11-proto/xcmiscproto + >=x11-proto/glproto-1.4.1_pre20051013 + !minimal? ( x11-proto/dmxproto ) + dri? ( x11-proto/xf86driproto + x11-libs/libdrm ) + xprint? ( x11-proto/printproto + x11-apps/mkfontdir + x11-apps/mkfontscale )" + +pkg_setup() { + # localstatedir is used for the log location; we need to override the default + # from ebuild.sh + # sysconfdir is used for the xorg.conf location; same applies + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable !minimal dmx) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(use_enable dri) + $(use_enable xprint) + --enable-xcsecurity + --with-mesa-source=${WORKDIR}/${MESA_P} + --enable-xorg + --enable-xtrap + --enable-xevie + --sysconfdir=/etc/X11 + --localstatedir=/var + --disable-static + --enable-install-setuid + --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1" +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + # As of 20051028, should be taken care of by upstream + dosym Xorg /usr/bin/X +} + +pkg_postinst() { + switch_opengl_implem +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then + rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules + fi + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving GL files for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + local x="" + for x in ${D}/usr/$(get_libdir)/xorg/modules/libglx*; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions + fi + done + eend 0 +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set --use-old ${OPENGL_DIR} +} |