diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 7 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/check-for-glproto.patch | 27 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4 | 3 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/fix-xf86misc-typo.patch | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/files/xorg-server-0.99.1-x86_64-1.patch | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild | 141 |
7 files changed, 7 insertions, 210 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index dd77c36b6830..ce353779a136 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # 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.33 2005/08/23 01:04:45 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.34 2005/08/23 01:06:27 spyderous Exp $ + + 23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/check-for-glproto.patch, -files/fix-xf86misc-typo.patch, + -files/xorg-server-0.99.1-x86_64-1.patch, -xorg-server-0.99.1-r4.ebuild: + Pull old version. 23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/0.99.1-r5-check-for-glproto.patch, xorg-server-0.99.1-r5.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index fef32c74a219..47d43c4fa2e5 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,10 +1,5 @@ MD5 a1aa5c945f39820c9b056e6f3a56ad9d xorg-server-0.99.1-r5.ebuild 3685 -MD5 b4f1105c1e3f8f89375f708c190ae941 ChangeLog 6552 -MD5 c260994b130937c580724129501918cc xorg-server-0.99.1-r4.ebuild 3644 +MD5 4026dba9ac6a9d5aa9a39b5929f358d6 ChangeLog 6769 MD5 09038114af03ae42879f9729972ce96e files/digest-xorg-server-0.99.1-r5 241 MD5 1fa8d5da48c29537eeca2a0b63fd31a2 files/fix-xnest.patch 682 -MD5 cda95e8d1c7c9540a7619dbe007c125d files/fix-xf86misc-typo.patch 615 -MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876 MD5 bef863b379ee69c1339b0e01e4d51284 files/0.99.1-r5-check-for-glproto.patch 859 -MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452 -MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237 diff --git a/x11-base/xorg-server/files/check-for-glproto.patch b/x11-base/xorg-server/files/check-for-glproto.patch deleted file mode 100644 index c769c9f50e0c..000000000000 --- a/x11-base/xorg-server/files/check-for-glproto.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: xorg/configure.ac -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/configure.ac,v -retrieving revision 1.30 -diff -u -b -B -r1.30 configure.ac ---- xorg/configure.ac 27 Jul 2005 08:11:26 -0000 1.30 -+++ xorg/configure.ac 28 Jul 2005 20:49:35 -0000 -@@ -221,6 +221,9 @@ - if test "$DMX" = yes; then - PKG_CHECK_MODULES([DMXMODULES], - [xmuu xext x11 xrender xfont xi dmxproto]) -+ if test "$GLX" = yes; then -+ PKG_CHECK_MODULES([GL],[glproto]) -+ fi - fi - AM_CONDITIONAL(DMX, [test x$DMX = xyes]) - -@@ -404,6 +407,9 @@ - AC_SUBST(DRIPROTO_CFLAGS) - PKG_CHECK_MODULES([LIBDRM], [libdrm]) - AC_SUBST(LIBDRM_CFLAGS) -+ if test "$GLX" = yes; then -+ PKG_CHECK_MODULES([GL],[glproto]) -+ fi - fi - AC_DEFINE(XINPUT,1,[Support X Input extension]) - EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la' diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4 deleted file mode 100644 index 9d155cfa5bd7..000000000000 --- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415 -MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711 -MD5 c5bce228e19d2117e6f937e974b51f93 xorg-server-0.99.1-update-to-CVS-HEAD-20050820.patch.gz 269877 diff --git a/x11-base/xorg-server/files/fix-xf86misc-typo.patch b/x11-base/xorg-server/files/fix-xf86misc-typo.patch deleted file mode 100644 index 6c1f0ef140d1..000000000000 --- a/x11-base/xorg-server/files/fix-xf86misc-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: xorg/configure.ac -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/configure.ac,v -retrieving revision 1.30 -diff -u -b -B -r1.30 configure.ac ---- xorg/configure.ac 27 Jul 2005 08:11:26 -0000 1.30 -+++ xorg/configure.ac 28 Jul 2005 20:49:35 -0000 -@@ -541,7 +547,7 @@ - if test x$XF86VIDMODE = xyes; then - AC_DEFINE(XF86VIDMODE,1,[Support XFree86 Video Mode extension]) - fi --if test x$XF86MIS = xyes; then -+if test x$XF86MISC = xyes; then - AC_DEFINE(XF86MISC,1,[Support XFree86 miscellaneous extensions]) - fi - # must come first as it uses stuff in Shape -d diff --git a/x11-base/xorg-server/files/xorg-server-0.99.1-x86_64-1.patch b/x11-base/xorg-server/files/xorg-server-0.99.1-x86_64-1.patch deleted file mode 100644 index 5130b2828931..000000000000 --- a/x11-base/xorg-server/files/xorg-server-0.99.1-x86_64-1.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: configure.ac -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/configure.ac,v -retrieving revision 1.45 -diff -u -r1.45 configure.ac ---- xorg-server-0.99.1/configure.ac 5 Aug 2005 15:43:31 -0000 1.45 -+++ xorg-server-0.99.1/configure.ac 6 Aug 2005 15:57:07 -0000 -@@ -137,7 +137,7 @@ - *bsd*) xorg_bus_ix86pci="no" ;; - esac - ;; -- amd64*) -+ x86_64*) - xorg_bus_ix86pci="yes" - ;; - esac diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild deleted file mode 100644 index 4d5c61f5e4b5..000000000000 --- a/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# 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.1-r4.ebuild,v 1.3 2005/08/21 22:00:15 spyderous Exp $ - -# Must be before x-modular eclass is inherited -# Hack to make sure autoreconf gets run -SNAPSHOT="yes" - -inherit flag-o-matic x-modular - -OPENGL_DIR="xorg-x11" - -MESA_PN="Mesa" -MESA_PV="6.3.1.1" -MESA_P="${MESA_PN}-${MESA_PV}" - -CVS_UPDATE_DATE="20050820" - -PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch - ${FILESDIR}/check-for-glproto.patch - ${FILESDIR}/fix-xf86misc-typo.patch - ${FILESDIR}/${P}-x86_64-1.patch" - -SRC_URI="${SRC_URI} - http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz - http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch.gz" -DESCRIPTION="X.Org X servers" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -#IUSE="dri ipv6 minimal xprint" -IUSE="dri ipv6 minimal" -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 - >=x11-base/opengl-update-2.2.3" -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/dmxproto - x11-proto/videoproto - x11-proto/scrnsaverproto - x11-proto/evieext - x11-proto/trapproto - >=x11-proto/xineramaproto-1.1-r1 - x11-proto/fontsproto - x11-proto/kbproto - x11-proto/inputproto - x11-proto/bigreqsproto - x11-proto/xcmiscproto - x11-proto/glproto - dri? ( x11-proto/xf86driproto - x11-libs/libdrm )" -# xprint? ( x11-proto/printproto ) - -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) - --disable-xprint - --with-mesa-source=${WORKDIR}/${MESA_P} - --enable-glx - --enable-xorg - --enable-xtrap - --enable-xevie - --sysconfdir=/etc/X11 - --localstatedir=/var" -# $(use_enable xprint) - - # X won't start if -fomit-frame-pointer isn't filtered - filter-flags -fomit-frame-pointer -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - dosym Xorg /usr/bin/X - fperms 4711 /usr/bin/Xorg -} - -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 - local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)" - ${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR} -} |