diff options
| author | James Cloos <cloos@jhcloos.com> | 2009-01-30 06:27:16 -0500 |
|---|---|---|
| committer | James Cloos <cloos@jhcloos.com> | 2009-01-30 06:27:16 -0500 |
| commit | 170731e0a4f984f9a2e4834b56e6a7b529b4a5b0 (patch) | |
| tree | b3daea1672e4b12bfaf22707d06bc35d9ec37829 | |
| parent | 8596c96815107647c0d25409a545ef64f1dbd1ad (diff) | |
Remove ebuilds which are also in the X11 project Overlay
As live-x11 was conceived as a staging overlay for the X11 overlay,
keep only the ebuilds which have not yet been moved over.
To best use the live-x11 overlay, put it after the X11 overlay.
The X11 overlay is at: git://git.overlays.gentoo.org/proj/x11.git
237 files changed, 0 insertions, 16006 deletions
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest deleted file mode 100644 index 77a66fe..0000000 --- a/media-libs/fontconfig/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX fontconfig-2.3.2-docbook.patch 506 RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 SHA1 1054f38cef09c93baf34f08253345ca2ae638e4a SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 -MD5 083e41bbcbce3f6ee01214d8cecf150b files/fontconfig-2.3.2-docbook.patch 506 -RMD160 c205d99ecc19866da8d0ac4ef7172dcef98a6299 files/fontconfig-2.3.2-docbook.patch 506 -SHA256 c6480dcf19fec22126a9205fa3d9b317e5a97613f86218cf1926a2a07848afd5 files/fontconfig-2.3.2-docbook.patch 506 -EBUILD fontconfig-9999.ebuild 2464 RMD160 647ffaa831c039e5e8a4e96cd1a7a9e08fd640bf SHA1 9cb3633e9ec03f2a546b09980b2fc1568d4272ef SHA256 f0f3976b8ff27dec91118e6a7e21742f3c514fb5493646b74a9804f13a8fc704 -MD5 5c0a65c50ef273e8da8be009ba117ccd fontconfig-9999.ebuild 2464 -RMD160 647ffaa831c039e5e8a4e96cd1a7a9e08fd640bf fontconfig-9999.ebuild 2464 -SHA256 f0f3976b8ff27dec91118e6a7e21742f3c514fb5493646b74a9804f13a8fc704 fontconfig-9999.ebuild 2464 diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch deleted file mode 100644 index 6a6c01e..0000000 --- a/media-libs/fontconfig/files/fontconfig-2.3.2-docbook.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.in.old 2006-03-31 18:31:26.000000000 +0200 -+++ configure.in 2006-03-31 18:44:47.000000000 +0200 -@@ -407,7 +407,11 @@ - # Let people not build/install docs if they don't have docbook - # - --AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) -+AC_ARG_ENABLE(docbook, [ --disable-docbook Don't build documentation],,) -+ -+if test x$enable_docbook != xno; then -+ AC_CHECK_PROG(HASDOCBOOK, docbook2html, yes, no) -+fi - - AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes) - diff --git a/media-libs/fontconfig/fontconfig-9999.ebuild b/media-libs/fontconfig/fontconfig-9999.ebuild deleted file mode 100644 index 16fc656..0000000 --- a/media-libs/fontconfig/fontconfig-9999.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.4.2.ebuild,v 1.12 2007/05/27 00:34:02 kumba Exp $ - -inherit eutils libtool autotools git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}" - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="" - -LICENSE="fontconfig" -SLOT="1.0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="doc xml" - -RDEPEND=">=media-libs/freetype-2.1.4 - !xml? ( >=dev-libs/expat-1.95.3 ) - xml? ( >=dev-libs/libxml2-2.6 )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-text/docbook-sgml-utils )" - -src_unpack() { - git_src_unpack - - cd "${S}" - # add docbook switch so we can disable it - epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch - - eautoreconf - - # elibtoolize - epunt_cxx #74077 -} - -src_compile() { - [ "${ARCH}" == "alpha" -a "${CC}" == "ccc" ] && \ - die "Dont compile fontconfig with ccc, it doesnt work very well" - - # disable docs only disables local docs generation, they come with the tarball - econf $(use_enable doc docs) \ - $(use_enable doc docbook) \ - --localstatedir=/var \ - --with-docdir=/usr/share/doc/${PF} \ - --with-default-fonts=/usr/share/fonts \ - --with-add-fonts=/usr/local/share/fonts,/usr/X11R6/lib/X11/fonts \ - $(use_enable xml libxml2) \ - || die - - emake -j1 || die -} - -src_install() { - emake DESTDIR="${D}" install || die - - insinto /etc/fonts - doins "${S}"/fonts.conf - newins "${S}"/fonts.conf fonts.conf.new - - cd "${S}" - newman doc/fonts-conf.5 fonts-conf.5 - - dohtml doc/fontconfig-user.html - dodoc doc/fontconfig-user.{txt,pdf} - - if use doc; then - doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc - dohtml -r doc/fontconfig-devel - dodoc doc/fontconfig-devel.{txt,pdf} - fi - - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - # Changes should be made to /etc/fonts/local.conf, and as we had - # too much problems with broken fonts.conf, we force update it ... - # <azarah@gentoo.org> (11 Dec 2002) - ewarn "Please make fontconfig configuration changes in /etc/fonts/conf.d/" - ewarn "and NOT to /etc/fonts/fonts.conf, as it will be replaced!" - mv -f ${ROOT}/etc/fonts/fonts.conf.new ${ROOT}/etc/fonts/fonts.conf - rm -f ${ROOT}/etc/fonts/._cfg????_fonts.conf - - if [ "${ROOT}" = "/" ] - then - ebegin "Creating global font cache..." - /usr/bin/fc-cache -s - eend $? - fi -} diff --git a/media-libs/glitz/Manifest b/media-libs/glitz/Manifest deleted file mode 100644 index ce500d6..0000000 --- a/media-libs/glitz/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX glitz-9999-configure.in.patch 359 RMD160 26f2f821af780835e9a67b3bff03f80875b7d97d SHA1 131376ab75ad8a71c822cfd4ee35ab5b48c5cf0c SHA256 c396d0385e9e4b87a4a7fc79cd172d6ccfc9397397e7d085663a295c44ee85ec -EBUILD glitz-9999.ebuild 659 RMD160 268a90e0467f2e1911ae7e4cfd79010de0af6bb3 SHA1 2945f2fb2cf6c63faecfbb50edd06c2b255f5267 SHA256 cec1390d8f073edec79f54a2a974dea0263eceb5b2c0cd3ac1ffeb0af8a1ffd7 diff --git a/media-libs/glitz/files/glitz-9999-configure.in.patch b/media-libs/glitz/files/glitz-9999-configure.in.patch deleted file mode 100644 index 2e778fc..0000000 --- a/media-libs/glitz/files/glitz-9999-configure.in.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/configure.in b/configure.in -index 244bd98..b2d9c3f 100644 ---- a/configure.in -+++ b/configure.in -@@ -31,6 +31,9 @@ LT_AGE=0 - - VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" - AC_SUBST(VERSION_INFO) -+AC_SUBST(LT_CURRENT) -+AC_SUBST(LT_REVISION) -+AC_SUBST(LT_AGE) - - dnl =========================================================================== - diff --git a/media-libs/glitz/glitz-9999.ebuild b/media-libs/glitz/glitz-9999.ebuild deleted file mode 100644 index 88445fd..0000000 --- a/media-libs/glitz/glitz-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EGIT_PATCHES="*.patch" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/glitz.git" - -inherit autotools git - -SRC_URI="" - -DESCRIPTION="An OpenGL image compositing library" -HOMEPAGE="http://www.freedesktop.org/Software/glitz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ~ppc-macos ppc64 sh x86 ~x86-fbsd" -IUSE="" - -DEPEND="virtual/opengl" - -src_compile() { - eautoreconf || die "autoreconf failed" - econf || die "configure failed" - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS README TODO -} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest deleted file mode 100644 index 1688aa0..0000000 --- a/media-libs/mesa/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91 -AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 -EBUILD mesa-9999.ebuild 7441 RMD160 0c57d779ea45545758ad2ed6ec21363433bfe826 SHA1 052e6757cc59928ec0182a26f4add0a88fd5b49a SHA256 b1fef3a592643efe1a47d99aa287f6724fa8d9eac7e80c9c2daf1ec9da8630c6 diff --git a/media-libs/mesa/files/lib/libGL.la b/media-libs/mesa/files/lib/libGL.la deleted file mode 100644 index cc2fd24..0000000 --- a/media-libs/mesa/files/lib/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/${libdir} -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/media-libs/mesa/files/lib/libGLU.la b/media-libs/mesa/files/lib/libGLU.la deleted file mode 100644 index cc76b4b..0000000 --- a/media-libs/mesa/files/lib/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild deleted file mode 100644 index 1f96d7f..0000000 --- a/media-libs/mesa/mesa-9999.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.6 2007/11/16 18:16:30 dberkholz Exp $ - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -inherit autotools multilib flag-o-matic git portability - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV//_}" -MY_SRC_P="${MY_PN}Lib-${PV/_/-}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" -if [[ $PV = *_rc* ]]; then - SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz" -elif [[ $PV = 9999 ]]; then - SRC_URI="" -else - SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -fi -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE_VIDEO_CARDS=" - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_none - video_cards_r128 - video_cards_radeon - video_cards_s3virge - video_cards_savage - video_cards_sis - video_cards_sunffb - video_cards_tdfx - video_cards_trident - video_cards_via" -IUSE="${IUSE_VIDEO_CARDS} - debug - doc - pic - motif - nptl - xcb - kernel_FreeBSD" - -RDEPEND="app-admin/eselect-opengl - dev-libs/expat - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXdamage - >=x11-libs/libdrm-9999 - x11-libs/libICE - motif? ( x11-libs/openmotif ) - doc? ( app-doc/opengl-manpages ) - !<=x11-base/xorg-x11-6.9" -DEPEND="${RDEPEND} - !<=x11-proto/xf86driproto-2.0.3 - dev-util/pkgconfig - x11-misc/makedepend - x11-proto/inputproto - x11-proto/xextproto - !hppa? ( x11-proto/xf86driproto ) - x11-proto/dri2proto - x11-proto/xf86vidmodeproto - >=x11-proto/glproto-1.4.8 - motif? ( x11-proto/printproto )" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -pkg_setup() { - if use xcb; then - if ! built_with_use x11-libs/libX11 xcb; then - msg="You must build libX11 with xcb enabled." - eerror ${msg} - die ${msg} - fi - fi - - if use debug; then - append-flags -g - fi - - # gcc 4.2 has buggy ivopts - if [[ $(gcc-version) = "4.2" ]]; then - append-flags -fno-ivopts - fi - - # recommended by upstream - append-flags -ffast-math -} - -src_unpack() { - git_src_unpack - cd "${S}" - - # FreeBSD 6.* doesn't have posix_memalign(). - [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac - - # Don't compile debug code with USE=-debug - bug #125004 - if ! use debug; then - einfo "Removing DO_DEBUG defs in dri drivers..." - find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; - fi - - eautoreconf -} - -src_compile() { - local myconf - - # This is where we might later change to build xlib/osmesa - myconf="${myconf} --with-driver=dri" - - # Do we want thread-local storage (TLS)? - myconf="${myconf} $(use_enable nptl glx-tls)" - - # Configurable DRI drivers - driver_enable swrast - driver_enable video_cards_i810 i810 i915 i965 - driver_enable video_cards_mach64 mach64 - driver_enable video_cards_mga mga - driver_enable video_cards_r128 r128 - driver_enable video_cards_radeon radeon r200 r300 - driver_enable video_cards_s3virge s3v - driver_enable video_cards_savage savage - driver_enable video_cards_sis sis - driver_enable video_cards_sunffb ffb - driver_enable video_cards_tdfx tdfx - driver_enable video_cards_trident trident - driver_enable video_cards_via unichrome - - # Set drivers to everything on which we ran driver_enable() - myconf="${myconf} --with-dri-drivers=${DRI_DRIVERS}" - - # Deactivate assembly code for pic build - myconf="${myconf} $(use_enable pic asm)" - - # Sparc assembly code is not working - myconf="${myconf} $(use_enable sparc asm)" - - myconf="${myconf} --disable-glut" - - myconf="${myconf} --without-demos" - - myconf="${myconf} $(use_enable xcb)" - - # Get rid of glut includes - rm -f "${S}"/include/GL/glut*h - - myconf="${myconf} $(use_enable motif glw)" - - econf ${myconf} || die - emake || die -} - -src_install() { - dodir /usr - emake \ - DESTDIR="${D}" \ - install || die "Installation failed" - - if ! use motif; then - rm "${D}"/usr/include/GL/GLwMDrawA.h - fi - - # Don't install private headers - rm -f "${D}"/usr/include/GL/GLw*P.h - - fix_opengl_symlinks - dynamic_libgl_install - - # Install libtool archives - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins "${FILESDIR}"/lib/libGLU.la - sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \ - > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # On *BSD libcs dlopen() and similar functions are present directly in - # libc.so and does not require linking to libdl. portability eclass takes - # care of finding the needed library (if needed) witht the dlopen_lib - # function. - sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ - "${D}"/usr/$(get_libdir)/libGLU.la \ - "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la - - # libGLU doesn't get the plain .so symlink either - #dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so - - # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to - # as the default libGL.so.1 -} - -pkg_postinst() { - switch_opengl_implem - - # We need the outer check, because xorg-server may not be installed - # first, and built_with_use() dies if the package isn't installed. - if has_version x11-base/xorg-server; then - if built_with_use x11-base/xorg-server nptl; then - ewarn "Rebuild x11-base/xorg-server without USE=nptl" - ewarn "or AIGLX (compiz, etc.) will not work." - ewarn "This is because of a bug in the Mesa NPTL assembly code" - ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)." - fi - fi -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find "${D}"/usr/$(get_libdir) \ - -name libGL\.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - if [[ ${CHOST} == *-freebsd* ]]; then - # FreeBSD doesn't use major.minor versioning, so the library is only - # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create - # libGL.so symlink and leave libGL.so.1 being the real thing - dosym libGL.so.1 /usr/$(get_libdir)/libGL.so - else - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x="" - for x in "${D}"/usr/$(get_libdir)/libGL.so* \ - "${D}"/usr/$(get_libdir)/libGL.la \ - "${D}"/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib - fi - done - # glext.h added for #54984 - for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - 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} -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS="${DRI_DRIVERS},$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS="${DRI_DRIVERS},${i}" - done - fi - ;; - esac -} diff --git a/virtual/xft/ChangeLog b/virtual/xft/ChangeLog deleted file mode 100644 index d608ad5..0000000 --- a/virtual/xft/ChangeLog +++ /dev/null @@ -1,40 +0,0 @@ -# ChangeLog for virtual/xft -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/xft/ChangeLog,v 1.11 2006/08/23 21:26:11 swegener Exp $ - - 23 Aug 2006; Sven Wegener <swegener@gentoo.org> xft-6.8.ebuild, - xft-7.0.ebuild: - Virtual packages have no build-time dependencies. - - 22 Aug 2006; Ferris McCormick <fmccor@gentoo.org> xft-7.0.ebuild: - Stable on sparc. - - 20 Jul 2006; Jeroen Roovers <jer@gentoo.org> xft-7.0.ebuild: - Stable on HPPA. - - 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> xft-7.0.ebuild: - Mark 7.0 stable on ia64 - - 10 Jul 2006; Stephen P. Becker <geoman@gentoo.org> xft-6.8.ebuild: - removing mips from 6.8, please use modular X on mips - - 01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>; xft-7.0.ebuild: - alpha/arm/mips/ppc/sh stable. Holding off on sparc for now, gustavoz is - having issues. - - 30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> xft-7.0.ebuild: - Stable on amd64. - - 30 Jun 2006; Markus Rothe <corsair@gentoo.org> xft-7.0.ebuild: - Stable on ppc64 - - 30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; xft-7.0.ebuild: - x86 stable. - -*xft-7.0 (24 Apr 2006) -*xft-6.8 (24 Apr 2006) - - 24 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml, - +xft-6.8.ebuild, +xft-7.0.ebuild: - Add new-style virtual for xft, again so xorg-x11-7 ebuilds don't provide it. - diff --git a/virtual/xft/Manifest b/virtual/xft/Manifest deleted file mode 100644 index 111b18a..0000000 --- a/virtual/xft/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -EBUILD xft-6.8.ebuild 463 RMD160 7e659037b59300575bb3b9f8b21063bd7fc454dc SHA1 6b345dac646ed55da485d3ad751b0c82e614a825 SHA256 9a69009d7deebc810e2786a244e535eaa1a614e492c00dff3dbee01a25e8468a -MD5 56eaa6d8c29b803ce1047381fb7fbf3c xft-6.8.ebuild 463 -RMD160 7e659037b59300575bb3b9f8b21063bd7fc454dc xft-6.8.ebuild 463 -SHA256 9a69009d7deebc810e2786a244e535eaa1a614e492c00dff3dbee01a25e8468a xft-6.8.ebuild 463 -MISC ChangeLog 1379 RMD160 c29a676843d027c104d6dd2b38d4d7be2be2a6b7 SHA1 74e32f6bcd24be310abeb38038d522b5f1f5a63d SHA256 f93aa753e56ef1e3a5523acfa2ef94dc6c27f12677fad54a582aa3438dbbcb55 -MD5 2d094001d79c7b056e49f6f0a600aca9 ChangeLog 1379 -RMD160 c29a676843d027c104d6dd2b38d4d7be2be2a6b7 ChangeLog 1379 -SHA256 f93aa753e56ef1e3a5523acfa2ef94dc6c27f12677fad54a582aa3438dbbcb55 ChangeLog 1379 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 -MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 -RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 -SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 diff --git a/virtual/xft/metadata.xml b/virtual/xft/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/virtual/xft/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -</pkgmetadata> diff --git a/virtual/xft/xft-6.8.ebuild b/virtual/xft/xft-6.8.ebuild deleted file mode 100644 index a594990..0000000 --- a/virtual/xft/xft-6.8.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/xft/xft-6.8.ebuild,v 1.3 2006/08/23 21:26:11 swegener Exp $ - -DESCRIPTION="Virtual for the Xft font library" -HOMEPAGE="http://www.gentoo.org/proj/en/desktop/x/x11/" -SRC_URI="" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" -IUSE="" -RDEPEND="<=x11-base/xorg-x11-6.99" -DEPEND="" diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest deleted file mode 100644 index 68a113f..0000000 --- a/x11-apps/xrandr/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -EBUILD xrandr-9999.ebuild 366 RMD160 6212f1925e5e95a4af41472c69605088cbb0c76d SHA1 541cffcabfdb19d286e92a9924548fe94b5deef9 SHA256 3139fbb47b7fc8eff8982d8199d849ec27d81b7891bd70b6e4b98e6091abdea5 -MISC xrandr-9999.ebuild.~8~ 360 RMD160 a47f228565517c38711b04552a6ebd3ce13aeb25 SHA1 d40976e8ee425d22cac3fc1b78015a1108f2c5b5 SHA256 29ab8ff4f3215904d1ba97ae44ec40c32d48a874cbee056b444a9157edc7ca3b diff --git a/x11-apps/xrandr/xrandr-9999.ebuild b/x11-apps/xrandr/xrandr-9999.ebuild deleted file mode 100644 index e12be91..0000000 --- a/x11-apps/xrandr/xrandr-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - - -inherit x-modular - -DESCRIPTION="primitive command line interface to RandR extension" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND=">=x11-libs/libXrandr-1.2 - x11-libs/libX11" -DEPEND="${RDEPEND}" diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest deleted file mode 100644 index 77e4f58..0000000 --- a/x11-base/xorg-server/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 -EBUILD xorg-server-9999.ebuild 11938 RMD160 71ef1f67b5cacbb606f301059a1d770ce8168e06 SHA1 fc5e10153344a45cf1043d2932925bbbe3e52d9f SHA256 316514389c94b840cf72f06d2ed26317c365f4b52b099886ca3abf37a80a4718 diff --git a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch deleted file mode 100644 index c3b9ebd..0000000 --- a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am -index 849ee8b..1b49d48 100644 ---- a/hw/xfree86/parser/Makefile.am -+++ b/hw/xfree86/parser/Makefile.am -@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \ - DRI.c \ - Extensions.c - --AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC - - EXTRA_DIST = \ - Configint.h \ diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild deleted file mode 100644 index 89e9f4f..0000000 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ /dev/null @@ -1,385 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.3.0.0.ebuild,v 1.9 2007/06/04 23:17:40 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular multilib - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -OPENGL_DIR="xorg-x11" - -DESCRIPTION="X.Org X servers" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_calcomp - input_devices_citron - input_devices_digitaledge - input_devices_dmc - input_devices_dynapro - input_devices_elo2300 - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_jamstudio - input_devices_joystick - input_devices_keyboard - input_devices_magellan - input_devices_microtouch - input_devices_mouse - input_devices_mutouch - input_devices_palmax - input_devices_penmount - input_devices_spaceorb - input_devices_summa - input_devices_tek4957 - input_devices_ur98 - input_devices_vmmouse - input_devices_void - - input_devices_synaptics - input_devices_wacom" -IUSE_VIDEO_CARDS=" - video_cards_fbdev - video_cards_i810 - video_cards_mach64 - video_cards_mga - video_cards_nv - video_cards_r128 - video_cards_radeon - video_cards_rendition - video_cards_savage - video_cards_tdfx - video_cards_vesa - video_cards_vmware - video_cards_xgi" -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_VIDEO_CARDS} - ${IUSE_INPUT_DEVICES} - ${IUSE_SERVERS} - 3dfx - dri hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - >=x11-libs/libXfont-1.3.2 - =x11-libs/xtrans-9999 - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXext-9999 - >=x11-libs/libX11-9999 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXmu-1.0.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXi-9999 - >=x11-libs/pixman-0.11.4 - media-libs/freetype - >=media-libs/mesa-7.1_rc1 - media-fonts/font-adobe-75dpi - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.3 - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - >=x11-apps/xinit-1.0.8 - app-admin/eselect-opengl - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXpm-3.5.7 - >=x11-libs/libXxf86misc-1.0.1 - >=x11-libs/libXxf86vm-1.0.1 - >=x11-libs/libpciaccess-0.10 - dmx? ( >=x11-libs/libdmx-1.0.2 - >=x11-libs/libXfixes-4.0.3 ) - !minimal? ( >=x11-libs/libXtst-1.0.3 - >=x11-libs/libXres-1.0.3 ) - >=x11-libs/libxkbui-1.0.2 - >=x11-libs/liblbxutil-1.0.1 - kdrive? ( sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # liblbxutil is lbx- dependent -DEPEND="${RDEPEND} - >=x11-proto/randrproto-1.2.1 - >=x11-proto/renderproto-0.9.3 - >=x11-proto/fixesproto-4 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.3 - >=x11-proto/xproto-7.0.13 - >=x11-proto/xf86dgaproto-2.0.3 - >=x11-proto/xf86miscproto-0.9.2 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.2 - >=x11-proto/xf86bigfontproto-1.1.2 - >=x11-proto/compositeproto-0.4 - >=x11-proto/recordproto-1.13.2 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/scrnsaverproto-1.1.0 - >=x11-proto/evieext-1.0.2 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/xineramaproto-1.1.2 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/inputproto-1.9.99.4 - >=x11-proto/bigreqsproto-1.0.2 - >=x11-proto/xcmiscproto-1.1.2 - >=x11-proto/glproto-1.4.9 - dmx? ( >=x11-proto/dmxproto-2.2.2 ) - dri? ( >=x11-proto/xf86driproto-2.0.3 - >=x11-proto/dri2proto-1.1 - >=x11-libs/libdrm-2.3 )" - -# Drivers -PDEPEND="${PDEPEND} - xorg? ( - input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.2.2 ) - input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.1.1 ) - input_devices_calcomp? ( >=x11-drivers/xf86-input-calcomp-1.1.2 ) - input_devices_citron? ( >=x11-drivers/xf86-input-citron-2.2.1 ) - input_devices_digitaledge? ( >=x11-drivers/xf86-input-digitaledge-1.1.1 ) - input_devices_dmc? ( >=x11-drivers/xf86-input-dmc-1.1.2 ) - input_devices_dynapro? ( >=x11-drivers/xf86-input-dynapro-1.1.2 ) - input_devices_elo2300? ( >=x11-drivers/xf86-input-elo2300-1.1.2 ) - input_devices_elographics? ( >=x11-drivers/xf86-input-elographics-1.2.1 ) - input_devices_evdev? ( >=x11-drivers/xf86-input-evdev-1.99.2-r2 ) - input_devices_fpit? ( >=x11-drivers/xf86-input-fpit-1.2.0 ) - input_devices_hyperpen? ( >=x11-drivers/xf86-input-hyperpen-1.2.0 ) - input_devices_jamstudio? ( >=x11-drivers/xf86-input-jamstudio-1.2.0 ) - input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.3.2 ) - input_devices_keyboard? ( >=x11-drivers/xf86-input-keyboard-1.3.1 ) - input_devices_magellan? ( >=x11-drivers/xf86-input-magellan-1.2.0 ) - input_devices_microtouch? ( >=x11-drivers/xf86-input-microtouch-1.2.0 ) - input_devices_mouse? ( >=x11-drivers/xf86-input-mouse-1.3.0 ) - input_devices_mutouch? ( >=x11-drivers/xf86-input-mutouch-1.2.0 ) - input_devices_palmax? ( >=x11-drivers/xf86-input-palmax-1.2.0 ) - input_devices_penmount? ( >=x11-drivers/xf86-input-penmount-1.3.0 ) - input_devices_spaceorb? ( >=x11-drivers/xf86-input-spaceorb-1.1.1 ) - input_devices_summa? ( >=x11-drivers/xf86-input-summa-1.2.0 ) - input_devices_tek4957? ( >=x11-drivers/xf86-input-tek4957-1.2.0 ) - input_devices_ur98? ( >=x11-drivers/xf86-input-ur98-1.1.0 ) - input_devices_vmmouse? ( >=x11-drivers/xf86-input-vmmouse-12.5.0 ) - input_devices_void? ( >=x11-drivers/xf86-input-void-1.1.1 ) - - input_devices_synaptics? ( x11-drivers/synaptics ) - input_devices_wacom? ( x11-drivers/linuxwacom ) - - video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.4.0 ) - video_cards_i810? ( >=x11-drivers/xf86-video-i810-2.3.1-r1 ) - video_cards_mach64? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 ) - video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.4.8 ) - video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.9 ) - video_cards_r128? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 ) - video_cards_radeon? ( >=x11-drivers/xf86-video-ati-6.8.0-r1 ) - video_cards_rendition? ( >=x11-drivers/xf86-video-rendition-4.2.0 ) - video_cards_savage? ( >=x11-drivers/xf86-video-savage-2.2.1 ) - video_cards_tdfx? ( >=x11-drivers/xf86-video-tdfx-1.4.0 ) - video_cards_vesa? ( >=x11-drivers/xf86-video-vesa-1.3.0 ) - video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-10.16.0 ) - video_cards_xgi? ( >=x11-drivers/xf86-video-xgi-1.5.0 ) - - video_cards_tdfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) - !x11-drivers/nvidia-drivers - !x11-drivers/ati-drivers - - !x11-drivers/xf86-video-amd - !x11-drivers/xf86-video-apm - !x11-drivers/xf86-video-ark - !x11-drivers/xf86-video-chips - !x11-drivers/xf86-video-cirrus - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-dummy - !x11-drivers/xf86-video-glint - !x11-drivers/xf86-video-i128 - !x11-drivers/xf86-video-i740 - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-imstt - !x11-drivers/xf86-video-neomagic - !x11-drivers/xf86-video-newport - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-s3 - !x11-drivers/xf86-video-s3virge - !x11-drivers/xf86-video-siliconmotion - !x11-drivers/xf86-video-sis - !x11-drivers/xf86-video-sisusb - !x11-drivers/xf86-video-sunbw2 - !x11-drivers/xf86-video-suncg14 - !x11-drivers/xf86-video-suncg3 - !x11-drivers/xf86-video-suncg6 - !x11-drivers/xf86-video-sunffb - !x11-drivers/xf86-video-sunleo - !x11-drivers/xf86-video-suntcx - !x11-drivers/xf86-video-tga - !x11-drivers/xf86-video-trident - !x11-drivers/xf86-video-tseng - !x11-drivers/xf86-video-v4l - !x11-drivers/xf86-video-vermilion - !x11-drivers/xf86-video-vga - !x11-drivers/xf86-video-via - !x11-drivers/xf86-video-voodoo - )" -LICENSE="${LICENSE} MIT" - -PATCHES="${FILESDIR}/1.4-fpic-libxf86config.patch" - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts="${conf_opts} --enable-xsdl" - else - conf_opts="${conf_opts} --disable-xsdl" - fi - - # 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 - # --enable-install-setuid needed because sparcs default off - CONFIGURE_OPTIONS=" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable x86 kdrive-vesa) - $(use_enable minimal builtin-fonts) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable dri) - $(use_enable xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-dbus) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - ${conf_opts}" - - local diemsg="You must build xorg-server and mesa with the same nptl USE setting." - if built_with_use media-libs/mesa nptl; then - use nptl || die "${diemsg}" - else - use nptl && die "${diemsg}" - fi - - # (#121394) Causes window corruption - filter-flags -fweb -} - -src_unpack() { - x-modular_specs_check - x-modular_dri_check - x-modular_unpack_source - x-modular_patch_source - - if use hal; then - sed -i \ - -e "s:^\(dbusconfigdir = \).*\(dbus-1.*\):\1/etc/\2:g" \ - "${S}"/config/Makefile.am \ - || die "failed to fix DBUS config directory" - SNAPSHOT="yes" - fi - - x-modular_reconf_source -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - # Install video mode files for system-config-display - insinto /usr/share/xorg - doins hw/xfree86/common/{extra,vesa}modes \ - || die "couldn't install extra modes" - - # Bug #151421 - this file is not built with USE="minimal" - # Bug #151670 - this file is also not build if USE="-xorg" - if ! use minimal && use xorg; then - # Install xorg.conf.example - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - # Bug #135544 - ewarn "Users of reduced blanking now need:" - ewarn " Option \"ReducedBlanking\"" - ewarn "In the relevant Monitor section(s)." - ewarn "Make sure your reduced blanking modelines are safe!" - - echo - ewarn "Rebuild all drivers if upgrading from a build before May 27, 2008," - ewarn "or earlier, If you cannot start X because of module version mismatch errors," - ewarn "this is your problem." - - echo - ewarn "You can generate a list of all installed packages in the x11-drivers" - ewarn "category using this command:" - ewarn "emerge portage-utils; qlist -I -C x11-drivers/" - - ebeep 5 - epause 10 -} - -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/extensions/libglx*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${D}"/usr/share/man/man1/Xserver.1x \ - "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${D}"/usr/share/man/man1/Xserver.1x - fi -} - -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} -} - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -} diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog deleted file mode 100644 index 583a097..0000000 --- a/x11-base/xorg-x11/ChangeLog +++ /dev/null @@ -1,2969 +0,0 @@ -# ChangeLog for x11-base/xorg-x11 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.579 2007/01/25 03:35:57 joshuabaergen Exp $ - -*xorg-x11-7.2 (25 Jan 2007) - - 25 Jan 2007; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.2.ebuild: - Bump for 7.2. - - 24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-7.0-r1.ebuild: - Stop supporting Xorg 7.0. - - 02 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.1.ebuild: - Play nice with $ROOT. - - 14 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.1.ebuild: - AMD64/x86 stable for bug #144549 (X7.1). - - 05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Removing references to media-video/nvidia-glx since it is no longer in the - tree. - - 01 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild, xorg-x11-7.1.ebuild: - Since portage 2.1 has been stable for a while, stop depending on it because - it breaks diskless X terminals and such. - - 12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r8.ebuild, xorg-x11-6.9.0-r3.ebuild: - Stop using PROVIDE for old-style virtuals. Allow new-style virtuals to pull - stuff in as needed. - - 12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.2-r7.ebuild: - Get rid of an even older monolith ebuild. - - 12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r8.ebuild, xorg-x11-6.9.0-r3.ebuild: - USE=GAPING_SECURITY_HOLE to install unsupported, vulnerable monolith versions. - - 12 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> xorg-x11-7.1.ebuild: - Stable on hppa - - 26 Aug 2006; Hanno Boeck <hanno@gentoo.org> xorg-x11-6.8.2-r7.ebuild, - xorg-x11-6.8.2-r8.ebuild, xorg-x11-6.9.0-r3.ebuild, - xorg-x11-7.0-r1.ebuild: - Change linuxwacom-location from x11-misc to x11-drivers. - - 22 Aug 2006; Ferris McCormick <fmccor@gentoo.org> xorg-x11-7.1.ebuild: - Stable on sparc (finally). - - 18 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Move architecture-specific video driver defaults into profiles. - - 19 Jul 2006; Guy Martin <gmsoft@gentoo.org> xorg-x11-7.0-r1.ebuild: - Stable on hppa. - - 15 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - (#140465) video_cards_3dfx -> video_cards_tdfx. - - 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> xorg-x11-7.1.ebuild: - Mark 7.1 stable on ia64 - - 09 Jul 2006; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.2-r7.ebuild, xorg-x11-6.8.2-r8.ebuild: - removing mips keywords from the 6.8 series, please use 7.1 on mips, or 6.9.0 - if you really really want the older monolithic style X - - 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r7.ebuild, xorg-x11-6.8.2-r8.ebuild, - xorg-x11-6.9.0-r3.ebuild: - Add blockers on all modular X packages to prevent weird issues with vanished - files upon downgrade to monolithic and re-upgrade to modular. - - 07 Jul 2006; Kristopher Kersey <augustus@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Added || dependancy on x11-drivers/nvidia-drivers or - x11-drivers/nvidia-legacy-drivers when nvidia is specified. - - 07 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: - Update to my new email address. - - 01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; - files/x11r6.9.0-setuid.diff, files/xorg-68x-setuid.patch: - (#138688) Missing close parenthesis on one of the getuid() calls (Rudo Thomas). - -*xorg-x11-6.9.0-r3 (01 Jul 2006) - - 01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; - +files/6.9.0-fix-rom-read-dualhead.patch, -xorg-x11-6.9.0-r2.ebuild, - +xorg-x11-6.9.0-r3.ebuild: - Fix dual-head. - - 01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.1.ebuild: - alpha/arm/mips/ppc/sh stable. Holding off on sparc for now, gustavoz is - having issues. - - 30 Jun 2006; Markus Rothe <corsair@gentoo.org> xorg-x11-7.1.ebuild: - Stable on ppc64 - - 30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Stable on amd64. - - 30 Jun 2006; Thomas Cort <tcort@gentoo.org> xorg-x11-6.8.2-r8.ebuild: - Stable on alpha wrt security Bug #135974. - - 30 Jun 2006; Markus Rothe <corsair@gentoo.org> xorg-x11-7.0-r1.ebuild: - Stable on ppc64 - - 30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - x86 stable. - - 29 Jun 2006; Thomas Cort <tcort@gentoo.org> xorg-x11-6.8.2-r8.ebuild: - Stable on amd64 wrt security Bug #135974. - - 27 Jun 2006; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r8.ebuild: - Stable on hppa. - - 25 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> - xorg-x11-6.8.2-r8.ebuild: - ppc stable, bug #135974 - - 24 Jun 2006; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r8.ebuild: - Stable on ppc64; bug #135974 - - 22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> - xorg-x11-6.8.2-r8.ebuild: - Stable on x86 wrt bug #135974. - - 21 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> - xorg-x11-6.8.2-r8.ebuild: - Stable on sparc wrt security #135974 - - 21 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.9.0-r2.ebuild: - (#134604) Don't ever compile sunffb DRI driver, the compilation's broken. - -*xorg-x11-6.9.0-r2 (20 Jun 2006) -*xorg-x11-6.8.2-r8 (20 Jun 2006) - - 20 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>; - +files/xorg-68x-setuid.patch, +files/x11r6.9.0-setuid.diff, - +xorg-x11-6.8.2-r8.ebuild, -xorg-x11-6.9.0-r1.ebuild, - +xorg-x11-6.9.0-r2.ebuild: - Security bump. Failure to check the return value of setuid() in a privileged - process could be used by a local user for file overwriting and possible - privilege escalation in corner cases. See - http://lists.freedesktop.org/archives/xorg/2006-June/016146.html for more - information. - -*xorg-x11-7.1 (28 May 2006) - - 28 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-7.1_rc2.ebuild, +xorg-x11-7.1.ebuild: - Update for 7.1 release. - - 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.1_rc2.ebuild: - Move driver dependencies from the meta-ebuild to xorg-server as a - PDEPEND. (Michal Suchanek, bug #132696) - -*xorg-x11-7.1_rc2 (13 May 2006) - - 13 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.1_rc2.ebuild: - Add a meta for 7.1RC2. This doesn't enforce driver versions, so make sure - you're running a masked driver if you want to try this release out. - - 04 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r7.ebuild, xorg-x11-6.9.0-r1.ebuild: - (#132260) Block on virtual/xft slipped back in with the security bump. Get - rid of it. - - 02 May 2006; Donnie Berkholz <dberkholz@gentoo.org>; - files/digest-xorg-x11-6.8.2-r7, files/digest-xorg-x11-6.9.0-r1, Manifest: - (#132053) Fix missing MD5 for xfsft-encodings-0.1.tar.bz2. - -*xorg-x11-6.9.0-r1 (02 May 2006) -*xorg-x11-6.8.2-r7 (02 May 2006) - - 02 May 2006; Joshua Baergen <joshuabaergen@gentoo.org> - +files/CVE-2006-1526-xrender-mitri.patch, -xorg-x11-6.8.2-r4.ebuild, - -xorg-x11-6.8.2-r6.ebuild, +xorg-x11-6.8.2-r7.ebuild, - -xorg-x11-6.9.0.ebuild, +xorg-x11-6.9.0-r1.ebuild: - Security bump and remove all affected versions. Please see Bug #130979 for - details. - - 28 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild: - Remove another instance of the xft blocker (Glen Martin). - - 28 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild: - Remove blocker on virtual/xft, got multiple email reports that this breaks - things. - - 23 Apr 2006; Stephen P. Becker <geoman@gentoo.org> xorg-x11-7.0-r1.ebuild: - remove untested video driver RDEPENDs for mips - - 17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> xorg-x11-7.0-r1.ebuild: - Mark ~x86-fbsd and put under conditional the drivers that requires Linux - kernel. - - 16 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Split out ATI cards into mach64, r128 and radeon. - - 06 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Don't need both bitstream ttf and type1. - - 05 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Use font-bh-type1 instead of font-bh-ttf. Luxi fonts originated with Type1, - and the conversion to TrueType was poor. Also depend on ttf-bitstream-vera. - - 03 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild: - Change best_version() to has_version(), suggested by Ciaran. has_version() - doesn't echo anything, so change to testing return codes as we should have - in the first place. - - 26 Mar 2006; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Depend on a synaptics version that will actually work with modular X (Sourav - Mandal). - - 23 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Don't try to pull in newport on x86 and ia64. - - 21 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Fix up ebuild so sparc doesn't get the nv driver; apparently the reports - were false. - - 21 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Remove most unneeded video drivers on sparc. - -*xorg-x11-6.9.0 (20 Mar 2006) - - 20 Mar 2006; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.99.15-r4.ebuild, +xorg-x11-6.9.0.ebuild: - (#125803) Fix local root vulnerability present in 6.8.99.x and newer. This - does NOT affect 6.8.2. - - 17 Feb 2006; Markus Rothe <corsair@gentoo.org> xorg-x11-7.0-r1.ebuild: - Added ~ppc64 - - 17 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; -xorg-x11-7.0.ebuild: - Everyone on modular should use the newer ebuild. - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r6.ebuild: - Mark 6.8.2-r6 stable on alpha - - 07 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Add dependency on font-adobe-100dpi per bug #121505 (Garrett Cooper). - - 07 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Revert that, the default doesn't match xkeyboard-config's default. - - 06 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - sed out XkbRules from xorg.conf, it's unneeded. - - 05 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Driver dependency updates for hppa. - - 05 Feb 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Vast changes to the video driver dependencies to add arch-dependent - sections, mostly mirroring the drivers as built arch-dependently in 6.9. - - 30 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Get rid of xprint USE, most people need libXp for motif, java, or any of a - multitude of other things. - - 28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Restore USE=3dfx, glide-v3 doesn't work on all archs for which voodoo cards - work. - - 28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - Second pass. Cleanup by moving arch-conditional parts to ends of blocks. Add - x11-misc/linuxwacom. - - 28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0-r1.ebuild: - First pass at not pulling in packages that are known to be useless on - particular architectures. - - 28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0-r1.ebuild: - Update printed information at the end of the ebuild to reflect the addition of - the new driver variables. - -*xorg-x11-7.0-r1 (28 Jan 2006) - - 28 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-7.0-r1.ebuild: - Add support for VIDEO_CARDS and INPUT_DEVICES variables. Set them just like - a USE flag, in make.conf or on the command line. - - 25 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, - xorg-x11-6.8.99.15-r4.ebuild: - Change conditional PROVIDEs to standard DEPEND structure. Hopefully - everyone's got new enough portage that this works now, since the new - virtual/x11 should force it anyway. Prompted by ciaranm. - - 10 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.0.ebuild: - Change to new URL for modular X HOWTO, reported by Obz. - - 05 Jan 2006; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.0.ebuild: - Add 3dfx to USE to pull in glide. - - 03 Jan 2006; Rene Nussbaumer <killerfox@gentoo.org> - xorg-x11-6.8.2-r6.ebuild: - Stable on hppa. - - 02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> - xorg-x11-6.8.2-r6.ebuild: - Stable on ppc. - - 26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-7.0.0_rc3.ebuild, -xorg-x11-7.0.0_rc3-r1.ebuild, - -xorg-x11-7.0.0_rc4.ebuild: - Clean out old versions. - -*xorg-x11-7.0 (23 Dec 2005) - - 23 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.ebuild: - 7.0 is here! - - 21 Dec 2005; Doug Goldstein <cardoe@gentoo.org> xorg-x11-7.0.0_rc4.ebuild: - adding ~ppc - - 20 Dec 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-7.0.0_rc4.ebuild: - added ~mips keyword, bug - - 19 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc4.ebuild: - Dropped ~mips and ~ppc since this depends on xorg-docs now. - - 19 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc4.ebuild: - Added the xorg-docs package to metabuild. - -*xorg-x11-7.0.0_rc4 (18 Dec 2005) - - 18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.0_rc4.ebuild: - Bump for 7.0RC4. - - 16 Dec 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-7.0.0_rc3-r1.ebuild: - added ~mips keyword - - 14 Dec 2005; Herbie Hopkins <herbs@gentoo.org> - xorg-x11-7.0.0_rc3-r1.ebuild: - Marked ~amd64 wrt bug #115539. - - 14 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, - xorg-x11-6.8.99.15-r4.ebuild: - ttmkfdir was moved from x11-misc to x11-apps. - - 14 Dec 2005; Doug Goldstein <cardoe@gentoo.org> - xorg-x11-7.0.0_rc3-r1.ebuild: - Adding ~ppc - - 14 Dec 2005; Ferris McCormick <fmccor@gentoo.org> - xorg-x11-7.0.0_rc3-r1.ebuild: - Add ~sparc keyword --- Bug 115539. - - 14 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-7.0.0_rc1.ebuild, -xorg-x11-7.0.0_rc2.ebuild, - -xorg-x11-7.0.0_rc2-r1.ebuild: - Drop old versions. - -*xorg-x11-7.0.0_rc3-r1 (14 Dec 2005) - - 14 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-7.0.0_rc3-r1.ebuild: - Added mesa-progs to deps, which provides glxinfo and glxgears. Drop all - non-x86 keywords because of this. - - 14 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0.0_rc3.ebuild: - ~ppc at cardoe's request. - - 10 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, - xorg-x11-6.8.99.15-r4.ebuild: - Remove blocker on virtual/x11. The new setup changes how it works. Reported - by halcy0n. - - 09 Dec 2005; Seemant Kulleen <seemant@gentoo.org> - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, - xorg-x11-6.8.99.15-r4.ebuild: - moved synaptics from x11-misc to x11-drivers - - 08 Dec 2005; Tom Gall <tgall@gentoo.org> xorg-x11-6.8.2-r6.ebuild: - stable on ppc64 - - 07 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc3.ebuild: - Update font deps for RC3. - -*xorg-x11-7.0.0_rc3 (05 Dec 2005) - - 05 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.0_rc3.ebuild: - Bump for 7.0RC3. Note that fonts are not yet updated since some extra work - has to be done on their paths. This metabuild now also filters RgbPath as - that caused some major breakage on my system. - - 29 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc2-r1.ebuild: - Added note about bug #112924 for the ModulePath removal decision. - -*xorg-x11-7.0.0_rc2-r1 (29 Nov 2005) - - 29 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.0_rc2-r1.ebuild: - Revision bump that adds: - - - /usr/X11R6 -> /usr symlink for apps not yet updated - - removal of ModulePath lines from xorg.conf since this path has changed from - previous versions and these lines aren't really needed - - 23 Nov 2005; <dang@gentoo.org> xorg-x11-6.8.2-r6.ebuild: - Marked stable on amd64 - - 23 Nov 2005; Chris White <chriswhite@gentoo.org> xorg-x11-6.8.2-r6.ebuild: - x86 stable for bug #113307. - - 20 Nov 2005; Markus Rothe <corsair@gentoo.org> - xorg-x11-6.8.99.15-r4.ebuild: - Added ~ppc64 keyword - - 16 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc1.ebuild, xorg-x11-7.0.0_rc2.ebuild: - Changed xorg-x11 blocker for clarity. - -*xorg-x11-7.0.0_rc2 (11 Nov 2005) - - 11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.0_rc2.ebuild: - Bump for 7.0RC2. - - 10 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-7.0.0_rc1.ebuild: - Add eutils inherit. Thanks to Ferris McCormick in bug #111976. - - 09 Nov 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-7.0.0_rc1.ebuild: - added ~mips keyword - - 06 Nov 2005; <dang@gentoo.org> xorg-x11-7.0.0_rc1.ebuild: - Marked ~amd64 - - 05 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0.0_rc1.ebuild: - Add a pkg_postinst(), so we can have a bunch of einfo help. - - 03 Nov 2005; Ferris McCormick <fmccor@gentoo.org> - xorg-x11-7.0.0_rc1.ebuild: - Add ~sparc keyword (facilitate X-modular testing). - - 02 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0.0_rc1.ebuild: - Add xrandr to apps, also pulling in libXrandr. - - 02 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0.0_rc1.ebuild: - (#111298) Add libXScrnSaver to deps, because it's again incredibly common. - - 02 Nov 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-7.0.0_rc1.ebuild: - Remove xinerama USE flag and make it mandatory. A large number of - applications have mandatory xinerama, so having the library optional makes - things unnecessarily complex. - -*xorg-x11-7.0.0_rc1 (02 Nov 2005) - - 02 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-7.0.0_rc1.ebuild: - Add metabuild for modular X. - - 19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.99.15-r4.ebuild: - -mips to ~mips - - 12 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-6.8.2-r5.ebuild, -xorg-x11-6.8.99.15-r2.ebuild, - -xorg-x11-6.8.99.15-r3.ebuild: - Drop old revisions. - - 12 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog: - Add a patch for a missing NULL-check in the radeon driver. - https://bugs.freedesktop.org/show_bug.cgi?id=4001 - -*xorg-x11-6.8.99.15-r3 (03 Oct 2005) - - 03 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-6.8.99.15-r3.ebuild: - Added fix for OO/wine transparencies as well as update to mmx code from bug - #96053, closing that bug. Thanks to bartron for both patches. - - Also added patch from bug #104318 to fix colour swapping on big-endian - systems. Thanks to Stephen Becker for that. - -*xorg-x11-6.8.2-r6 (03 Oct 2005) - - 03 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-6.8.2-r6.ebuild: - Added fix for OO/wine transparencies as well as update to mmx code from bug - #96053, closing that bug. Thanks to bartron for both patches. - - 21 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r5.ebuild: - Add message on where to look for logs when a migration fails. - - 20 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-6.8.2-r5.ebuild: - Added gcc4 compile fix for fbmmx.c . Closes bug #106305. - - 20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r5.ebuild, - xorg-x11-6.8.99.15-r2.ebuild: - Make util-linux conditional to GNU userland, added note for FBSD. - -*xorg-x11-6.8.2-r5 (20 Sep 2005) - - 20 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-6.8.2-r5.ebuild: - New revision. Includes sparc-specific fixes from bugs #61940 and #79467. - - 19 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.99.15-r2.ebuild: - (#106311) Wrap unpacking of eurofonts in ! use minimal, since downloading is. - -*xorg-x11-6.8.99.15-r2 (17 Sep 2005) - - 17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-6.8.99.15-r1.ebuild, +xorg-x11-6.8.99.15-r2.ebuild: - Fixed security update as per bug #105859. - - 17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog: - Fixed credits for patch and such. - -*xorg-x11-6.8.2-r4 (17 Sep 2005) - - 17 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-6.8.2-r3.ebuild, +xorg-x11-6.8.2-r4.ebuild: - Fixed previous security update as it did not match upstream's patch. Much - thanks to Alexander Brüning for providing and testing the new patch and - Peter Hyman for spotting the source of the problem. Closes bug #105859. - - 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-6.8.99.15-r1.ebuild: - Added xdm stop fix to file set. - - 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - -xorg-x11-6.8.99.14.ebuild, -xorg-x11-6.8.99.15.ebuild: - Clean out old/insecure versions. - -*xorg-x11-6.8.99.15-r1 (13 Sep 2005) - - 13 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> - +xorg-x11-6.8.99.15-r1.ebuild: - Security update with patch from bug #105688. - - 12 Sep 2005; Seemant Kulleen <seemant@gentoo.org> - -xorg-x11-6.8.2-r1.ebuild, -xorg-x11-6.8.2-r2.ebuild: - remove insecure versions - -*xorg-x11-6.8.2-r3 (12 Sep 2005) - - 12 Sep 2005; Seemant Kulleen <seemant@gentoo.org> - +xorg-x11-6.8.2-r3.ebuild: - Fix for bug #105688 -- buffer overflow in pixmap memory allocation. Also, - fixed xdm initscript (bug #104657). - - 10 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild: - (#105532) Add groff build-time dependency. - - 25 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.14.ebuild: - Changed cp -a to cp -pPR for the rest of the ebuilds. (BSD compatibility) - - 24 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org> - xorg-x11-6.8.99.15.ebuild: - Changed cp -a to cp -pPR for BSD compatibility. - - 23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.14.ebuild, xorg-x11-6.8.99.15.ebuild: - (#103421) Don't feed enewuser a false login shell; it figures out a correct - one. - - 17 Aug 2005; Mike Frysinger <vapier@gentoo.org> xorg-x11-6.8.2-r1.ebuild, - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild, - xorg-x11-6.8.99.15.ebuild: - Add xterm back to DEPEND for uclibc systems #102402 by Yuri Vasilevski and - remove ugly arch-wrappings of 3dfx in DEPEND. - - 29 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild: - (#100392) Stick -j1 after the emake compilation calls. - - 26 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild: - Add MAKE="make" on debug build for BSD. - - 22 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Fileset 0.7. (#99534) Check the right return value on ttmkfdir in the ebuild - and in the xfs init script. Otherwise, mkfontscale overwrites the - fonts.alias files and breaks encodings including CP1251. Thanks to Alexander - Glyzov <isee@inbox.ru>. - - 21 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.99.13.ebuild: - Pull old snapshot. - - 21 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.15.ebuild: - Remove dlloader USE flag. dlloader is now the default upstream and we'll no - longer support elfloader. Binary drivers are already broken for other - reasons. - - 20 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.15.ebuild: - Patchset 0.1.2. Add 9500_all_6.8.99.15-dlloader-in-host-def-CVS-HEAD.patch - to fix problems with redefining MakeDllModules in host.def. - - 20 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.15.ebuild: - (#61940) No need for sparc to be stuck on the old keyboard driver anymore. - -*xorg-x11-6.8.99.15 (20 Jul 2005) - - 20 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.15.ebuild: - New snapshot. Pull mmx, sse and 3dnow USE flags. They're pointless, since what - they do is cause Mesa to support them, but Mesa already does runtime checks. - (#99534) Fix up return-code check on ttmkfdir, so we don't overwrite its files - with mkfontscale. mkfontscale cannot correctly generate CP1251 encodings, - among probable others. (#61940) Also, on sparc we can start using the kbd - driver like everyone else. - - 18 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.99.5.ebuild, -xorg-x11-6.8.99.8.ebuild: - Pull old development snapshots. - - 18 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild, - xorg-x11-6.8.99.13.ebuild, xorg-x11-6.8.99.14.ebuild: - Stop polluting /etc/profile.d/ with xprint stuff. Install it as a sample in - the doc directory instead. - - 11 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild: - When I say I don't want Xprint, don't give me Xprint anyway. Turn off - BuildXprintClients in addition to BuildXprint for USE="-xprint." - - 11 Jul 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r2.ebuild: - stable on alpha ia64 - - 10 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild: - Clarify no-stripping message. - - 08 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.14.ebuild: - Fileset 0.6 for 6.8.2-r2, fileset 0.2 for 6.8.99.14. (#83680) Add a change - that's mostly useful on LiveCD's: Adding 'nox' to the boot prompt will cause - the xdm init script to skip starting a login manager. This will allow - selection between X and CLI-only on X-enabled LiveCD's, as well as serving a - rescue function for broken X installations. - - 08 Jul 2005; Ferris McCormick <fmccor@gentoo.org> - xorg-x11-6.8.2-r2.ebuild: - Stable for sparc. This version runs fine. - - 07 Jul 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.2-r2.ebuild: - stable on mips - - 07 Jul 2005; Herbie Hopkins <herbs@gentoo.org> xorg-x11-6.8.2-r2.ebuild: - Stable on amd64. - - 07 Jul 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r2.ebuild: - Stable on hppa. - - 07 Jul 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r2.ebuild: - Stable on ppc64 - - 07 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Stable on x86. - - 05 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Patchset 0.1.9. Add 4155_all_6.8.99.14-xdm-ipv6-without-kernel-ipv6.patch: - (fd.o #2901) This patch fixes several problems arising if xdm is compiled - with IPv6 support, but the (linux) kernel does not support IPv6. - -*xorg-x11-6.8.99.14 (05 Jul 2005) - - 05 Jul 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.14.ebuild: - New snapshot. - - 03 Jul 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.99.8.ebuild, xorg-x11-6.8.99.13.ebuild: - these versions seriously break displaying of icons in gtk and qt apps with - the newport driver, so changing keywords to -mips - - 30 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Patchset 0.1.8. Add 9925_all_6.8.2-fix-mtrr-endless-loop.patch: (#fd.o 2750) - Prevent mtrr_remove_offending from ending up in an endless loop if the - offending region refuses to be removed. - - 30 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Patchset 0.1.7. Add 9185_all_6.8.2-fix-cursor-memleak.patch: (#31982, fd.o - #1043) Xcursor animated themes cause memory leak. - - 29 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild, - xorg-x11-6.8.99.13.ebuild: - Use the correct USE flag for enewuser() etc. - - 29 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild: - Fileset 0.5 for 6.8.2-r2, fileset 0.2 for 6.8.99.13. (#80225) Remove - Gentoo-specific code from Xsetup_0 and start installing upstream version - instead. - - 28 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild: - (#77626) Add USE=nocxx to avoid ttmkfdir dependency and use. Substitute - mkfontscale instead, which reportedly is worse on CJK stuff. Patch from - Peter S. Mazinger <ps.m@gmx.net>. - - 28 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild: - (#93339) Set up USE=minimal drivers for sparc. - - 28 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild, - xorg-x11-6.8.99.13.ebuild: - (#94964) Use enewuser()/enewgroup() for xfs, so default /etc/passwd etc isn't - so huge. - -*xorg-x11-6.8.99.13 (27 Jun 2005) - - 27 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.13.ebuild: - New snapshot. - - 11 Jun 2005; Ferris McCormick <fmccor@gentoo.org> - xorg-x11-6.8.2-r2.ebuild: - Add ~sparc keyword. This version runs fine for me (and does not - create the symbolic link loop for fonts in /usr/share/fonts). - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Update TODO. - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Remove miscellaneous commented-out symlinking and directory creation. - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Remove commented-out migrate_usr_x11r6_lib(). - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Remove all migration methods besides rsync. - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Remove a ton of commented-out migration code. - - 01 Jun 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.5.ebuild, xorg-x11-6.8.99.8.ebuild: - Use '-lt' instead of '-le' for sse tests, so we don't do them on gcc-3.4.4. - - 30 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Fileset 0.4 for 6.8.2-r2, fileset 0.2 for 6.8.99.8. (#93920) Don't specify - full path to pam modules in /etc/pam.d/ files. It breaks lib64-using - systems. - - 28 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.99.5.ebuild: - Propogate sse changes to the rest. - - 28 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.8.ebuild: - (#90672) Add die for combo of USE="sdk -dlloader," pending a fix. - - 27 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.99.3.ebuild: - Pull old snapshot. - - 27 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Have sse flag mangling only apply on gcc <3.4.4. - - 25 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.8.ebuild: - Patchset 0.1.3. (#93864, #90672#c18) Add missing comma. This fixes a parse - error in ATIDRIScreenInit in atidri.c. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.8.ebuild: - (#93856) Remove duplicated statement that checked for invalid USE combos. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - Patchset 0.1.6 for 6.8.2-r2, patchset 0.1.2 for 6.8.99.8. (#89852) Update - 5901_all_4.2.99.3-acecad-debug-v2.patch so it's compatible with BSD. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild: - (#89852) Ebuild changes for Gentoo/FreeBSD. Set MAKE, use wheel group - instead of root, exclude 0700_all_4.2.0-sessreg-highuid.patch on OpenBSD and - FreeBSD; the patch allows for high UIDs in a non-portable way. A suitably - motivated person could fix it. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Backports from 6.8.99.x, continued: Depend on opengl-update-2.2 for fixed - --use-old. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild: - Backports from 6.8.99.x. 1) Fix find syntax. 2) Stop setting BuildLinuxDocText. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.8.ebuild: - Add einfo on the binary driver breakage. - -*xorg-x11-6.8.99.8 (24 May 2005) - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.8.ebuild: - New snapshot. This one breaks some binary drivers; see - https://bugs.freedesktop.org/show_bug.cgi?id=3066. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild: - Patchset 0.1.5 for 6.8.2-r2, patchset 0.1.3 for 6.8.99.5. (#87361) Pull - 5140_all_6.8.0-radeon-swsusp.patch, which seems to add a redundant - RadeonSetFBLocation() compared with CVS, where the bug it was supposed to - fix is fixed. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild: - Fileset 0.3 for 6.8.2-r2, fileset 0.2 for 6.8.99.5. (#24399) Stop *DM from - throwing errors on shutdown. (#91470) Don't force fc-cache in xfs init - script. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild: - Patchset 0.1.4 for 6.8.2-r2, patchset 0.1.2 for 6.8.99.5. (#85153, fd.o - #1958, fd.o #1951) Add 1050_all_6.8.2-xft-releasefile-crash.patch: libXft - dies when passing FT_Face objects directly to Xft. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.5.ebuild: - (#93034) There's a new FontEncDir that we also need to change to fit our FHS - compatibility. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild: - (#89235) Use has_hardened instead of hardened USE flag, because it checks - the active toolchain. Also looks like part of the last commit was missed - from 6.8.99.5. - - 24 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild: - (#77949) The doc and minimal USE flags don't work together. Add a warning to - this effect. - - 22 May 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.99.5.ebuild: - add ~alpha - - 18 May 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.99.5.ebuild: - added ~mips keyword - - 17 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.0-r5.ebuild: - Drop old version. Everyone's been stabled on 6.8.2-r1 since early April. - Also, dropping this should allow us to unconditionally use the new /usr - prefix for all other apps instead of some sort of x11-prefix.eclass - (#90789). - - 17 May 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.99.3.ebuild: - added ~mips keyword - - 12 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.5.ebuild: - Remove big warning about /usr/lib move, because everything in portage does - it now. - - 12 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.99.5.ebuild: - Add a note about Radeon tiling breaking direct rendering in snapshots. - - 12 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; : - Make ChangeLog more human-readable by replacing PATCH_VER and FILES_VER with - patchset and fileset. - -*xorg-x11-6.8.99.5 (03 May 2005) - - 03 May 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.5.ebuild: - New snapshot. Fix find syntax, as we fixed the xfs init script a while ago. - Pull BuildLinuxDocText from USE=doc, because it's only useful for sgml - building. (#63548, fd.o #3182) Add - 9020_all_6.8.99.5-fix-dmx-doc-build.patch: fix USE="dmx doc" build. (#fd.o - 3192) Add 9030_all_6.8.99.5-theatre200_reg.h-doesnt-exist.patch: - RageTheatre200 support added in 6.8.99.4 broke the SDK install. - - 02 May 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.2-r2.ebuild: - added ~mips keyword - - 29 Apr 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r2.ebuild, - xorg-x11-6.8.99.3.ebuild: - Added ~ppc64 to 6.8.2-r2; Added -ppc64 to 6.8.99.3: won't start.. - - 27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.99.3.ebuild: - Updated dependency to opengl-update-2.2.0 so we can use 'opengl-update - --use-old' again. - - 21 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: - Explicitly turn off dlloader with USE=-dlloader. Relevant on >=6.8.99.*, but - I'm trying to keep these two in parallel so I'm applying it to both. Caught - by sekretarz. - - 20 Apr 2005; Ferris McCormick <fmccor@gentoo.org> - xorg-x11-6.8.99.3.ebuild: - Add ~sparc keyword. Builds, installs, and runs "out of the box". - - 20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: - Marked ~amd64. - - 20 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: - Better fix for the last issue. - - 20 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: - (#89743) Remove /usr/share/fonts/fonts symlink if it exists. Circular - symlink causes major font slowdowns and seems to be some sort of migration - artifact. - -*xorg-x11-6.8.99.3 (19 Apr 2005) - - 19 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.99.3.ebuild: - Part of a series of development snapshots of CVS HEAD. Pull a ton of patches - that were committed upstream: - 0440_all_6.8.0-support-cymotion-master-and-ibm-space-saver-keyboards.patch, - 0485_all_6.8.0-afb-cfb-dlloader-fixes.patch, - 0487_all_6.8.2-add-relocation-type-10-to-elfloader.patch, - 2000_all_6.8.0-fb-convert-rgb-to-bgr-when-needed.patch, - 5135_all_6.8.1-r128-ppc-vgaaccess.patch, - 5160_all_6.8.1-benh-radeon-ppc-fixes-v2.patch, - 5170_all_6.8.1.904-radeon-add-bioshotkeys-option.patch, - 5180_all_6.8.2-back-out-extra-radeonsetfblocation.patch, - 5190_all_6.8.2-radeon-render-byteswap.patch, - 5200_all_6.8.0-newport-accel-v4.patch, - 9355_all_6.7.99.2-xorgconfig-fontdir-fixes-v2.patch, - 9370_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch, - 9375_all_6.8.1.904-fix-duplicate-mfb-symbols.patch, - 9930_all_6.8.0-xpm-secfix-CAN-2005-0605.patch. Update some patches to - reflect changes, such as 9360_all_6.7.99.2-ppc64-support-updates-v3.patch. - Also drop 9180_all_4.3.0-xcursorgen-check-malloc-return.patch, which just - caused a different kind of error. Drop the patched-in evdev driver (patches - 9000-9003), because upstream now supplies its own, different evdev driver. - (#67578) Drop 0350_all_4.2.0-vt7.patch, which has poor rationale and doesn't - work very well. - - 15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.2-r2.ebuild: - multilib and some sparc64 cleanup. - - 15 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -files/xpm-secfix-thomas.diff, -xorg-x11-6.8.0-r3.ebuild: - Everyone seems to have newer stable versions, so pull this and its 55K patch. - - 15 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild: - (#89182) Don't always call the build Gentoo Linux, since we can build for - other OS's. - -*xorg-x11-6.8.2-r2 (14 Apr 2005) - - 14 Apr 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.2-r2.ebuild: - New revision, with a bunch of updates. Patchset 0.1.3. (#85363, fd.o #1765) - Add 0487_all_6.8.2-add-relocation-type-10-to-elfloader.patch: Add another - relocation type to the ELF loader. (#82039) Add - 5137_all_6.8.2-fix-r128-undefined-write-depth.patch: Fix direct rendering on - R128 because of undefined WRITE_DEPTH. (#82705) Add - 9003_all_6.8.2-lnx-evdev-keyboard-dont-grab.patch: Don't grab the keyboard, - so combo keyboard/mice work. (#80685) Add 9913_all_6.8.2-cfbgc-gcc4.patch, - 9914_all_6.8.2-mmx-gcc4.patch and 9915_all_6.8.2-radeon-gcc4.patch: GCC4 - compile fixes. (fd.o #2750) Add 9920_all_6.8.2-fix-write-combining.patch: - Fix case where a smaller write-combining region blocks write-combining - setting of the whole frame buffer. Fix bug in wc setting code when regions - are first splitted and setting of write-combining then fails. (#82735) Fix - find(1) syntax in xfs init script. (#86890) Install release notes. (#82791) - Add s3 and vesa drivers on alpha. (#81728) ebegin() use shouldn't contain - trailing periods. - - 09 Apr 2005; Tom Gall <tgall@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - add mga on ppc64, it works! - - 06 Apr 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - Fixed build with USE=-xv on hppa. - - 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - stable on ia64 - - 21 Mar 2005; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - Stable on hppa. - - 13 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild: - Stable x86. Sorry about the two upgrades in a few days thing, but the first - was a security bug so there was some time pressure involved. I figured it's - better to stable this sooner so we can save a compile for people who don't - sync every day. - - 12 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.7.0-r3.ebuild, -xorg-x11-6.8.0-r4.ebuild, - -xorg-x11-6.8.2.ebuild: - (#83598) Remove vulnerable versions except xorg-x11-6.8.0-r3, which is - forced to stay until arm, hppa, ia64 stable xorg-x11-6.8.2-r1. - - 11 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild: - Stop manually setting HasLinuxInput, as it broke BSD and was only needed for - 2.2 kernels. So, 2.2 kernels are no longer supported. - - 11 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild: - No need to add acecad to ExtraXInputDrivers, it's already in XInputDrivers. - - 10 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r5.ebuild: - (#83598) Stable x86. 6.8.2-r1 may be stabled soon but it's pending - >=freetype-2.1.8, which I need to discuss with the maintainers, and this - can't wait. - - 10 Mar 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - Stable for sparc, closing Bug 83598 --- security patch for XPM. - - 10 Mar 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - Stable for sparc, Bug 83598. - - 10 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> - xorg-x11-6.8.2-r1.ebuild: - Marked stable on amd64. - - 09 Mar 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.2-r1.ebuild: - stable on mips - bug 83598 - - 08 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> - xorg-x11-6.8.2-r1.ebuild: - Stable on alpha, bug 83598. - - 06 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2.ebuild: - Make freetype dep versions in DEPEND and RDEPEND match. Reported by Park - Ji-In <mithrandir@tisphie.net>. - - 06 Mar 2005; Danny van Dyk <kugelfang@gentoo.org> - xorg-x11-6.8.0-r5.ebuild: - Marked stable on amd64; Security BUG #83598. - - 06 Mar 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2-r1.ebuild: - Stable on ppc64; bug #83598 - - 06 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> - xorg-x11-6.8.2-r1.ebuild: - Stable on ppc. - -*xorg-x11-6.8.0-r5 (05 Mar 2005) - - 05 Mar 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.0-r5.ebuild, +xorg-x11-6.8.2-r1.ebuild: - (#83598, fd.o #1920) Fix more overflows in libXpm. - - 02 Mar 2005; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.8.2.ebuild: - Different switch_opengl_implem logic, should fix bug #83645 - - 26 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.1.901-r1.ebuild: - Pull development version. - - 25 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.2.ebuild: - dosyms should've been ln -s in postinst's migration code. - - 20 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2.ebuild: - Fix hardcoded lib instead of $(get_libdir) in xprint_init_install(), thanks - to Daniel Ostrow <dostrow@gentoo.org>. - - 19 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.2.ebuild: - Stable on ppc64 - - 17 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> xorg-x11-6.8.2.ebuild: - Stable on ppc. - - 14 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.2.ebuild: - Unfubar libdir symlinks made by migration. - - 13 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2.ebuild: - (#81851) Clarify local cursor settings info. - - 13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> xorg-x11-6.8.2.ebuild: - ~alpha keyword. - - 11 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2.ebuild: - Install glxext.h, glxmd.h and glxproto.h to /usr/lib/opengl. Stop symlinking - glext.h manually because we depend on new enough opengl-update now. - - 11 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.2.ebuild: - Moved fix_libtool_libdir_paths after the opengl .las get moved to their - final locations. - - 11 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.1.902-r1.ebuild, -xorg-x11-6.8.1.902.ebuild, - -xorg-x11-6.8.1.903.ebuild, -xorg-x11-6.8.1.904.ebuild: - Pull old versions. Still waiting for 6.8.2 to be ~alpha so 6.8.1.901-r1 can - be pulled. - - 11 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.2.ebuild: - Update opengl-update dependency to >=2.1.1 -- lower versions were broken in - various ways. - -*xorg-x11-6.8.2 (11 Feb 2005) - - 11 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.2.ebuild: - Here 'tis. Add 5180_all_6.8.2-back-out-extra-radeonsetfblocation.patch -- - Somehow when applying fd.o #1220 and fd.o #1912, things got mixed up. An - extra call to RadeonSetFBLocation() was added to RADEONAdjustFrame(). Back - this out. Michel Daenzer says: As I said before: it's unnecessary writes to - GPU memory controller registers. In the best case, there's an unnecessary - slight delay maybe; in the worst case, the GPU might wedge. (#81283, fd.o - #2164) Add 5190_all_6.8.2-radeon-render-byteswap.patch -- Forgot to return - TRUE at the end of RADEONSetupRenderByteswap() so some render-accelerated - stuff was screwed up. (#76807) Break up xbox patch into two patches and - update it: 9990_x86_6.8.0-nvxbox-20050107.patch and - 9991_x86_6.8.1.904-xbox-pci-20050207.patch. (#81459) Fix up libtool archives - for multilib; stop installing libMesaGLU.so symlink; Stop having - /usr/X11R6/lib in libtool archives because /usr/X11R6 is just a symlink now. - - 10 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.1.904.ebuild: - Don't install libMesaGLU.so. Fix 'libdir' in .la files. - - 09 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.904.ebuild: - (#81431) We should only be removing libGL.*, but unfortunately the dot - matched any character so we needed libGL\.* instead. Note that this has been - around since xfree-4.3.0. - - 08 Feb 2005; David Holm <dholm@gentoo.org> xorg-x11-6.8.1.904.ebuild: - Added to ~ppc. - - 07 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - Patchset 0.1.3. Add - 9250_all_6.8.1.904-respect-xfree86configtools-setting.patch -- respect - whether configuration tools are desired. Also some other USE=minimal - enhancements: Stop building unneeded static libraries, the DPS libraries, - the config tools and xf8* (unneeded for these drivers). The install size is - now 22MB. - - 05 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> xorg-x11-6.8.0-r4.ebuild: - Marked stable on amd64. - - 05 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.903.ebuild, xorg-x11-6.8.1.904.ebuild: - (#80740) Block <=app-emulation/emul-linux-x86-xlibs-1.2-r3 at eradicator's - request until problem with lib32 is fixed, which should be in 1.2-r4. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - Fileset 0.2. Remove PATH and ROOTPATH from /etc/env.d/10xorg, as - everything's in /usr/bin now. Also remove LIBGL_DRIVERS_PATH. I was told - this was necessary if they weren't in /usr/X11R6/lib/modules/dri, but really - it seems it's only if they aren't in the compile-time UsrLibDir. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.11.3. (#79497, #80736) Add - 9380_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. xorgcfg / X - -configure produce a bunch of unresolved cfb symbols. This can also break - the build in some cases. (#78147, #80736) Add - 9385_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break because - of duplicate mfb symbols. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - Patchset 0.1.2. (#79497) Update - 9370_all_6.8.1.904-fix-duplicate-cfb-symbols-v2.patch. Use more correct - version committed to HEAD rather than from our Bugzilla. (#78147, #80736) - Add 9375_all_6.8.1.904-fix-duplicate-mfb-symbols.patch. Build can break - because of duplicate mfb symbols. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - pkg_preinst(): Add checks for more symlinks: /usr/bin/X11, - /usr/include/GL/GL and /usr/include/X11/X11. Reported by Ferris McCormick - <fmccor@gentoo.org>. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - Symlink '../share/man /usr/X11R6/man' doesn't really make sense anymore -- - results in a /usr/man symlink, which is just weird. - - 04 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.904.ebuild: - There aren't cases when a symlink '../include ${ROOT}/usr/X11R6/include' - would be useful anymore. Reported by Ferris McCormick <fmccor@gentoo.org>. - - 04 Feb 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.1.904.ebuild: - added ~mips keyword - - 03 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> xorg-x11-6.8.1.904.ebuild: - Marked ~amd64. - - 03 Feb 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.1.904.ebuild: - Add ~sparc keyword. This release is working well for me (hardened and patched - for sunffb+xaa and for sunleo, as described at Bug 79467). - - 03 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.904.ebuild: - Added ~ppc64 to KEYWORDS - -*xorg-x11-6.8.1.904 (03 Feb 2005) - - 03 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.904.ebuild: - 6.8.2 RC4. Hopefully the last one. (#79497) Fixes duplicate cfb* symbols on - `X -configure` and xorgcfg. (#79033, fd.o #2000) Add BIOSHotkeys option to - radeon driver, which allows people to enable hotkeys that the driver - disables by default -- from CVS HEAD. - - 02 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.903.ebuild: - Remove /usr/include/GL and /usr/include/X11 symlinks if needed, so migration - works properly. /usr/include/GL was particularly annoying, since the X build - created it, so set LinkGLToUsrInclude to NO. This should be turned into a - source patch that prevents the link if $(SYSTEMUSRINCDIR) = $(INCDIR) and - sent upstream. Also add ukr to G_FONTDIRS if USE=nls. Problems reported by - Daniel Ostrow <dostrow@gentoo.org> and Ferris McCormick <fmccor@gentoo.org>. - - 02 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.903.ebuild: - Change die() to ewarn() if a directory exists in both font locations in - remove_font_dirs(). The migration should catch that problem, so there's no - need to die. Also append cyrillic to G_FONTDIRS if USE=nls, so its fonts.* - files get cleaned. Reported by Andres Järv <andresjarv@gmail.com>. - - 02 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.903.ebuild: - Added ~ppc64 to KEYWORDS - - 01 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.903.ebuild: - Check whether $G_FONTDIR is a directory in remove_font_dirs(), not just - whether it exists. fonts.cache-1 can apparently exist in /usr/share/fonts/ - sometimes. Reported by Roman Gaufman <hackeron@gmail.com>. - -*xorg-x11-6.8.1.903 (01 Feb 2005) - - 01 Feb 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.903.ebuild: - 6.8.2 RC3. As a bonus, also migrates everything out of /usr/X11R6 and turns - it into a symlink to /usr. It uses rsync by default, although you can test - the probably-broken tar or known-broken mv if you'd like. - - 30 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r3.ebuild: - (#80131) Update some URLs for patchsets. - - 29 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - Rename patch() to do_patch() so it doesn't overlap with the patch utility - and cause some fun infinite recursion. Thanks much to vapier for helping out - with this, because I never would've figured it out. - - 25 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild, xorg-x11-6.8.1.902.ebuild: - (#47598) Stop installing libMesaGL -- it's a remnant from years ago and - shouldn't be used. Any app using it is broken. - - 25 Jan 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.1.902.ebuild: - Add ~sparc keyword for testing --- builds and runs for me. Track for sparc - at Bug 79467. - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - Update TODO. - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - libGLU symlink was only done on ! use opengl, which seems as if it's reversed. - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - Functionalize src_install(). Rename a number of poorly named functions that - e.g., have setup_ in the name but happen in src_install(). - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - Functionalize pkg_preinst(), pkg_postinst(), pkg_postrm(). - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902-r1.ebuild: - Functionalize pkg_setup(), src_unpack(), src_compile(). - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902.ebuild: - Drop unnecessary, unused cruft and update TODO. - -*xorg-x11-6.8.1.902-r1 (24 Jan 2005) - - 24 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.902-r1.ebuild: - Add -* so we get CVS history of gradual changes instead of changing 500 - lines in a revision bump all at once. - - 23 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902.ebuild: - Pull a bunch of implied Mesa optimizations. - - 22 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild: - removed ppc64 specific functions pkg_prerm() and relink_dlloader_files() as - they are no longer needed - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - (#79019) SSE, MMX, 3DNOW! were getting turned off for x86 people because of - the amd64 changes. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - Install OpenGL stuff to /usr/libdir/opengl/$PN/lib, not - /usr/libdir/opengl/$PN/libdir. Again thanks to eradicator for the libdir - advice. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - Need to apply last change in lib as well as libdir. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - eradicator discovered that some really bothersome packages leave dotfiles in - /usr/X11R6/lib, which breaks the migration because rmdir won't run. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild, - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - Remove xfree blocker, since xfree's no longer in the tree. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - (#78930) Update tarball location. - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - Drop blocker on app-text/dgs, which no longer exists in the tree. Apparently - this breaks things for some people, although I'm unable to reproduce it. - - 21 Jan 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.0-r4.ebuild: - stable on mips - - 21 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - Add a match for lib to RgbPath fixing so libdir != lib cases work. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Unleash upon the x86 masses. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.902.ebuild: - (#76985) Add pointer to docs. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.11.2. Backport fixes from 6.8.1.902 for #76356, #38549, fd.o - #1895 and #38549. See its ChangeLog entry for more details on them. - Fileset 0.7. Backport fix for #76356, again from 6.8.1.902. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902.ebuild: - Fileset 0.3. The fix for #76356 was incorrect. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild, - xorg-x11-6.8.1.902.ebuild: - (#77979) Force SSE, MMX, 3DNOW! on amd64. - - 20 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild, - xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.902.ebuild: - (#67729) Libtool archives need to be installed from FILES_DIR/lib, not - $(get_libdir). - - 20 Jan 2005; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r4.ebuild: - Stable for sparc, closes tracking bug 63994. - - 19 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.902.ebuild: - Patchset 0.1.2. (fd.o #1895, #38549) Add - 2000_all_6.8.0-fb-convert-rgb-to-bgr-when-needed.patch: DIX didn't always - convert RGB to BGR. (#38549) Bump 5200_all_6.8.0-newport-accel-v4.patch: The - color problem was actually because of fd.o #1895. Fileset 0.2. (#76356) - Add "redundant" LDPATH=/usr/lib to /etc/env.d/10xorg because nomachine - provides a duplicate libX11 with changes that break pretty much everything, - and we need to trump it. - - 19 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.7.0-r2.ebuild, -xorg-x11-6.8.0-r1.ebuild: - (#71642) Drop vulnerable versions -- everyone's keyworded safely for a newer - 6.7.0 or 6.8.0. - - 19 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r3.ebuild: - (#77589, #71642) keyword ia64, spanky-approved. - - 19 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.1.901.ebuild: - Pull "old" version. - - 19 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Backport (#76537) migration fixes and (#76074) xprint fixes from 6.8.1.*. - - 17 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> - xorg-x11-6.8.1.902.ebuild: - Marked ~amd64. seemant tested. - - 15 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.902.ebuild: - (#78074) DO NOT use '-d' in test because it's true on symlinks to dirs too. - - 15 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild: - Added ~ppc64 to KEYWORDS - - 14 Jan 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.901.ebuild, - xorg-x11-6.8.1.902.ebuild: - added ~mips keyword - - 14 Jan 2005; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.8.1.902.ebuild: - Marked ~ppc - -*xorg-x11-6.8.1.902 (13 Jan 2005) - - 13 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.902.ebuild: - 6.8.2 RC2. I expect most archs will work roughly the same with this as with - 6.8.2 RC1, but I'll let them do their own testing to confirm or deny. (fd.o - #2144) Update BenH's patch to fix some issues with miscalculation of MCLK - and SCLK values from his old patch. - - 13 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901-r1.ebuild: - Keyword ~x86 ~sparc ~ppc64 ~ppc ~amd64 ~alpha, like 6.8.1.901 is. No - arch-dependent source-code changes. The migration particularly needs to be - tested on amd64, but I've had multiple success reports. - -*xorg-x11-6.8.1.901-r1 (12 Jan 2005) - - 12 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.901-r1.ebuild: - Patchset 0.3.4. (#70712) Add 9865_all_add-nodeadkeys-to-gb.patch. Enable - deadkeys for gb keymap. They got lost sometime between XFree86 4.3.0 and - X.Org 6.8.0. (#76537, probably others) Also, do some work on the migration - function that should fix things up for amd64 users and anyone else with a - libdir != lib. (#76074) Install xprint scripts correctly, thanks to Stefan - Briesenick <sbriesen@gmx.de>. - - 12 Jan 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.0-r4.ebuild: - forgot newport in 6.8.0-r4, added - - 11 Jan 2005; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild, - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - various stabilizations on mips for bug 77588, also restrict drivers to - newport and fbdev on mips - - 11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild, - xorg-x11-6.8.1.901.ebuild: - Only do amd64 libdir overriding on older profiles. - - 10 Jan 2005; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.1.901.ebuild: - add ~alpha - - 07 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - (#76936) USE=opengl and USE=xv are mutually interdependent -- not only one way. - - 05 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - Strip -momit-leaf-frame-pointer on sparc, since -fomit-frame-pointer is also - stripped. - - 04 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - Add -momit-leaf-frame-pointer to ALLOWED_FLAGS. Read the gcc man page for - why this is cool. - - 04 Jan 2005; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - For USE=minimal, add BuildLBX NO. - - 02 Jan 2005; Marcus Hanwell <cryos@gentoo.org> xorg-x11-6.8.1.901.ebuild: - Marked ~amd64. - - 28 Dec 2004; Tom Martin <slarti@gentoo.org> xorg-x11-6.8.0-r4.ebuild: - Marked ~amd64. - - 28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 24 Dec 2004; David Holm <dholm@gentoo.org> xorg-x11-6.8.1.901.ebuild: - Added to ~ppc. - - 24 Dec 2004; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.0-r4.ebuild, - xorg-x11-6.8.1.901.ebuild: - Added ~ppc64 to KEYWORDS - - 23 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.11.1. (fd.o #2114, #66223) Add - 9370_all_6.7.0-ppc64-linux26-headers-v2.patch. See when it was added to - 6.8.1.901 for a further description. - - 23 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild, - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r3.ebuild, - xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901.ebuild: - (#75034, #75329) Fix kernel_is() calls, various problems with subshells and - tests. Thanks to splite for some of the fixes. - - 22 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901.ebuild: - Update freetype dep to >=media-libs/freetype-2.1.8 from - >=media-libs/freetype-2.1.4, so we don't use stale libs. X also has an - internal freetype, and 2.1.8 is where it's at in 6.8. - - 22 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901.ebuild: - Patchset 0.3.3. (#75174) 9370_all_6.7.0-ppc64-linux26-headers-v2.patch was - in a generic PPC section when it needed to apply only for PPC64. - - 20 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild, - xorg-x11-6.8.1.901.ebuild: - (#75067) SSE3 is also broken on gcc 3.4, so append -mno-sse3. - - 19 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901.ebuild: - Patchset 0.3.2. (#66223) Add 9370_all_6.7.0-ppc64-linux26-headers.patch. - Architectures with arch-specific eieio() routines require this. PPC64 is one - example, with >=linux-headers-2.6. - - 19 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.1.901.ebuild: - Patchset 0.3.1. This should help out PPC users on Radeon and Rage128. - - (fd.o #2064) Add 5160_all_6.8.1-benh-radeon-ppc-fixes.patch, with tons of - changes: - - 1. This patch adds the "VGAAccess" option (defaults to NO on PPC and YES on - others) that disables all legacy VGA stuffs in the driver, since they are - causing various issues on non-x86 machines. - - 2. This patch makes sure CRTC2_OFFSET_CNTL is cleared. None of the options in - this register should be enabled with our current driver, and some firmwares - setup a tiled display, which we _must_ disable for now. Without this, the - second screen is completely scrambled on some PowerMacs. - - 3. This patch fix the routine that probes for PLL values in absence of a - BIOS ROM. The measure is more precise, done several times to avoid - "gliches" caused by scheduling latencies, plus the patch fixes actual - bugs in the previous iteration of the code. It also add calculation of - the mclk and sclk values for proper display bandwidth calculation and - adds proper min/max PLL values for r420 type cards. - - 4. The display bandwidth calculation code has a small bug when looking at - the memory controller setup on r300 chips. Hui from ATI confirmed that - this was the right fix. - - 5. When using MergedFB, the driver would call RADEONInitPLLRegisters for the - first head even when UseBiosDividers was set to TRUE, which was incorrect. - This patch fixes it by moving the test of UseBiosDividers into - RADEONInitPLLRegisters which simplifies the code in the caller and is more - logical. - - 6. The dual head setup was recently re-broken (after having been fixed a while - ago) with SURFACE_CNTL beeing written with the wrong value from the second - head. The problem is that usually, only the first head had a correct value - in there, and the driver would regular mixup which register setup was used to - restore that value. This patch fixes it once for all by making sure the - second head does carry the proper value too. - - 7. The second digital output of the radeon chip doesn't like when the P2PLL - is set with an odd post-divider value. This makes sure we never chose - a "wrong" value when calculating the P2PLL setting on a non-CRT screen. - - 8. On some cards where no BIOS provided output mapping infos is available, the - driver would get the DDC flipped between the two outputs of the card. This - typically happen on recent Mac cards. This adds an option to force the - driver to reverse what it thinks is the primary display DDC and the - secondary display DDC. Ultimately, we'll have to do a better job of - recognizing those Mac cards though. - - 9. RadeonValidateFPModes() has a bug where it could try to dereference - a NULL pointer in some cases when linking in modes. This fixes it. - - 10. This patch adds an option for probing the PLL value at server init time - for LVDS panels and re-using it later (by setting UseBiosDividers). It's - useful on machines without an X86 BIOS image providing the proper set of - divider values for the LVDS, as the value calculated by - RADEONInitPLLRegisters() tend not to be suitable for some LVDS panels. - It also changes a bit the way the panel infos are extracted, the previous - code didn't quite work for me, and after discussing with Hui, I decided - to move the detection earlier in the discovery process and to do it slightly - differently. - - (fd.o #2089) Add 5135_all_6.8.1-r128-ppc-vgaaccess.patch. This patch adds the - "VGAAccess" option (defaults to NO on PPC and YES on others) that disables - all legacy VGA stuffs in the driver, since they are causing various issues on - non-x86 machines. - -*xorg-x11-6.8.1.901 (18 Dec 2004) - - 18 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.1.901.ebuild: - Add 6.8.2 release candidate 1. - - 14 Dec 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r4.ebuild: - Add ~sparc keyword in anticipation of impending unmasking. So far, - tests stable for sparc. - - 13 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.11. (fd.o #1934, #47922) Add the highly demanded fix for DPMS - problems: 9830_all_6.8.0-fix-random-dpms-blanks.patch. Fix - 0455_all_6.8.0-prevent-keyboard-hardware-repeat-v2.patch with new code from - upstream (fd.o #1651 comment #9). Add three sparc patches: (#fd.o #1114, - #61063) 0485_all_6.8.0-afb-cfb-dlloader-fixes.patch, which allows sunffb+cfb - to work with dlloader; (fd.o #2072, #61063) - 0490_all_6.8.0-sparc-dlloader-cflags.patch, which defines - LargePositionIndependentCflags when Mesa is built for the dlloader; and - (fd.o #2073, #61063) 0495_all_6.8.0-sunffb-imake.patch, which prevents the - incompatible CFLAGS combination of '-mcpu=ultrasparc -mv8' because Xorg - wrongly tries to not build a 64-bit version when it shouldn't be doing this. - Also, fix the ebuild to work with new sparc patches and to respect that - dlloader+sdk has worked for quite a while. - - 12 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Fix up kernel_is() calls, thanks to Georgi Georgiev <chutz@gg3.net>. - - 10 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Change munging of config file RgbPath to match where it's currently - installed, and use get_libdir() for it. - - 10 Dec 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r3.ebuild: - Stable on hppa. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild, - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r3.ebuild: - Move from custom is_kernel() in x11.eclass to kernel_is() in - linux-info.eclass. It's not maintained by us, and that's a plus in itself. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Move from custom is_kernel() in x11.eclass to kernel_is() in - linux-info.eclass. It's not maintained by us, and that's a plus in itself. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Try pulling get_number_of_jobs(), on suggestion of Michael Sterrett - <mr_bones_@gentoo.org>. The only reason I'd guess it might be there is - related to comment #5 on bug #13565. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Remove duplication in library stripping. Thanks to Georgi Georgiev - <chutz@gg3.net>. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Remove double definition of HOSTCONF. Thanks to Georgi Georgiev - <chutz@gg3.net>. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Change LibDir to /usr/libdir/X11 instead of /usr/libdir. Remove some related - hacks, and fix paths of relevant things. Suggested by Georgi Georgiev - <chutz@gg3.net>. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Switch around comments for UsrLibDir and LibDir. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Fix an xkb symlink that was hardcoded lib rather than using get_libdir(). - Reported by Georgi Georgiev <chutz@gg3.net>. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Add another sed match to fix xorg.conf.example. - - 06 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Add >=x11-misc/ttmkfdir-3.0.9-r2 to RDEPEND. It slipped out of RDEPEND in - the dependency cleanup a while back. Thanks to Georgi Georgiev - <chutz@gg3.net> for catching this. - - 04 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.10. Add 0450_all_6.8.0-set-default-xkbmodel-to-pc105.patch. In - the old 'keyboard' driver, pc105 was the default. Restore the new 'kbd' - driver to the same. This is from upstream CVS. It may fix some bugs relating - to certain keys not working. Add - 0455_all_6.8.0-prevent-keyboard-hardware-repeat.patch. (fd.o #1651) Filter - out autorepeat scancodes from the keyboard, because X does this already. - This is from upstream CVS. Add - 6200_all_6.8.0-fix-glxquerycontextinfo-libgl-segfault.patch. (fd.o #1672) - Ian Romanick: the request structure for this case is never allocated, so we - write through an uninitialized pointer if glx version > 1.2. This is from - upstream CVS. Move 9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch from - xpm-secfix-thomas.diff in FILESDIR. Add - 9930_all_6.8.1-xpm-secfix-CAN-2004-0914.patch. (fd.o #1924, #71842) The new - sanity checks prevent using file names that start with a "/" which along - with other checks wouldn't let you use libXpm to write files that aren't in - or beneath the process's current working directory. This breaks GIMP's xpm - plugin, among other things. Add 9945_all_6.8.1-xmodmap-overflows.patch. - (fd.o #1818) Fix overflow in xmodmap. A less user-visible change is the - switch from PatchChangelog to the DESCRIPTIONS file, which aims to describe - the reason for every patch being applied. It's far from complete, but it's - something. - - 04 Dec 2004; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.8.0-r2.ebuild: - Remove stale, vulnerable version. - - 23 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.0-r3.ebuild, - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild, - xorg-x11-6.8.0-r3.ebuild, xorg-x11-6.8.0-r4.ebuild: - Update homepage (#72274). - - 23 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Work around portage bug with parentheses in PROVIDE. - - 22 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Stop requiring the BREAKME variable. This should be to a point where it's - working reasonably well. - - 22 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Fix problem where one could end up with '/usr/lib/fonts' font paths in - xorg.conf.example by adding a new sed match. This happens because we changed - from /usr/X11R6/libdir to /usr/libdir. - - 22 Nov 2004; Tom Gall <tgall@gentoo.org>; - xorg-x11-6.7.0-r3.ebuild: - stable on ppc64 - - 21 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Fix broken SRC_URI. - - 21 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Only provide virtual/glu and virtual/opengl if USE=opengl. Also don't create - GLU symlinks when USE=-opengl, since GLU isn't built. - - 21 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Don't hide things behind USE=minimal that are already behind other USE - flags, so we can combine minimal with various other things. - - 21 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - For USE=minimal, remove all unnecessary fonts. This saves ~5.5MB. - Unfortunately, this is a temporary hack -- we should really patch - xc/fonts/bdf/misc/Imakefile to never build them in the first place. Also - only add CID to G_FONTDIRS for USE=cjk, so other people don't have a symlink - pointing to nothing. - - 20 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.9. Add 1110_all_6.8.0-force-build-font-utils-if-needed.patch. - USE=minimal will now start successfully, because enough fonts are built. - When BuildClients is off and BuildFonts is on, mkfontscale and mkfontdir - aren't built. But mkfontscale is used during the build process and mkfontdir - is needed later, so we should build them anyway if UseInstalled isn't on. - This fixes the USE=minimal build. Also, build the RGB database and xinit for - a couple of non-essential but nearly always desired things. We require - bdftopcf too. Also add xauth so startx works nicely. Problems still remain - with switching back to the console using the ctrl-alt-Fn sequence, probably - because of us not doing something with xkb. Don't worry about changing - definition of i386Drivers because we don't use it anymore in USE=minimal. - Only add i810 for amd64, rather than for everyone. GLU depends on GL being - built, so fix that. XF86Rush similarly depends on XV. - - 20 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Commit it properly this time. - - 20 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Revert last commit, it had too much in it. - - 20 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Reduce USE=minimal x86 drivers to: vmware vesa vga dummy fbdev v4l. - - 19 Nov 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.8.0-r3.ebuild: - revert to ~ppc64, needs work - - 18 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - For USE=minimal, drop cursor sets other than core and handhelds. - - 18 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Add a backwards-compat symlink for /usr/X11R6/libdir/X11/config (#71654). - - 18 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - For USE=uclibc, stop building glxgears and glxinfo. But build GLU library - again. - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; : - Update credits on xpm-secfix-thomas.diff. - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r4.ebuild: - Patchset 0.2.8. Update Newport acceleration patch to - 5200_all_6.8.0-newport-accel-v3.patch (#38549). This fixes a red/blue swap - for applications using RENDER acceleration such as gnome-terminal, gvim and - xchat2. - -*xorg-x11-6.8.0-r4 (17 Nov 2004) - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.0-r4.ebuild: - Add xpm-secfix-thomas.diff. This is a continuation of the hard-masked 6.8.0-r2. - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r3.ebuild: - Remove ppc64-specific relinking for dlloader issues, because it's fixed in - 6.8. Requested by Markus Rothe <corsair@gentoo.org>. - -*xorg-x11-6.8.0-r3 (17 Nov 2004) - - 17 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +files/xpm-secfix-thomas.diff, +xorg-x11-6.7.0-r3.ebuild, - +xorg-x11-6.8.0-r3.ebuild: - Security update: Add xpm-secfix-thomas.diff to fix many issues, including: - integer issues resulting in infinite loops and buffer overflows; a one-byte - buffer overflow; stack-based overflows with sprintf() and string functions; - replaces popen() with s_popen(); path traversal issues; buffer underruns; - and memory leaks (missing free(), found by Egbert Eich). Patch by Thomas - Biege and Matthiew Herrb. Petr Mladek identified the initial vulnerabilities - and provided a patch that was later expanded on. Jacques A. Vidrine aided in - the code audit and patch review. This issue is identified as CAN-2004-0914. - - 16 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Patchset 0.2.7. Update Newport acceleration patch to - 5200_all_6.8.0-newport-accel-v2.patch. This fixes an error "structure has no - member named `PUToScreenTextureDstFormats'," which should start with CPU, - not PU. It also moves the autoloading of the xaa module around (#38549). - Newport acceleration patch is by Dominik Behr, with mods by Adam Jackson. - Drop 0155_all_4.3.0-Xi-Xinitthreads-locking-bug.patch. It was fixed in an - alternate way in the release, and this was causing problems with totem and - kaffeine (#64929, #59746, maybe #60131). Add - 6100_all_6.8.0-xnest-uninitialized-GetWindowPixmap.patch (#70431). Alexander - Gottwald says on fd.o #1404: "pScreen->GetWindowPixmap is never initialized - in Xnest startup and contains random data. After some server resets it - crashes with segfault because pScreen->GetWindowPixmap is called but is not - a valid function. A quick fix was to set the complete ScreenRec structure to - null after allocating it in dix/main.c (AddScreen)." - - 15 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild: - Bug number for no-sse2 is 57602, not 56702. Thanks cyfred. - - 15 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - In backward_compat_setup(), add a symlink for the keysym database, XKeysymDB - (#70927). Also fix a hard-coded lib rather than get_libdir. - - 04 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add 'minimal' USE flag. It turns off the build of most clients and all - fonts, as well as a number of drivers I guessed would be mostly unused by - people wanting this functionality (video drivers turned off only for x86). - It also stops installing the man pages and docs, as well as Xvfb and Xnest. - Finally, it doesn't install Gentoo custom cursors. On a minimal test build - with USE="-3dfx +3dnow -bitmap-fonts -cjk -debug -dlloader -dmx -doc - -font-server -hardened -insecure-drivers -ipv6 +minimal +mmx -nls -opengl - -pam -sdk +sse -static -truetype-fonts -type1-fonts -xprint -xv", the total - installation was 28M. - - 04 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Increase functionalization to the point that the primary functions are - actually readable. - - 04 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Reorganize functions, so primary ebuild functions are at the top and - sub-functions are below them. This gives us a big-picture view to start, - followed by all the nitty gritty. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add some einfo about the /usr/X11R6/libdir -> /usr/libdir move. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add a sed to change RgbPath to the new location in config files. Reported by - agaffney. Symptoms include things like "can't load color "Black"" or - "Couldn't open RGB_DB." - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add some more debugging CFLAGS to ALLOWED_FLAGS. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Rework gcc-version-dependent things to remove redundant calls to - gcc-*-version(). Also, only strip -Os for <gcc-3.2.2 (#12775). - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Change SRC_URI order so the mirror://gentoo stuff is at the bottom. It - should be searching them beforehand anyway. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - When removing stale GL stuff, only remove libGL.*, not libGL*. The latter - catches libGLU* and others. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Missed another spot with a bad xkb symlink. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Fix a bug in the xkb symlink. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add some checking features to migrate_usr_x11r6_lib() so we don't redo - things that were already done. Also, migrate xkb stuff properly. - - 03 Nov 2004; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - Marked ~ppc64; bug #67403 - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Wrap font-server USE around things affecting /etc/X11/fs/config. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Combine the dri USE flag into the opengl USE flag, since there's no way to - control just the build of the 3D drivers at present. - - 03 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Patchset 0.2.6. Add 9990_x86_6.8.0-xbox-20041024.patch for the Xbox's - nvidia driver (#68726). Add 1100_all_6.8.0-build-all-lucida-fonts.patch - (#68414). The 75dpi and 100dpi fonts weren't being built. This is from - upstream CVS. Add 5200_all_6.8.0-newport-accel.patch (#38549). Hopefully - will go upstream. This adds acceleration for Newport video cards (mostly - MIPS users). Add 5160_all_6.8.0-radeon-fix-monitor-detection.patch (#67845, - fd.o #1559). This fixes issues with dual-monitor setups not being detected - properly. Add - 0440_all_6.8.0-support-cymotion-master-and-ibm-space-saver-keyboards.patch - (#63767). This adds support for the Cherry CyMotion Master XPress and the - IBM Space Saver keyboards. It's from upstream CVS. Fileset 0.6. Add - xprint.init, a Gentoo-style init-script wrapper for the RH-style init script - provided by xorg, and install it on USE=xprint (#68316). In addition, fix - the function for migration from /usr/X11R6/libdir to /usr/libdir, - migrate_usr_x11r6_lib(). It now works properly even when .keep files are - left behind and when /usr/libdir/X11 is a symlink. - - 02 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Try to fix ${ROOT} support -- it's assumed to be a chroot. To aid this, also - make all symlinks relative. - - 02 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add a symlink "../../../lib/xkb /usr/X11R6/lib/X11/xkb" so libxklavier and - other things looking for that location continue to work. - - 01 Nov 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add blocker on app-text/dgs, since they install the same libs. Need to - confirm compilation of its deps, however. - - 29 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Sync opengl-update deps in DEPEND and RDEPEND. - - 29 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add migrate_usr_x11r6_lib() to aid migration from /usr/X11R6/libdir to - /usr/libdir. Thanks to jstubbs for an idea. Also move update_config_files() - to a more appropriate place. - - 28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - USE=xv wrongly requires USE=opengl, but this is a bug in the source - (#67996). Forcing them to be used together until upstream fixes it. - - 28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - /usr/libdir, not /usr/libdir/X11. - - 28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Modify opengl-update dep, the token wasn't quite matching the proper versions. - - 28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Change glx USE to opengl. - - 28 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Update opengl-update dep to >=2* for /usr/lib move. - - 24 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: - Fix herd case. - - 21 Oct 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - stable on alpha and ia64 - - 20 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Fileset 0.5. Update /etc/env.d/10xorg to reflect shift from - /usr/X11R6/{lib,lib64} to parallel in /usr/lib. - - 20 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Patchset 0.2.5. Add 6000_all_6.8.0-libgl-double-free.patch to stop a libGL - segfault when /dev/dri/card* is not readable for a user (fd.o #1501). - - 20 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Change xfs USE to font-server to stop duplication with xfs filesystem. - - 20 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild, - xorg-x11-6.8.0-r2.ebuild: - Update inherit to toolchain-funcs instead of gcc and x11 instead of xfree. - Update license syntax so I can commit. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - USE=dri requires USE=glx. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Coding style rework. Move logic operators to beginnings of lines rather than - ends; Keep 'then' on same line as 'if', same for 'for' and 'do'; indent ';;' - of case statements one tab past the current switch. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Tons of code cleanups, again thanks to mr_bones_. There are a few more left in - the TODO list. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add die messages. Also try emake -C instead of moving into a dir, make, then - moving out. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Move some variables to locals. Note that all of this cleanup is thanks to - mr_bones. - - 19 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Change negative uses to bash style instead of portage-specific one. - - 18 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Replace all commands in backticks `` with commands in $(). - - 18 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild: - Combine two consecutive instances of "use ! bitmap-fonts." - - 18 Oct 2004; Stephen P. Becker <geoman@gentoo.org> - xorg-x11-6.8.0-r1.ebuild: - stable on mips wrt bug 67326 - - 18 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Commit initial changes for moving /usr/X11R6/lib to /usr/lib. - - 17 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild: - Fix problem for lib64 get_libdir users that resulted in *.la files not being - installed (#67729). - - 14 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild, - xorg-x11-6.8.0-r2.ebuild: - Update ebuild to reflect that gcc-getCC no longer exports CC. - - 13 Oct 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - stable on amd64 - - 13 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild: - Bad logic on BuildXprintLib. It should've been defined only when the rest of - xprint WASN'T built, because when xprint is built, it's turned on - automatically (#67400). - - 13 Oct 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - Stable on hppa. - - 12 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - x86. This should be ready to stable on other archs too. See bug #67326. - - 12 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Fix keywords: remove everything except ~x86, since this is still hard-masked, - in development and only tested on x86. - - 12 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Patchset 0.2.2.1. Add 9940_all_6.8.0-libX11-stack-overflow.patch to fix a - non-exploitable problem (fd.0 #1459). Add 5140_all_6.8.0-radeon-swsusp.patch - to fix software suspend on Radeons (fd.o #1220). Fileset 0.4. Add - /usr/X11R6/lib64 to LDPATH in /etc/env.d/10xorg, so things work for - architectures that install to there. - - 12 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Patchset 0.2.4. Add 9940_all_6.8.0-libX11-stack-overflow.patch to fix a - non-exploitable problem (fd.0 #1459). Add 5140_all_6.8.0-radeon-swsusp.patch - to fix software suspend on Radeons (fd.o #1220). Fileset 0.4. Add - /usr/X11R6/lib64 to LDPATH in /etc/env.d/10xorg, so things work for - architectures that install to there. - - 11 Oct 2004; Mike Frysinger <vapier@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.8.0-r1.ebuild, xorg-x11-6.8.0-r2.ebuild: - remove baselayout DEPEND - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Patchset 0.2.3. Add 9910_all_use-nonow-ldflag-for-hardenedgccspecs.patch. In - combination with HardenedGccSpecs YES, this will fix up a lot of the - unresolved symbol problems with dlloader (#64618). Patch is by Adam Jackson - <ajax@nwnk.net> with some mods by solar, applied to vanilla 6.8.0 by swtaylor - and to ours by me. Pull 9970_all_dlloader-imake-fix.patch. Its functionality - was pulled into patch 9910. Also bump to fileset 0.3. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Patchset 0.2.2. Update 9001_all_4.3.0-lnx-evdev-keyboard-v2.patch to restore - case insensitivity of Option "Protocol" "Standard" for keyboard by Alan - Swanson <swanson@ukfsn.org> (#63568). Fileset 0.3. Fix xfs lockup so it's - usable again (#61737). Also, fix xdm init script for empty DISPLAYMANAGER in - /etc/rc.conf (#65586). - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add HardenedGccSpecs if USE="hardened dlloader" (#64618). A patchset is - forthcoming. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add comment on what DMX actually is. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Do libGLU* stuff all in the same place. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add three new USE flags: truetype-fonts, type1-fonts and xv. The fonts ones - enable building of that type of font, and xv enables the XVideo library and - extension. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Allow FEATURES=nostrip to prevent stripping, and add ${CHOST}-strip support - from solar (#66531). - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add uclibc support by making build a little more minimal with USE=uclibc, - thanks to iggy. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Add dri and glx USE flags. dri builds direct rendering support into drivers. - glx builds the GLX library and extension. The dri flag is a subset of the glx - flag. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Fix up dependency list, thanks to iggy. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r2.ebuild: - Make font server optional with xfs USE flag. - -*xorg-x11-6.8.0-r2 (11 Oct 2004) - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.0-r2.ebuild: - Add in-progress ebuild. It's broken, don't waste your time trying it yet. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Remove bogus sgmltools-lite dependency. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Disallow USE="dmx doc" (#63548). - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Build libXp even when USE=-xprint, at ajax's suggestion. RH does the same. - USE=-xprint now disables the Xprt server and clients. This means we can remove - xprint from make.defaults. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Remove erroneous comment that seems to be enabling SDK. - - 11 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Fix best_version call so PAM is enabled. - - 10 Oct 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Fix new installs with USE=debug. X tries to use makeg, which doesn't exist on - the system yet -- use the one within the source instead (#63759). - - 29 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.7.0-r1.ebuild, -xorg-x11-6.8.0.ebuild: - Pull vulnerable versions (#64152). - - 25 Sep 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - Stable for sparc, clearing Bug 64152 on sparc. See also Bug 63994. - - 22 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - -xorg-x11-6.7.99.902.ebuild, -xorg-x11-6.7.99.903.ebuild, - -xorg-x11-6.7.99.904.ebuild: - Drop 6.7.99.x builds. - - 22 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild: - x86 (#64152). - - 22 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.8.0-r1.ebuild: - Patchset 0.2.1. Add - 0430_all_6.8.0-sparc-add-mach64-to-devel-dri-drivers.patch (#63994). This plus - other ebuild modifications from that bug should enable sparc guys to use - 6.8.0-r1. Ebuild mods include adding hardened flag for sparc to append - -fno-PIE and -fno-pie as well as change the assembler command. Also build the - deprecated keyboard driver for sparc on kernels != 2.6 and a weird hack to - stop a sparc32-SMP compiler bug (#56593). - - 18 Sep 2004; Guy Martin <gmsoft@gentoo.org> xorg-x11-6.7.0-r2.ebuild, - xorg-x11-6.8.0-r1.ebuild: - Removed build of unneeded drivers. 6.7.0-r2 Stable on hppa. - - 18 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> - xorg-x11-6.8.0-r1.ebuild: - Add ~alpha to keywords. - - 18 Sep 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r2.ebuild, - xorg-x11-6.8.0-r1.ebuild: - 6.7.0-r2 stable, 6.8.0-r1 testing on mips - bug 64152 - - 17 Sep 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - Add ~sparc keyword, partially addressing bug 64152. Testing needed before - stable for sparc is appropriate. - - 17 Sep 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - stable on amd64 - - 17 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> - xorg-x11-6.7.0-r2.ebuild: - Stable on alpha, bug 64152. - - 17 Sep 2004; <SeJo@gentoo.org> xorg-x11-6.8.0-r1.ebuild: - unstable ppc bug:64152 - - 17 Sep 2004; <SeJo@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - stable ppc bug:64152 - -*xorg-x11-6.8.0-r1 (16 Sep 2004) - - 16 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.8.0-r1.ebuild: - Patchset 0.2. Security release. Add - 9925_all_6.7.0-libXpm-CAN-2004-0687-CAN-2004-0688.patch to fix stack and - integer overflows in libXpm (Chris Evans, Alan Coopersmith, Matthiew Herrb) - (#64152). - - 15 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild: - Patchset 1.3. Security release. Add - 9925_all_6.7.0-libXpm-CAN-2004-0687-CAN-2004-0688.patch to fix stack and - integer overflows in libXpm (Chris Evans, Alan Coopersmith, Matthiew Herrb) - (#64152). Also add 5170_all_6.7.0-xvideo-allocation.patch (#64092, fd.o #474), - which made it into 6.8.0. 5170 should fix those annoying xvideo memory - problems. - - 15 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.8.0.ebuild: - Fix SRC_URI inconsistency issues (#64117). - - 14 Sep 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.8.0.ebuild: - Fileset 0.2. Support any future display managers (#23957) and update MANPATH - (#63645). - - 14 Sep 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.8.0.ebuild: - Added -mtune to ALLOWED_FLAGS for mips. - - 12 Sep 2004; Daniel Goller <morfic@gentoo.org> xorg-x11-6.8.0.ebuild: - ppend -mno-sse2 with gcc3.4 for bug #57602 - - 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: - check XF86Config-4, and also fix the if condition - - 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: - adjust the regex to fix bug #63425 by Don Seiler <rizzo@gentoo.org> - - 09 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: - keyboard->kbd in XF86Config as well as xorg.conf - - 08 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: - For users with cascading profiles, the bitmap-fonts and xprint USE flags will - not show up yet. So echo a message out - - 08 Sep 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.8.0.ebuild: - fix logic in cjk/nls - -*xorg-x11-6.8.0 (09 Sep 2004) - - 09 Sep 2004; Andrew Bevitt <cyfred@gentoo.org>; +xorg-x11-6.8.0.ebuild: - Xorg release 6.8.0 - - 07 Sep 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.904.ebuild: - create lib symlink in /usr/$(get_libdir)/opengl/xorg-x11/ if $(get_libdir) != - lib. fixes bug 62990 - - 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> xorg-x11-6.7.0-r1.ebuild, - xorg-x11-6.7.0-r2.ebuild, xorg-x11-6.7.99.902.ebuild, - xorg-x11-6.7.99.903.ebuild, xorg-x11-6.7.99.904.ebuild: - Switch to use epause and ebeep, bug #62950 - - 04 Sep 2004; Seemant Kulleen <seemant@gentoo.org> - xorg-x11-6.7.99.904.ebuild: - ok, ready to me unmasked. This is the Swegener-Rocks Release for Gentoo. The - not-enough-xv-memory should go away with mplayer with this. Additionally, this - closes bug #60470 from Spanky. - - 03 Sep 2004; Seemant Kulleen <seemant@gentoo.org> - xorg-x11-6.7.99.904.ebuild: - ok this is still -*'d -- please don't file bugs about segfaults and fonts - errors. Those are known issues and we're working on them. - -*xorg-x11-6.7.99.904 (02 Sep 2004) - - 02 Sep 2004; Seemant Kulleen <seemant@gentoo.org> - +xorg-x11-6.7.99.904.ebuild: - copy ebuild over, for coming version bump - - 31 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild: - I've added an override for amd64 that will use lib64 as the lib directory even - when CONF_LIBDIR isnt lib64. This should allow for bug 62110 to be fixed - (locales broken for 32bit apps). - - 30 Aug 2004; Seemant Kulleen <seemant@gentoo.org> - xorg-x11-6.7.99.903.ebuild: - add patch for dlloader fix from ajax in the fd.o bugzilla - - 29 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.903.ebuild: - made xorg-x11-6.7.99.903 CONF_LIBDIR aware for installing to lib64 instead of - lib - -*xorg-x11-6.7.99.903 (28 Aug 2004) - - 28 Aug 2004; Seemant Kulleen <seemant@gentoo.org> - +xorg-x11-6.7.99.903.ebuild: - version bump to latest snapshot. ppc should work with this - - 28 Aug 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.99.902.ebuild: - added a host.def define (StaticNeedsPicForShared) for amd64 that fixes the - problem with building gdm or kdebase PIE - - 25 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.99.902.ebuild: - Delete encodings that make ttmkfdir segfault: large/cns11643-1.enc - large/cns11643-2.enc large/cns11643-3.enc suneu-greek.enc (#60470). - - 25 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.99.902.ebuild: - Add some more debugging support. Add '-gstabs+ -gstabs -ggdb' to - ALLOWED_FLAGS. Also, cause USE=debug to prevent stripping of binaries and - libraries. - - 22 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild, - xorg-x11-6.7.99.2.ebuild, xorg-x11-6.7.99.902.ebuild: - replace-cpu-flags had args in the wrong order, resulting in p3's being - compiled with p4 badness (#60597). - - 21 Aug 2004; Seemant Kulleen <seemant@gentoo.org> - xorg-x11-6.7.99.902.ebuild: - OK, this is the real ebuild. I'm calling this the - Latexer-isnt-made-from-rubber release. Test away, and look for xcompmgr in - x11-misc - -*xorg-x11-6.7.99.902 (21 Aug 2004) - - 21 Aug 2004; Seemant Kulleen <seemant@gentoo.org> - +xorg-x11-6.7.99.902.ebuild: - Version bump to rc2, but this is an identical ebuild to 99.2 just so we can - easily make diffs of the changes. Real ebuild to follow momentarily - - 20 Aug 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.7.99.2.ebuild: - fix sed properly, thanks to ciaranm and swegener - - 14 Aug 2004; Seemant Kulleen <seemant@gentoo.org> xorg-x11-6.7.99.2.ebuild: - nothing separate to unpack for USE=doc, since we're using one tarball - - 13 Aug 2004; Brandon Hale <tseng@gentoo.org> xorg-x11-6.7.99.2.ebuild: - Minor adjustment to einfo for USE=dlloader, rework sed to replace keyboard - with kbd driver, move that bit into setup_config_files and clean up that - function a bit. - -*xorg-x11-6.7.99.2 (13 Aug 2004) - - 13 Aug 2004; Seemant Kulleen <seemant@gentoo.org> +xorg-x11-6.7.99.2.ebuild: - New snapshot: FOR TESTING ONLY. I'm calling this the "Use Ajax for - everything" release in portage. - - 02 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild: - fc-cache -f breaks the font eclass, according to foser. - - 02 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; : - Note that the last commit was fileset 0.3. - - 02 Aug 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild: - Fix font setup (#53753). Previously we trashed fonts.scale for all scalable - fonts, even though we only regenerated it for TrueType fonts. ttmkfdir can't - regenerate fonts.scale for Type1 or OpenType fonts, so we start using - mkfontscale for that. We trashed any other fonts.scale files that happened to - be around, such as Speedo/CID. We stop doing that. Also fixed the regexps in - the ebuild and the xfs init script to use ttmkfdir for TrueType only and - mkfontscale for Type1 and OpenType. Change INFODIR to INFOPATH also (#54275). - Also update Gentoo copyright and licensing info in files tarball to be - consistent with everything else. - - 28 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild: - Add more info on pam-X circular dep (#54378, #35468). - - 26 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild: - Add ${ROOT} to absolute path references that need it. - - 24 Jul 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild, - xorg-x11-6.7.0-r2.ebuild: - -r1 stable, -r2 testing on mips - - 20 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r2.ebuild: - Remove commented-out 'HasMotif YES' #define (#57271). Part of what patch 9385 - was intended to fix was actually committed post-6.7.0, so it wasn't here to - start with. If anyone requests motif support, we'll look into some sort of - conditional enabling, probably similar to pam's, to avoid circular - dependencies. - - 19 Jul 2004; Martin Schlemmer <azarah@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - Enabling Motif by default is is bogus, as XFree86/XOrg-X11 have never been - built against Motif, and 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch - do not enable/disable it, but just addsome more bits _if_ and _only_if_ its - enabled in host.def, which it never was ... - - http://bugs.gentoo.org/show_bug.cgi?id=57271#c21 - - 17 Jul 2004; David Holm <dholm@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - Added to ~ppc. - - 17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; xorg-x11-6.7.0-r2.ebuild: - Adding ~amd64 keyword, tested and inline for opengl-update commits - - 16 Jul 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.7.0-r2.ebuild: - stable on ppc64 baby! - - 16 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild: - Update TODOs. - -*xorg-x11-6.7.0-r2 (16 Jul 2004) - - 16 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.7.0-r2.ebuild: - Patchset 1.2. Add - 9395_all_6.7.0-savage-disable-xrandr-for-shadowfb-rotate.patch, given to Tim - Roberts by anonymous user, posted to devel@xfree86.org mailing list. Without - this patch, an attempt to use Xrandr with shadowFB-based rotation will result - in an unusable display. Add - 9390_all_6.7.0-add-french-belgian-azerty-ppc-keyboard.patch, which adds a - keymap new in G4/G5 macs (#49155). Add - 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch, which looks outside of - /usr/X11R6 for motif and defaults it to OFF on Linux and BSD. Add - 9375_all_6.7.0-radeon-resume-from-S3-suspend.patch (#48095), which allows the - ACPI S3 suspend state to work for at least some Radeons. Add - 9000_all_4.3.0-lnx-evdev-core.patch, 9001_all_4.3.0-lnx-evdev-keyboard.patch - and 9002_all_6.7.0-lnx-evdev-mouse.patch from xfree-4.3.0-r7 to add event - interface device support (#29953, #56159). Add - 9010_all_4.3.0-logitech-ps2-plusplus.patch from xfree-4.3.0-r7 to add support - for the PS/2++ protocol used by some of the newer Logitech mice (#29953, - #56159). Add 9365_all_6.7.0-fix-render-cplastbit-def.patch to correct the - definition of CPLastBit to account for ComponentAlpha, which may fix behavior - of the server's SetPictureToDefaults. Add - 9370_all_6.7.0-install-xrender-pkgconfig-file.patch to install xrender.pc in a - cleaner way than former manual hack. OTHER CHANGES: Install glext.h to - /usr/lib/opengl/xorg-x11 like the other GL includes (#54984) and set up a - symlink manually to avoid an opengl-update circular dependency. Pull out the - external drop-in driver code entirely to clean up the ebuild. Enable the i810 - driver on x86_64 (RH #126687). Set HasMotif to YES in the ebuild to counteract - 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch. - - 16 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - USE flag pie renamed to dlloader. Remove USE flag hardened, because it did - nothing. - - 16 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Build dlloader things for ppc64 and relink them properly (#56248). - - 10 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Bump opengl-update requirement from >=1.7 to >=1.7.2 to make sure people don't - get caught up. - - 10 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - x86 - - 06 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Allow pie+sdk builds, now that we added patch for it. - - 06 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Patchset 1.1.1. Move ppc64 patch over from its formerly bad placement as a - separate file into the patchball as - 9360_all_6.7.0-ppc64-support-updates.patch. Add - 4152_all_4.3.0-allow-xdm-server-quotes.patch from xfree-4.3.0-r7 (#38232). - This allows quoted expressions in /etc/X11/xdm/Xservers to be used properly. - Add 0425_all_6.7.0-sun-type6-keyboard.patch from xfree-4.3.0-r7 (#21120), - ported by reporter. Add 9855_all_6.7.0-fix-SDK-pie-build.patch to fix a module - naming problem on pie builds, which resulted in the SDK install breaking - (#50562). Add 9355_all_6.7.0-xorgconfig-fontdir-fixes.patch, which stops the - tool from adding /usr/X11R6 font paths when fonts are installed elsewhere - (#54132). Also update TODO and add a little more warning for the auto-PAM - stuff. This should be ready to go stable on x86 if nothing huge comes up. - - 05 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; -xorg-x11-6.7.0.ebuild: - Pull old version, vulnerable to security hole. - - 05 Jul 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Update TODO to more realistically reflect time to stable for x86. - - 30 Jun 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - stable on ia64 #53226 - - 24 Jun 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0-r1.ebuild, - xorg-x11-6.7.0.ebuild: - QA - fix use invocation - - 23 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0.ebuild: - Update TODOs. - - 21 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Forgot to stop building xterm, somehow (#54051). - - 19 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Move how font directories are defined into a host.def setting. - - 16 Jun 2004; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - Marked ppc for security reason, see Bug #53226 - - 16 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Digest fix, looks like tgall forgot FEATURES=cvs - - 16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> - xorg-x11-6.7.0-r1.ebuild: - Added ~amd64. - - 15 Jun 2004; David Holm <dholm@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - Added to ~ppc. - - 14 Jun 2004; Tom Gall <tgall@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - ~ppc64 initial x support #53763 - - 14 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Major refactoring of code. No end-user difference, so no bump. - - 14 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - Marked stable for sparc (Bug 53226). - - 13 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - xorg-x11-6.7.0-r1.ebuild: - Workaround for #50562 -- disallow pie+sdk build. - - 13 Jun 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - Added ~mips keyword -- bug 53226 - - 12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - ~alpha keyword, bug #53226. - - 11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0-r1.ebuild: - Add ~sparc keyword. (Bug 53226) - -*xorg-x11-6.7.0-r1 (11 Jun 2004) - - 11 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; - +xorg-x11-6.7.0-r1.ebuild: - Patchset 1.1. Add 9920_all_6.7.0-xdm-open-chooserfd-CAN-2004-0419.patch to - stop xdm from ignoring its "DisplayManager.requestPort" setting. xdm opens its - "chooserFd" TCP socket on all network interfaces without this patch (xf86 - #1376). Update 9840_all_4.3.0-SDK-add-missing-includes-for-gatos-v2.patch for - new gatos -- another include needed (battousai@gentoo.org). Update - 0120_all_4.3.99-parallel-make-v2.patch to remove a patched-in .rej and some - patched-in .orig's (#49455). Update 0126_all_4.2.99.3-startx-v2.patch to - remove pointless dependency on xvt (#49455). Big chunk of backports from CVS: - 9305_all_6.7.0-chips-segfault-on-mode-switch-and-video-overlay.patch to fix a - segfault on video mode switching when pScrn->currentMode does not contain a - valid mode. Also fix video overlays for double scan modes; Add - 9310_all_6.7.0-config-cf-cleanup.patch to clean up xorg.cf by factoring out - many common defines. Make the fbdev driver only build on Linux (fbdevhw is - just stubs on other OSes). Add AFB to AMD64 build, and include - XF86OSCardDrivers. I continue adding things that aren't supported under Gentoo - (BSD-related, or other archs) because I want to pre-emptively have work done - for any ports. Also, it makes other backports easier. (fd.o #448, 449); Add - 9315_all_6.7.0-fb-render-fixes.patch to fix problems in render fb - implementation found by rendercheck; Add - 9320_all_6.7.0-getconfig-xorg-name.patch to fix problem with getconfig where - file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature (Change "Xorg - Project" to "Xorg Foundation" to match getconfig script) (fd.o #678); Add - 9325_all_6.7.0-improve-xdm-auth-1-cookie.patch to improve 'uniqueness' of - authorization cookie sent by client for XDM-AUTHORIZATION-1. Old 'uniqueness' - consisted of the PID of the client, a time stamp (in seconds) and a number - obtained by starting to count down from 0xffff. When a client did an - XOpenDisplay() then execv'ed a child and did XOpenDisplay() again within the - same second, the cookie was identical to the previous one (as the PID did not - change but the static 'count down' variable was reinitialized) and thus - refused by the server; Add 9330_all_6.7.0-link-with-pam-on-pam-builds.patch to - link with PamLibraries if building with PAM support; Add - 9335_all_6.7.0-modular-imake-build.patch to fix build glitches when building - modules independently using Imake; Add - 9340_all_6.7.0-remove-xmu-dep-on-xaw-header.patch to remove Xaw header - dependency from Xmu library build (fd.o #634); Add - 9345_all_6.7.0-unlock-xauthority-on-sigpipe.patch to make xauth unlock - .Xauthority on SIGPIPE (fd.o #550); Add - 9350_all_6.7.0-xrender-xorgconfig-xdmcp-msgs.patch to muffle compiler warnings - in lib/Xrender/Xrender.c, fix an option name in a log message of - programs/Xserver/hw/xfree86/common/xf86Configure.c and improve debugging - messages in programs/xdm/xdmcp.c. - - 03 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; : - Add credit for netwinder.org ARM patch. - - 03 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 1.0. This patchset should get xorg-x11-6.7.0 ready to go stable on - all archs that have tested it. Many of them have already stabled it, so I'm - holding some non-crucial patches out for 6.7.0-r1. - - -Add 9210_all_XFree86-4.3.0-arm32-compiler.h.patch (#52707) from - netwinder.org. This fixes compiles for the ARM architecture. Patch from PhilB, - according to netwinder's RPM spec file. - -Add 9215_all_xorg-x11-6.7.0-char-bit-and-ia64-asm-page.patch to remove a - compiler-intrinsic define since it dies on makedepend otherwise (fd.o #601), - and fix the IA64 build (broken because it includes kernel header asm/page.h, - which doesn't work with -ansi) (fd.o #605). - -Add 9220_all_xorg-x11-6.7.0-install-vera-italic.patch to install VeraIt.ttf. - It was getting left out. Patch from xorg CVS by Eric Anholt. - -Add 9225_all_xorg-x11-6.7.0-install-xfree86-lst.patch (fd.o #531) to install - xfree86.lst. This should fix some XKB problems. - -Add 9230_all_xorg-x11-6.7.0-try-tcp-without-local-and-fix-ipv6-xdmauth- - segfault.patch to make XOpenDisplay try tcp connection if local fails (fd.o - #546), and fix Xlib segfaults with IPv6 if compiled with HASXDMAUTH (NetBSD - #25098). - -Add 9235_all_xorg-x11-6.7.0-libxf86config-monitor-freq-fix.patch from RH. - This prevents writing out the HorizSync/VertRefresh lines commented out, which - forces all default X config files written out by this library to rely on DDC. - Poor assumption that DDC is always available. Patch by Mike Harris. - -Add 9240_all_xorgconfig-naming-xkb-font-path-fixes.patch to do a few things: - - Clean up server name changes from TM branch - - Set default XKB rules file name correctly - - Use default font path from Imake configuration for the default font path - in generated xorg.conf files. - - Use path variables from Imake configuration for paths to files, in case - vendor has configured them to install somewhere other than the defaults. - Patch from xorg CVS by Alan Coopersmith. - - 03 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Fix typo in xrender.pc generation, includ to include. - - 02 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Fix generation of xrender.pc so version is resolved (#52843). - - 03 Jun 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> xorg-x11-6.7.0.ebuild: - Masked stable on ppc - - 02 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Work around upgrade problem where people have Option "XkbRules" "xfree86" in - their config file. - - 01 Jun 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Prevent -fomit-frame-pointer and k6 flags from being used together (#49310). - - 29 May 2004; Ferris McCormick <fmccor@gentoo.org> xorg-x11-6.7.0.ebuild: - Marked stable for sparc. - - 29 May 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Force opengl-update to change to xorg-x11 if xfree is currently selected, else - default to old behavior. - - 28 May 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.7. Add 9860_all_xorg-xkb_winkeys.patch to fix broken windows keys - (#48307). - - 12 May 2004; Alexander Gabert <pappy@gentoo.org> xorg-x11-6.7.0.ebuild: - removed hardened-gcc checks - - 05 May 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Remove our custom SharedLibraryLoadFlags as a workaround until #49038 (fd.o - #600) is fixed. - - 25 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Update so gcc-3.4 is respected (#48933). - - 21 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add a couple of missing definitions for USE=sse -- HasSSESupport and - MesaUseSSE, from eikke on Freenode. - - 19 Apr 2004; Aron Griffis <agriffis@gentoo.org> xorg-x11-6.7.0.ebuild: - Add ~alpha and ~ia64 - - 19 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.6. Add 9200_all_6.7.0-fix-zh-cn-utf8-crashes.patch, which fixes - crashes when using core fonts in the zh_CN.UTF-8 locale. See fd.o bug #368. - - 19 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add them to IUSE. - - 19 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Don't autodetect MMX/SSE/3DNOW, it breaks cross-compilation. - - 19 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Don't remove fonts.* or encodings.dir in dirs not provided by this package - (#30698). - - 18 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add more backwards compatibility things -- symlinks for all former font, doc - and man dirs as well as autogeneration of new config files. Fix generation of - xrender.pc. - - 18 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add explicit xfree to blockers. - - 18 Apr 2004; Travis Tilley <lv@gentoo.org> xorg-x11-6.7.0.ebuild: - marking stable on amd64 with the full realisation that the normal time period - for waiting to mark things stable has yet to be met. A security vulnerability, - outlined in bug 48107, forced me to mark the new xine-lib stable on amd64, - where it will not compile with any unmasked version of xfree due to -fPIC - errors (see bugs 48261, 44274, and 40646). Xorg-x11 is the only truly stable - and fully functional option on amd64! Xfree 4.3.0, in general, is simply not - amd64-friendly. Please CC me for any bugs relating to xorg-x11. - - 14 Apr 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0.ebuild: - Added ~mips keyword. - - 12 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - ~hppa at gmsoft's request. - - 12 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.5. Add 9500_all_6.7.0-hppa-fixes.patch so it builds on HPPA. Add - HPPA fixes to 5900_all_6.7.0-acecad-v2.patch. Thanks to Guy Martin - <gmsoft@gentoo.org> for these. - - 12 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.4. Add 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid - conflict of bool between ncurses-5.4 and xf86cfg (#43491). - - 11 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add some arch-specific CFLAGS mangling. - - 11 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Added -g to ALLOWED_FLAGS at request of ajax on Freenode #xorg. - - 10 Apr 2004; Jason Wever <weeve@gentoo.org> xorg-x11-6.7.0.ebuild: - Added ~sparc keyword. - - 10 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add sys-apps/util-linux to DEPEND, reported by IceD^ in Freenode #gentoo. - - 09 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.3. Add 9110_all_xorg-6.7.0-pci-domains.patch to close #43630. This - makes 2.6 kernels, sparc and X work together. - - 09 Apr 2004; Luca Barbato <lu_zero@gentoo.org> xorg-x11-6.7.0.ebuild: - Marked ~ppc - - 08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Drop extra quote in OptimizedCplusplusDebugFlags. - - 08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add patchset to XVendorString. It could come in handy. - - 08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Change XVendorString to be compatible with upstream so people can strstr for - The X.Org Foundation. - - 08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add GccAliasingArgs to the optimized CFLAGS and CXXFLAGS setup, so we get - -fno-strict-aliasing. This avoids broken code, pending a patch from Luca to - fix. - - 08 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Remove xterm from DEPEND, it's still in PDEPEND. I accidentally copied instead - of pasted earlier. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Drop BuildLinuxDocText. It caused a bunch of docs to NOT be installed on - USE=doc. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Use gcc-getCC instead of manual hack. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Patchset 0.2. Added 9400_all_4.3.0-mkcfm-FHS-install.patch to fix hard-coded - path. Rework 9113_all_4.3.0-xterm-make-optional.patch to apply to xorg.cf - instead of xfree86.cf and rename it - 9113_all_6.7.0-xterm-make-optional-v2.patch (#47100). - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Add x11-terms/xterm to PDEPEND. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Change blocker on xfree to blocker on other virtual/x11. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Fileset 0.2. Fix libGL.la path -- #47100. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Drop references to xterm since we're going external now. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Change homepage to wiki. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-6.7.0.ebuild: - Change a couple of XF86Config references to xorg.conf. - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; : - Looks like repoman doesn't auto-add Manifests. - -*xorg-x11-6.7.0 (07 Apr 2004) - - 07 Apr 2004; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml, - xorg-x11-6.7.0.ebuild: - Initial commit. - diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest deleted file mode 100644 index af33929..0000000 --- a/x11-base/xorg-x11/Manifest +++ /dev/null @@ -1,42 +0,0 @@ -AUX 6.9.0-fix-rom-read-dualhead.patch 3245 RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef SHA1 ebececdee80fde617c80b26207dfc270185851a3 SHA256 e97d3cb6791caeb8538dfbacb2df39e236e1747c308e1322edd9c48f667a0ea9 -MD5 1a0bb4c5b887105f3232ab9a7706e7b4 files/6.9.0-fix-rom-read-dualhead.patch 3245 -RMD160 1cd7036604715b8d0caaeef0d77516fe244d02ef files/6.9.0-fix-rom-read-dualhead.patch 3245 -SHA256 e97d3cb6791caeb8538dfbacb2df39e236e1747c308e1322edd9c48f667a0ea9 files/6.9.0-fix-rom-read-dualhead.patch 3245 -AUX CVE-2006-1526-xrender-mitri.patch 833 RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 SHA1 40b6500d5b947c093837dcc708b5630fb3f178fc SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 -MD5 daeec68d1c01357b57daa15ff859ddc5 files/CVE-2006-1526-xrender-mitri.patch 833 -RMD160 a7ac6f0b9925ffee95fcac0549e1e68f29b5e783 files/CVE-2006-1526-xrender-mitri.patch 833 -SHA256 7a5f115be88411ed28d1098a79be021440c57fef3200cabfec48c943d3b0df01 files/CVE-2006-1526-xrender-mitri.patch 833 -AUX x11r6.9.0-setuid.diff 12759 RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 SHA1 918cf9d893f445d653b6872075503be23d7e9e72 SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670 -MD5 ab62c18f015f3831228973e04b2aeac5 files/x11r6.9.0-setuid.diff 12759 -RMD160 42c9b60d770756e8f2003c8fd5771130bc4636b2 files/x11r6.9.0-setuid.diff 12759 -SHA256 20ef7602113fef90b61c748801b1fb970496e53ec5ccfcb81e96fb005b092670 files/x11r6.9.0-setuid.diff 12759 -AUX xorg-68x-setuid.patch 12869 RMD160 8d69e406fdff0b103103091a00ec683c9277728e SHA1 e3c0fcfd5f9c2f4867403f8855eaec4851066e05 SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558 -MD5 7e467c0981922e58eedae06f34465905 files/xorg-68x-setuid.patch 12869 -RMD160 8d69e406fdff0b103103091a00ec683c9277728e files/xorg-68x-setuid.patch 12869 -SHA256 c259abd6261b03f5e7d6345e518c4eea6d0cb4099f4763dc971c202615b24558 files/xorg-68x-setuid.patch 12869 -DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA1 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534 -DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA1 45a5dd78398ab499b05ad6feadf05415ff382703 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c -DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA1 ca04f550186cc152db342759ac79ba2eef053ea8 SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 -DIST gemini-koi8-u.tar.bz2 439173 RMD160 861e7048f0ec5136c898976b092b96da8772d70c SHA1 7b8fe99e5515cfaed01a606676a118ac9c7980ac SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 -DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 SHA1 9f197684907bf21508d1c0091f19a283cab9f585 SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 -DIST xfsft-encodings-0.1.tar.bz2 11892 RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 SHA1 958f7cd913496e8e57a55bb9a6fc3b4fdb2e81ac SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 -DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 SHA1 f6cf8bb31668c8bda0bc06e8b9cc47e2e4fd0dcf SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02 -DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA1 21a08218ddaa52a4598ea7d05b690822ecde5c88 SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f -DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA1 2b559b2285304c0462e8731104270bbfc9337ab7 SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755 -DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA1 9ab1b5a1d9eaee1f403d5d3c3ae43441a5aa9745 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3 -EBUILD xorg-x11-6.8.2-r8.ebuild 62778 RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 SHA1 b7d6902405845eca977d31ac4651d2471a98cd53 SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169 -MD5 8cf86f5a6f0a2ae021584506edfad087 xorg-x11-6.8.2-r8.ebuild 62778 -RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 xorg-x11-6.8.2-r8.ebuild 62778 -SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169 xorg-x11-6.8.2-r8.ebuild 62778 -EBUILD xorg-x11-6.9.0-r3.ebuild 61218 RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa SHA1 1c5fa54adc9b51e88952f390dc8749abe7aa09b6 SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9 -MD5 7858f704812383425b0fec24c6e8a041 xorg-x11-6.9.0-r3.ebuild 61218 -RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa xorg-x11-6.9.0-r3.ebuild 61218 -SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9 xorg-x11-6.9.0-r3.ebuild 61218 -MISC ChangeLog 125120 RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 SHA1 cac29327cbe5aeb326961b425b0d62f587b67224 SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99 -MD5 7d624fa6d2d612f182c04df5b1ca5c82 ChangeLog 125120 -RMD160 8d580e8e4b5a00dbe6f18ce8c757107e600ecf26 ChangeLog 125120 -SHA256 e22d881f39e8a95222f74f049e43e90877bb7e1aa0b6cecb5668e366363c9e99 ChangeLog 125120 -MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 -MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230 -SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230 diff --git a/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch b/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch deleted file mode 100644 index d1407e7..0000000 --- a/x11-base/xorg-x11/files/6.9.0-fix-rom-read-dualhead.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2005-11-08 11:04:56.000000000 -0800 -+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2006-06-29 15:48:37.000000000 -0700 -@@ -233,6 +233,8 @@ - - static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, }; - -+static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len); -+ - /* - * Platform specific PCI function pointers. - * -@@ -266,6 +268,11 @@ - #endif - } - -+void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)) -+{ -+ pciOSHandleBIOS = bios_fn; -+} -+ - PCITAG - pciFindFirst(CARD32 id, CARD32 mask) - { -@@ -1347,6 +1354,13 @@ - PCITAG *pTag; - int i; - -+ /* fall back to the old code if the OS code fails */ -+ if (pciOSHandleBIOS) { -+ n = pciOSHandleBIOS(Tag, basereg, func, ptr); -+ if (n) -+ return n; -+ } -+ - n = handlePciBIOS(Tag,basereg,func,ptr); - if (n) - return n; ---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2005-11-08 11:04:56.000000000 -0800 -+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2006-06-29 15:43:50.000000000 -0700 -@@ -431,6 +431,7 @@ - Bool pciMfDev(int, int); - ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); - -+extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)); - extern PCITAG (*pciFindFirstFP)(void); - extern PCITAG (*pciFindNextFP)(void); - ---- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-11-08 11:04:56.000000000 -0800 -+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2006-06-29 15:43:50.000000000 -0700 -@@ -73,6 +73,7 @@ - static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val); - static CARD16 linuxPciCfgReadWord(PCITAG tag, int off); - static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val); -+static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len); - - static pciBusFuncs_t linuxFuncs0 = { - /* pciReadLong */ linuxPciCfgRead, -@@ -125,6 +126,7 @@ - pciBusInfo[0] = &linuxPci0; - pciFindFirstFP = pciGenFindFirst; - pciFindNextFP = pciGenFindNext; -+ pciSetOSBIOSPtr(linuxPciHandleBIOS); - } - - static int -@@ -892,3 +894,44 @@ - } - - #endif /* !INCLUDE_XF86_NO_DOMAIN */ -+ -+int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len) -+{ -+ unsigned int dom, bus, dev, func; -+ unsigned int fd; -+ char file[256]; -+ struct stat st; -+ int ret; -+ int sofar = 0; -+ -+ dom = PCI_DOM_FROM_TAG(Tag); -+ bus = PCI_BUS_FROM_TAG(Tag); -+ dev = PCI_DEV_FROM_TAG(Tag); -+ func = PCI_FUNC_FROM_TAG(Tag); -+ sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom", -+ dom, bus, dev, func); -+ -+ if (stat(file, &st) == 0) -+ { -+ if ((fd = open(file, O_RDWR))) -+ basereg = 0x0; -+ -+ /* enable the ROM first */ -+ write(fd, "1", 2); -+ lseek(fd, 0, SEEK_SET); -+ do { -+ /* copy the ROM until we hit Len, EOF or read error */ -+ ret = read(fd, buf+sofar, len-sofar); -+ if (ret <= 0) -+ break; -+ sofar += ret; -+ } while (sofar < len); -+ -+ write(fd, "0", 2); -+ close(fd); -+ if (sofar < len) -+ xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024); -+ return sofar; -+ } -+ return 0; -+} diff --git a/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch b/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch deleted file mode 100644 index 2d2a104..0000000 --- a/x11-base/xorg-x11/files/CVE-2006-1526-xrender-mitri.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: render/mitri.c -=================================================================== -RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v -retrieving revision 1.5 -diff -u -r1.5 mitri.c ---- xc/programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5 -+++ xc/programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000 -@@ -145,7 +145,7 @@ - if (npoint < 3) - return; - ntri = npoint - 2; -- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); -+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); - if (!tris) - return; - for (tri = tris; npoint >= 3; npoint--, points++, tri++) -@@ -177,7 +177,7 @@ - if (npoint < 3) - return; - ntri = npoint - 2; -- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle)); -+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle)); - if (!tris) - return; - first = points++; - diff --git a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff b/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff deleted file mode 100644 index 9bdb1fa..0000000 --- a/x11-base/xorg-x11/files/x11r6.9.0-setuid.diff +++ /dev/null @@ -1,411 +0,0 @@ -Index: xc/config/util/chownxterm.c -=================================================================== -RCS file: /cvs/xorg/xc/config/util/chownxterm.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 chownxterm.c ---- xc/config/util/chownxterm.c 14 Nov 2003 16:48:20 -0000 1.1.1.1 -+++ xc/config/util/chownxterm.c 5 Jun 2006 10:35:10 -0000 -@@ -41,8 +41,10 @@ - - void help() - { -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ exit(1); -+ if (setuid(getuid()) == -1) -+ exit(1); - printf("chown-xterm makes %s suid root\n", XTERM_PATH); - printf("This is necessary on Ultrix for /dev/tty operation.\n"); - exit(0); -@@ -51,8 +53,10 @@ - void print_error(err_string) - char *err_string; - { -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ exit(1); -+ if (setuid(getuid()) == -1) -+ exit(1); - fprintf(stderr, "%s: \"%s\"", prog_name, err_string); - perror(" failed"); - exit(1); -Index: xc/lib/X11/lcFile.c -=================================================================== -RCS file: /cvs/xorg/xc/lib/X11/lcFile.c,v -retrieving revision 1.6 -diff -u -r1.6 lcFile.c ---- xc/lib/X11/lcFile.c 13 May 2005 22:53:44 -0000 1.6 -+++ xc/lib/X11/lcFile.c 5 Jun 2006 10:35:14 -0000 -@@ -269,7 +269,11 @@ - if (seteuid(0) != 0) { - priv = 0; - } else { -- seteuid(oldeuid); -+ if (seteuid(oldeuid) == -1) { -+ /* XXX ouch, coudn't get back to original uid -+ what can we do ??? */ -+ _exit(127); -+ } - priv = 1; - } - #endif -Index: xc/lib/xtrans/Xtranslcl.c -=================================================================== -RCS file: /cvs/xorg/xc/lib/xtrans/Xtranslcl.c,v -retrieving revision 1.4 -diff -u -r1.4 Xtranslcl.c ---- xc/lib/xtrans/Xtranslcl.c 8 Nov 2005 06:33:26 -0000 1.4 -+++ xc/lib/xtrans/Xtranslcl.c 5 Jun 2006 10:35:15 -0000 -@@ -360,7 +360,10 @@ - uid_t saved_euid; - - saved_euid = geteuid(); -- setuid( getuid() ); /** sets the euid to the actual/real uid **/ -+ /** sets the euid to the actual/real uid **/ -+ if (setuid( getuid() ) == -1) { -+ exit(1); -+ } - if( chown( slave, saved_euid, -1 ) < 0 ) { - exit( 1 ); - } -@@ -369,7 +372,13 @@ - } - - waitpid(saved_pid, &exitval, 0); -- -+ if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) { -+ close(fd); -+ close(server); -+ PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n", -+ slave, 0, 0); -+ return(-1); -+ } - if (chmod(slave, 0666) < 0) { - close(fd); - close(server); -Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v -retrieving revision 1.29 -diff -u -r1.29 xf86Init.c ---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c 14 Dec 2005 20:12:00 -0000 1.29 -+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 5 Jun 2006 10:35:19 -0000 -@@ -1905,7 +1905,11 @@ - FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno)); - break; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n", -+ strerror(errno)); -+ exit(255); -+ } - /* set stdin, stdout to the consoleFd */ - for (i = 0; i < 2; i++) { - if (xf86Info.consoleFd != i) { -Index: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v -retrieving revision 1.9 -diff -u -r1.9 libc_wrapper.c ---- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 3 Jul 2005 08:53:48 -0000 1.9 -+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 5 Jun 2006 10:35:19 -0000 -@@ -1270,7 +1270,10 @@ - #ifndef SELF_CONTAINED_WRAPPER - xf86DisableIO(); - #endif -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno)); -+ exit(255); -+ } - #if !defined(SELF_CONTAINED_WRAPPER) - /* set stdin, stdout to the consoleFD, and leave stderr alone */ - for (i = 0; i < 2; i++) -Index: xc/programs/Xserver/hw/xfree86/parser/write.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/parser/write.c,v -retrieving revision 1.3 -diff -u -r1.3 write.c ---- xc/programs/Xserver/hw/xfree86/parser/write.c 3 Jul 2005 07:01:37 -0000 1.3 -+++ xc/programs/Xserver/hw/xfree86/parser/write.c 5 Jun 2006 10:35:19 -0000 -@@ -170,7 +170,10 @@ - strerror(errno)); - return 0; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) -+ FatalError("xf86writeConfigFile(): " -+ "setuid failed(%s)\n", -+ strerror(errno)); - ret = doWriteConfigFile(filename, cptr); - exit(ret); - break; -Index: xc/programs/Xserver/os/utils.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v -retrieving revision 1.21 -diff -u -r1.21 utils.c ---- xc/programs/Xserver/os/utils.c 8 Nov 2005 06:33:30 -0000 1.21 -+++ xc/programs/Xserver/os/utils.c 5 Jun 2006 10:35:20 -0000 -@@ -1718,8 +1718,10 @@ - case -1: /* error */ - p = -1; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - execl("/bin/sh", "sh", "-c", command, (char *)NULL); - _exit(127); - default: /* parent */ -@@ -1770,8 +1772,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ -@@ -1845,8 +1849,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ -Index: xc/programs/xdm/session.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xdm/session.c,v -retrieving revision 1.3 -diff -u -r1.3 session.c ---- xc/programs/xdm/session.c 8 Nov 2005 06:33:31 -0000 1.3 -+++ xc/programs/xdm/session.c 5 Jun 2006 10:35:21 -0000 -@@ -488,8 +488,14 @@ - else - ResetServer (d); - if (removeAuth) { -- setgid (verify.gid); -- setuid (verify.uid); -+ if (setgid (verify.gid) == -1) { -+ LogError( "SessionExit: setgid: %s\n", strerror(errno)); -+ exit(status); -+ } -+ if (setuid (verify.uid) == -1) { -+ LogError( "SessionExit: setuid: %s\n", strerror(errno)); -+ exit(status); -+ } - RemoveUserAuthorization (d, &verify); - #ifdef K5AUTH - /* do like "kdestroy" program */ -Index: xc/programs/xdm/xdmshell.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xdm/xdmshell.c,v -retrieving revision 1.3 -diff -u -r1.3 xdmshell.c ---- xc/programs/xdm/xdmshell.c 14 Jul 2005 22:58:25 -0000 1.3 -+++ xc/programs/xdm/xdmshell.c 5 Jun 2006 10:35:21 -0000 -@@ -183,7 +183,11 @@ - #endif - - /* make xdm run in a non-setuid environment */ -- setuid (geteuid()); -+ if (setuid (geteuid()) == -1) { -+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n", -+ ProgramName, errno, strerror(errno)); -+ exit(1); -+ } - - /* - * exec /usr/bin/X11/xdm -nodaemon -udpPort 0 -Index: xc/programs/xf86dga/dga.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xf86dga/dga.c,v -retrieving revision 1.2 -diff -u -r1.2 dga.c ---- xc/programs/xf86dga/dga.c 23 Apr 2004 19:54:47 -0000 1.2 -+++ xc/programs/xf86dga/dga.c 5 Jun 2006 10:35:21 -0000 -@@ -16,6 +16,7 @@ - #include <X11/Xmd.h> - #include <X11/extensions/xf86dga.h> - #include <ctype.h> -+#include <errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <signal.h> -@@ -141,7 +142,10 @@ - - #ifndef __UNIXOS2__ - /* Give up root privs */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ fprintf(stderr, "Unable to change uid: %s\n", strerror(errno)); -+ exit(2); -+ } - #endif - - XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0); -Index: xc/programs/xinit/xinit.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xinit/xinit.c,v -retrieving revision 1.4 -diff -u -r1.4 xinit.c ---- xc/programs/xinit/xinit.c 4 Oct 2005 01:27:34 -0000 1.4 -+++ xc/programs/xinit/xinit.c 5 Jun 2006 10:35:21 -0000 -@@ -692,7 +692,10 @@ - startClient(char *client[]) - { - if ((clientpid = vfork()) == 0) { -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ Error("cannot change uid: %s\n", strerror(errno)); -+ _exit(ERR_EXIT); -+ } - setpgrp(0, getpid()); - environ = newenviron; - #ifdef __UNIXOS2__ -Index: xc/programs/xload/xload.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xload/xload.c,v -retrieving revision 1.2 -diff -u -r1.2 xload.c ---- xc/programs/xload/xload.c 23 Apr 2004 19:54:57 -0000 1.2 -+++ xc/programs/xload/xload.c 5 Jun 2006 10:35:21 -0000 -@@ -34,7 +34,7 @@ - * xload - display system load average in a window - */ - -- -+#include <errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -162,8 +162,17 @@ - /* For security reasons, we reset our uid/gid after doing the necessary - system initialization and before calling any X routines. */ - InitLoadPoint(); -- setgid(getgid()); /* reset gid first while still (maybe) root */ -- setuid(getuid()); -+ /* reset gid first while still (maybe) root */ -+ if (setgid(getgid()) == -1) { -+ fprintf(stderr, "%s: setgid failed: %s\n", -+ ProgramName, strerror(errno)); -+ exit(1); -+ } -+ if (setuid(getuid()) == -1) { -+ fprintf(stderr, "%s: setuid failed: %s\n", -+ ProgramName, strerror(errno)); -+ exit(1); -+ } - - XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); - -Index: xc/programs/xterm/main.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/main.c,v -retrieving revision 1.8 -diff -u -r1.8 main.c ---- xc/programs/xterm/main.c 14 Dec 2005 23:28:27 -0000 1.8 -+++ xc/programs/xterm/main.c 5 Jun 2006 10:35:22 -0000 -@@ -1592,8 +1592,10 @@ - Window winToEmbedInto = None; - - #ifdef DISABLE_SETUID -- seteuid(getuid()); -- setuid(getuid()); -+ if (seteuid(getuid()) == -1) -+ exit(2); -+ if (setuid(getuid()) == -1) -+ exit(2); - #endif - - ProgramName = argv[0]; -@@ -1619,8 +1621,16 @@ - - #if defined(USE_UTMP_SETGID) - get_pty(NULL, NULL); -- seteuid(getuid()); -- setuid(getuid()); -+ if (seteuid(getuid()) == -1) { -+ fprintf(stderr, -+ "%s: unable to change back euid\n", ProgramName); -+ exit(1); -+ } -+ if (setuid(getuid()) == -1) { -+ fprintf(stderr, -+ "%s: unable to change back uid\n", ProgramName); -+ exit(1); -+ } - #define get_pty(pty, from) really_get_pty(pty, from) - #endif - -Index: xc/programs/xterm/misc.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/misc.c,v -retrieving revision 1.6 -diff -u -r1.6 misc.c ---- xc/programs/xterm/misc.c 14 Dec 2005 23:28:27 -0000 1.6 -+++ xc/programs/xterm/misc.c 5 Jun 2006 10:35:22 -0000 -@@ -1094,8 +1094,10 @@ - pid = fork(); - switch (pid) { - case 0: /* child */ -- setgid(gid); -- setuid(uid); -+ if (setgid(gid) == -1) -+ _exit(ERROR_SETUID); -+ if (setuid(uid) == -1) -+ _exit(ERROR_SETUID); - fd = open(pathname, - O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL), - mode); -@@ -1262,8 +1264,10 @@ - signal(SIGCHLD, SIG_DFL); - - /* (this is redundant) */ -- setgid(screen->gid); -- setuid(screen->uid); -+ if (setgid(screen->gid) == -1) -+ exit(ERROR_SETUID); -+ if (setuid(screen->uid) == -1) -+ exit(ERROR_SETUID); - - execl(shell, shell, "-c", &screen->logfile[1], (void *) 0); - -Index: xc/programs/xterm/print.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/print.c,v -retrieving revision 1.5 -diff -u -r1.5 print.c ---- xc/programs/xterm/print.c 5 Aug 2005 16:13:04 -0000 1.5 -+++ xc/programs/xterm/print.c 5 Jun 2006 10:35:22 -0000 -@@ -387,9 +387,11 @@ - dup2(fileno(stderr), 2); - close(fileno(stderr)); - } -- -- setgid(screen->gid); /* don't want privileges! */ -- setuid(screen->uid); -+ /* don't want privileges! */ -+ if (setgid(screen->gid) == -1) -+ exit(2); -+ if (setuid(screen->uid) == -1) -+ exit(2); - - Printer = popen(screen->printer_command, "w"); - input = fdopen(my_pipe[0], "r"); diff --git a/x11-base/xorg-x11/files/xorg-68x-setuid.patch b/x11-base/xorg-x11/files/xorg-68x-setuid.patch deleted file mode 100644 index 09eaf45..0000000 --- a/x11-base/xorg-x11/files/xorg-68x-setuid.patch +++ /dev/null @@ -1,404 +0,0 @@ -Index: xc/config/util/chownxterm.c -=================================================================== -RCS file: /cvs/xorg/xc/config/util/chownxterm.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 chownxterm.c ---- xc/config/util/chownxterm.c 14 Nov 2003 16:48:20 -0000 1.1.1.1 -+++ xc/config/util/chownxterm.c 19 Jun 2006 20:15:19 -0000 -@@ -41,8 +41,10 @@ - - void help() - { -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ exit(1); -+ if (setuid(getuid()) == -1) -+ exit(1); - printf("chown-xterm makes %s suid root\n", XTERM_PATH); - printf("This is necessary on Ultrix for /dev/tty operation.\n"); - exit(0); -@@ -51,8 +53,10 @@ - void print_error(err_string) - char *err_string; - { -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ exit(1); -+ if (setuid(getuid()) == -1) -+ exit(1); - fprintf(stderr, "%s: \"%s\"", prog_name, err_string); - perror(" failed"); - exit(1); -Index: xc/lib/X11/lcFile.c -=================================================================== -RCS file: /cvs/xorg/xc/lib/X11/lcFile.c,v -retrieving revision 1.2 -diff -u -r1.2 lcFile.c ---- xc/lib/X11/lcFile.c 23 Apr 2004 18:43:24 -0000 1.2 -+++ xc/lib/X11/lcFile.c 19 Jun 2006 20:15:22 -0000 -@@ -230,7 +230,11 @@ - if (seteuid(0) != 0) { - priv = 0; - } else { -- seteuid(oldeuid); -+ if (seteuid(oldeuid) == -1) { -+ /* XXX ouch, coudn't get back to original uid -+ what can we do ??? */ -+ _exit(127); -+ } - priv = 1; - } - #endif -Index: xc/lib/xtrans/Xtranslcl.c -=================================================================== -RCS file: /cvs/xorg/xc/lib/xtrans/Xtranslcl.c,v -retrieving revision 1.2 -diff -u -r1.2 Xtranslcl.c ---- xc/lib/xtrans/Xtranslcl.c 23 Apr 2004 18:44:27 -0000 1.2 -+++ xc/lib/xtrans/Xtranslcl.c 19 Jun 2006 20:15:24 -0000 -@@ -348,7 +348,10 @@ - uid_t saved_euid; - - saved_euid = geteuid(); -- setuid( getuid() ); /** sets the euid to the actual/real uid **/ -+ /** sets the euid to the actual/real uid **/ -+ if (setuid( getuid() ) == -1) { -+ exit(1); -+ } - if( chown( slave, saved_euid, -1 ) < 0 ) { - exit( 1 ); - } -@@ -357,7 +360,13 @@ - } - - waitpid(saved_pid, &exitval, 0); -- -+ if (WIFEXITED(exitval) && WEXITSTATUS(exitval) != 0) { -+ close(fd); -+ close(server); -+ PRMSG(1, "PTSOpenClient: cannot set the owner of %s\n", -+ slave, 0, 0); -+ return(-1); -+ } - if (chmod(slave, 0666) < 0) { - close(fd); - close(server); -Index: xc/programs/Xserver/hw/xfree86/common/xf86Init.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v -retrieving revision 1.12.2.2 -diff -u -r1.12.2.2 xf86Init.c ---- xc/programs/Xserver/hw/xfree86/common/xf86Init.c 17 Dec 2004 02:01:21 -0000 1.12.2.2 -+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c 19 Jun 2006 20:15:25 -0000 -@@ -1861,7 +1861,11 @@ - FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno)); - break; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n", -+ strerror(errno)); -+ exit(255); -+ } - /* set stdin, stdout to the consoleFd */ - for (i = 0; i < 2; i++) { - if (xf86Info.consoleFd != i) { -Index: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v -retrieving revision 1.3 -diff -u -r1.3 libc_wrapper.c ---- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 30 Jul 2004 20:51:08 -0000 1.3 -+++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c 19 Jun 2006 20:15:26 -0000 -@@ -1226,7 +1226,10 @@ - #ifndef SELF_CONTAINED_WRAPPER - xf86DisableIO(); - #endif -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno)); -+ exit(255); -+ } - #if !defined(SELF_CONTAINED_WRAPPER) - /* set stdin, stdout to the consoleFD, and leave stderr alone */ - for (i = 0; i < 2; i++) -Index: xc/programs/Xserver/hw/xfree86/parser/write.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/parser/write.c,v -retrieving revision 1.2 -diff -u -r1.2 write.c ---- xc/programs/Xserver/hw/xfree86/parser/write.c 31 Jul 2004 09:14:06 -0000 1.2 -+++ xc/programs/Xserver/hw/xfree86/parser/write.c 19 Jun 2006 20:15:26 -0000 -@@ -166,7 +166,10 @@ - strerror(errno)); - return 0; - case 0: /* child */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) -+ FatalError("xf86writeConfigFile(): " -+ "setuid failed(%s)\n", -+ strerror(errno)); - ret = doWriteConfigFile(filename, cptr); - exit(ret); - break; -Index: xc/programs/Xserver/os/utils.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/os/utils.c,v -retrieving revision 1.6.2.3 -diff -u -r1.6.2.3 utils.c ---- xc/programs/Xserver/os/utils.c 8 Dec 2004 06:34:31 -0000 1.6.2.3 -+++ xc/programs/Xserver/os/utils.c 19 Jun 2006 20:15:26 -0000 -@@ -1,4 +1,4 @@ --/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.6.2.3 2004/12/08 06:34:31 gisburn Exp $ */ -+/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.21 2005/11/08 06:33:30 jkj Exp $ */ - /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ - /* - -@@ -1707,8 +1707,10 @@ - case -1: /* error */ - p = -1; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - execl("/bin/sh", "sh", "-c", command, (char *)NULL); - _exit(127); - default: /* parent */ -@@ -1759,8 +1761,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ -@@ -1834,8 +1838,10 @@ - xfree(cur); - return NULL; - case 0: /* child */ -- setgid(getgid()); -- setuid(getuid()); -+ if (setgid(getgid()) == -1) -+ _exit(127); -+ if (setuid(getuid()) == -1) -+ _exit(127); - if (*type == 'r') { - if (pdes[1] != 1) { - /* stdout */ -Index: xc/programs/xdm/session.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xdm/session.c,v -retrieving revision 1.2 -diff -u -r1.2 session.c ---- xc/programs/xdm/session.c 23 Apr 2004 19:54:42 -0000 1.2 -+++ xc/programs/xdm/session.c 19 Jun 2006 20:15:26 -0000 -@@ -1,4 +1,4 @@ --/* $XdotOrg: xc/programs/xdm/session.c,v 1.2 2004/04/23 19:54:42 eich Exp $ */ -+/* $XdotOrg: xc/programs/xdm/session.c,v 1.3 2005/11/08 06:33:31 jkj Exp $ */ - /* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */ - /* - -@@ -484,8 +484,14 @@ - else - ResetServer (d); - if (removeAuth) { -- setgid (verify.gid); -- setuid (verify.uid); -+ if (setgid (verify.gid) == -1) { -+ LogError( "SessionExit: setgid: %s\n", strerror(errno)); -+ exit(status); -+ } -+ if (setuid (verify.uid) == -1) { -+ LogError( "SessionExit: setuid: %s\n", strerror(errno)); -+ exit(status); -+ } - RemoveUserAuthorization (d, &verify); - #ifdef K5AUTH - /* do like "kdestroy" program */ -Index: xc/programs/xdm/xdmshell.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xdm/xdmshell.c,v -retrieving revision 1.2 -diff -u -r1.2 xdmshell.c ---- xc/programs/xdm/xdmshell.c 23 Apr 2004 19:54:42 -0000 1.2 -+++ xc/programs/xdm/xdmshell.c 19 Jun 2006 20:15:26 -0000 -@@ -179,7 +179,11 @@ - #endif - - /* make xdm run in a non-setuid environment */ -- setuid (geteuid()); -+ if (setuid (geteuid()) == -1) { -+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n", -+ ProgramName, errno, strerror(errno)); -+ exit(1); -+ } - - /* - * exec /usr/bin/X11/xdm -nodaemon -udpPort 0 -Index: xc/programs/xf86dga/dga.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xf86dga/dga.c,v -retrieving revision 1.2 -diff -u -r1.2 dga.c ---- xc/programs/xf86dga/dga.c 23 Apr 2004 19:54:47 -0000 1.2 -+++ xc/programs/xf86dga/dga.c 19 Jun 2006 20:15:27 -0000 -@@ -16,6 +16,7 @@ - #include <X11/Xmd.h> - #include <X11/extensions/xf86dga.h> - #include <ctype.h> -+#include <errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <signal.h> -@@ -141,7 +142,10 @@ - - #ifndef __UNIXOS2__ - /* Give up root privs */ -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ fprintf(stderr, "Unable to change uid: %s\n", strerror(errno)); -+ exit(2); -+ } - #endif - - XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0); -Index: xc/programs/xinit/xinit.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xinit/xinit.c,v -retrieving revision 1.2 -diff -u -r1.2 xinit.c ---- xc/programs/xinit/xinit.c 23 Apr 2004 19:54:49 -0000 1.2 -+++ xc/programs/xinit/xinit.c 19 Jun 2006 20:15:27 -0000 -@@ -678,7 +678,10 @@ - startClient(char *client[]) - { - if ((clientpid = vfork()) == 0) { -- setuid(getuid()); -+ if (setuid(getuid()) == -1) { -+ Error("cannot change uid: %s\n", strerror(errno)); -+ _exit(ERR_EXIT); -+ } - setpgrp(0, getpid()); - environ = newenviron; - #ifdef __UNIXOS2__ -Index: xc/programs/xload/xload.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xload/xload.c,v -retrieving revision 1.2 -diff -u -r1.2 xload.c ---- xc/programs/xload/xload.c 23 Apr 2004 19:54:57 -0000 1.2 -+++ xc/programs/xload/xload.c 19 Jun 2006 20:15:27 -0000 -@@ -34,7 +34,7 @@ - * xload - display system load average in a window - */ - -- -+#include <errno.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -162,8 +162,17 @@ - /* For security reasons, we reset our uid/gid after doing the necessary - system initialization and before calling any X routines. */ - InitLoadPoint(); -- setgid(getgid()); /* reset gid first while still (maybe) root */ -- setuid(getuid()); -+ /* reset gid first while still (maybe) root */ -+ if (setgid(getgid()) == -1) { -+ fprintf(stderr, "%s: setgid failed: %s\n", -+ ProgramName, strerror(errno)); -+ exit(1); -+ } -+ if (setuid(getuid()) == -1) { -+ fprintf(stderr, "%s: setuid failed: %s\n", -+ ProgramName, strerror(errno)); -+ exit(1); -+ } - - XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); - -Index: xc/programs/xterm/main.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/main.c,v -retrieving revision 1.4.2.1 -diff -u -r1.4.2.1 main.c ---- xc/programs/xterm/main.c 12 Jan 2005 21:45:10 -0000 1.4.2.1 -+++ xc/programs/xterm/main.c 19 Jun 2006 20:15:28 -0000 -@@ -2789,8 +2789,10 @@ - #ifdef USE_PTY_DEVICE - set_pty_id(ptydev, passedPty); - #endif -- setgid(screen->gid); -- setuid(screen->uid); -+ if (setgid(screen->gid) == -1) -+ SysError(ERROR_SETUID); -+ if (setuid(screen->uid) == -1) -+ SysError(ERROR_SETUID); - } else { - Bool tty_got_hung; - -Index: xc/programs/xterm/misc.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/misc.c,v -retrieving revision 1.3.2.1 -diff -u -r1.3.2.1 misc.c ---- xc/programs/xterm/misc.c 12 Jan 2005 21:45:10 -0000 1.3.2.1 -+++ xc/programs/xterm/misc.c 19 Jun 2006 20:15:28 -0000 -@@ -1045,8 +1045,10 @@ - pid = fork(); - switch (pid) { - case 0: /* child */ -- setgid(gid); -- setuid(uid); -+ if (setgid(gid) == -1) -+ _exit(ERROR_SETUID); -+ if (setuid(uid) == -1) -+ _exit(ERROR_SETUID); - fd = open(pathname, - O_WRONLY | O_CREAT | (append ? O_APPEND : O_EXCL), - mode); -@@ -1212,8 +1214,10 @@ - signal(SIGCHLD, SIG_DFL); - - /* (this is redundant) */ -- setgid(screen->gid); -- setuid(screen->uid); -+ if (setgid(screen->gid) == -1) -+ exit(ERROR_SETUID); -+ if (setuid(screen->uid) == -1) -+ exit(ERROR_SETUID); - - execl(shell, shell, "-c", &screen->logfile[1], (void *) 0); - -Index: xc/programs/xterm/print.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/xterm/print.c,v -retrieving revision 1.3.2.1 -diff -u -r1.3.2.1 print.c ---- xc/programs/xterm/print.c 12 Jan 2005 21:45:10 -0000 1.3.2.1 -+++ xc/programs/xterm/print.c 19 Jun 2006 20:15:28 -0000 -@@ -381,9 +381,11 @@ - dup2(fileno(stderr), 2); - close(fileno(stderr)); - } -- -- setgid(screen->gid); /* don't want privileges! */ -- setuid(screen->uid); -+ /* don't want privileges! */ -+ if (setgid(screen->gid) == -1) -+ exit(2); -+ if (setuid(screen->uid) == -1) -+ exit(2); - - Printer = popen(screen->printer_command, "w"); - input = fdopen(my_pipe[0], "r"); diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml deleted file mode 100644 index 26b7e00..0000000 --- a/x11-base/xorg-x11/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -<longdescription>X11 implementation by X.Org Foundation</longdescription> -</pkgmetadata> diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild deleted file mode 100644 index a11cc9a..0000000 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild +++ /dev/null @@ -1,2140 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild,v 1.13 2006/09/12 20:47:40 dberkholz Exp $ - -# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory -# voodoo3 cards. - -# Libraries which are now supplied in shared form that were not in the past -# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so, -# libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so, -# libxkbfile.so, libxkbui.so - -# TODO -# 1 June 2005 <spyderous@gentoo.org> -# TARGET: none -# Consider building shared libraries only, when both are provided -# Combine find loops for "Creating fonts.scale files," "Generating -# fonts.dir files and "Generating Xft cache" -# <Mr_Bones_> the loop in pkg_postinst for removing Compose can probably -# be one line of bash expansion like rm -f ${ROOT}/usr/$(get_libdir)/ -# X11/locale/{ja*|ko*|zh*}/Compose -# Clean up migration function -# - loop through lib* instead of repetition -# Fix direction of lib -> libdir symlink -# Generalize any functions that make sense to generalize (i.e., anything -# that might realistically see use elsewhere, or repetitively here) -inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib - - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) -IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server - insecure-drivers ipv6 minimal mmx nls nocxx opengl pam sdk sse static - truetype-fonts type1-fonts uclibc xprint xv - GAPING_SECURITY_HOLE" -# IUSE_INPUT_DEVICES="synaptics wacom" - -FILES_VER="0.8" -PATCH_VER="0.1.13" -XCUR_VER="0.3.1" -XFSFT_ENC_VER="0.1" - -S=${WORKDIR}/xc - -HOMEPAGE="http://xorg.freedesktop.org/" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~joshuabaergen/distfiles/${P}-patches-${PATCH_VER}.tar.bz2 - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" - -GENTOO_FILES="http://dev.gentoo.org/~seemant/distfiles/${P}-files-${FILES_VER}.tar.bz2 - mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2" - -SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 ) - font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 ) - !minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 ) - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - ${GENTOO_FILES} - ${X_PATCHES} - http://xorg.freedesktop.org/X11R${PV}/src-single/X11R${PV}-src.tar.bz2" -# http://xorg.freedesktop.org/X11R${PV}/src/X11R${PV}-src1.tar.gz -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src2.tar.gz -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src3.tar.gz -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src4.tar.gz -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src5.tar.gz -# doc? ( -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src6.tar.gz -# http://xorg.freedesktop.org/X11R${PV}/src//X11R${PV}-src7.tar.gz -# )" - -LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 - bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor - nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 - MIT SGI-B BSD || ( FTL GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86" - -DEPEND=">=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - sys-apps/groff - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-2.1.8 - >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.2.0 ) - !nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 ) - >=sys-apps/sed-4 - userland_GNU? ( sys-apps/util-linux ) - dev-lang/perl - media-libs/libpng - !<=app-emulation/emul-linux-x86-xlibs-1.2-r3" -# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence - -RDEPEND=" - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-2.1.8 - >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.2.0 ) - !nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 ) - media-libs/libpng - >=sys-libs/ncurses-5.1 - !<=app-emulation/emul-linux-x86-xlibs-1.2-r3 - !app-doc/opengl-manpages - !app-doc/xorg-docs - !app-doc/xorg-sgml-doctools - !media-fonts/encodings - !media-fonts/font-adobe-100dpi - !media-fonts/font-adobe-75dpi - !media-fonts/font-adobe-utopia-100dpi - !media-fonts/font-adobe-utopia-75dpi - !media-fonts/font-adobe-utopia-type1 - !media-fonts/font-alias - !media-fonts/font-arabic-misc - !media-fonts/font-bh-100dpi - !media-fonts/font-bh-75dpi - !media-fonts/font-bh-lucidatypewriter-100dpi - !media-fonts/font-bh-lucidatypewriter-75dpi - !media-fonts/font-bh-ttf - !media-fonts/font-bh-type1 - !media-fonts/font-bitstream-100dpi - !media-fonts/font-bitstream-75dpi - !media-fonts/font-bitstream-speedo - !media-fonts/font-bitstream-type1 - !media-fonts/font-cronyx-cyrillic - !media-fonts/font-cursor-misc - !media-fonts/font-daewoo-misc - !media-fonts/font-dec-misc - !media-fonts/font-ibm-type1 - !media-fonts/font-isas-misc - !media-fonts/font-jis-misc - !media-fonts/font-micro-misc - !media-fonts/font-misc-cyrillic - !media-fonts/font-misc-ethiopic - !media-fonts/font-misc-meltho - !media-fonts/font-misc-misc - !media-fonts/font-mutt-misc - !media-fonts/font-schumacher-misc - !media-fonts/font-screen-cyrillic - !media-fonts/font-sony-misc - !media-fonts/font-sun-misc - !media-fonts/font-util - !media-fonts/font-winitzki-cyrillic - !media-fonts/font-xfree86-type1 - !media-libs/mesa - !x11-apps/appres - !x11-apps/bdftopcf - !x11-apps/beforelight - !x11-apps/bitmap - !x11-apps/editres - !x11-apps/fonttosfnt - !x11-apps/fslsfonts - !x11-apps/fstobdf - !x11-apps/iceauth - !x11-apps/ico - !x11-apps/lbxproxy - !x11-apps/listres - !x11-apps/luit - !x11-apps/mesa-progs - !x11-apps/mkcfm - !x11-apps/mkfontdir - !x11-apps/mkfontscale - !x11-apps/oclock - !x11-apps/proxymngr - !x11-apps/rgb - !x11-apps/rstart - !x11-apps/scripts - !x11-apps/sessreg - !x11-apps/setxkbmap - !x11-apps/showfont - !x11-apps/smproxy - !x11-wm/twm - !x11-apps/viewres - !x11-apps/x11perf - !x11-apps/xauth - !x11-apps/xbiff - !x11-apps/xcalc - !x11-apps/xclipboard - !x11-apps/xclock - !x11-apps/xcmsdb - !x11-apps/xconsole - !x11-apps/xcursorgen - !x11-apps/xdbedizzy - !x11-apps/xditview - !x11-apps/xdm - !x11-apps/xdpyinfo - !x11-apps/xdriinfo - !x11-apps/xedit - !x11-apps/xev - !x11-apps/xeyes - !x11-apps/xf86dga - !x11-apps/xfd - !x11-apps/xfindproxy - !x11-apps/xfontsel - !x11-apps/xfs - !x11-apps/xfsinfo - !x11-apps/xfwp - !x11-apps/xgamma - !x11-apps/xgc - !x11-apps/xhost - !x11-apps/xinit - !x11-apps/xkbcomp - !x11-apps/xkbevd - !x11-apps/xkbprint - !x11-apps/xkbutils - !x11-apps/xkill - !x11-apps/xload - !x11-apps/xlogo - !x11-apps/xlsatoms - !x11-apps/xlsclients - !x11-apps/xlsfonts - !x11-apps/xmag - !x11-apps/xman - !x11-apps/xmessage - !x11-apps/xmh - !x11-apps/xmodmap - !x11-apps/xmore - !x11-apps/xphelloworld - !x11-apps/xplsprinters - !x11-apps/xpr - !x11-apps/xprehashprinterlist - !x11-apps/xprop - !x11-apps/xrandr - !x11-apps/xrdb - !x11-apps/xrefresh - !x11-apps/xrx - !x11-apps/xset - !x11-apps/xsetmode - !x11-apps/xsetpointer - !x11-apps/xsetroot - !x11-apps/xsm - !x11-apps/xstdcmap - !x11-apps/xtrap - !x11-apps/xvidtune - !x11-apps/xvinfo - !x11-apps/xwd - !x11-apps/xwininfo - !x11-apps/xwud - !x11-base/xorg-server - !x11-drivers/xf86-input-acecad - !x11-drivers/xf86-input-aiptek - !x11-drivers/xf86-input-calcomp - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-input-digitaledge - !x11-drivers/xf86-input-dmc - !x11-drivers/xf86-input-dynapro - !x11-drivers/xf86-input-elo2300 - !x11-drivers/xf86-input-elographics - !x11-drivers/xf86-input-evdev - !x11-drivers/xf86-input-fpit - !x11-drivers/xf86-input-hyperpen - !x11-drivers/xf86-input-jamstudio - !x11-drivers/xf86-input-joystick - !x11-drivers/xf86-input-keyboard - !x11-drivers/xf86-input-magellan - !x11-drivers/xf86-input-magictouch - !x11-drivers/xf86-input-microtouch - !x11-drivers/xf86-input-mouse - !x11-drivers/xf86-input-mutouch - !x11-drivers/xf86-input-palmax - !x11-drivers/xf86-input-penmount - !x11-drivers/xf86-input-spaceorb - !x11-drivers/xf86-input-summa - !x11-drivers/xf86-input-tek4957 - !x11-drivers/xf86-input-ur98 - !x11-drivers/xf86-input-vmmouse - !x11-drivers/xf86-input-void - !x11-drivers/xf86-video-apm - !x11-drivers/xf86-video-ark - !x11-drivers/xf86-video-ati - !x11-drivers/xf86-video-chips - !x11-drivers/xf86-video-cirrus - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-dummy - !x11-drivers/xf86-video-fbdev - !x11-drivers/xf86-video-glint - !x11-drivers/xf86-video-i128 - !x11-drivers/xf86-video-i740 - !x11-drivers/xf86-video-i810 - !x11-drivers/xf86-video-imstt - !x11-drivers/xf86-video-mga - !x11-drivers/xf86-video-neomagic - !x11-drivers/xf86-video-newport - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-nv - !x11-drivers/xf86-video-rendition - !x11-drivers/xf86-video-s3 - !x11-drivers/xf86-video-s3virge - !x11-drivers/xf86-video-savage - !x11-drivers/xf86-video-siliconmotion - !x11-drivers/xf86-video-sis - !x11-drivers/xf86-video-sisusb - !x11-drivers/xf86-video-sunbw2 - !x11-drivers/xf86-video-suncg14 - !x11-drivers/xf86-video-suncg3 - !x11-drivers/xf86-video-suncg6 - !x11-drivers/xf86-video-sunffb - !x11-drivers/xf86-video-sunleo - !x11-drivers/xf86-video-suntcx - !x11-drivers/xf86-video-tdfx - !x11-drivers/xf86-video-tga - !x11-drivers/xf86-video-trident - !x11-drivers/xf86-video-tseng - !x11-drivers/xf86-video-v4l - !x11-drivers/xf86-video-vesa - !x11-drivers/xf86-video-vga - !x11-drivers/xf86-video-via - !x11-drivers/xf86-video-vmware - !x11-drivers/xf86-video-voodoo - !x11-libs/libdmx - !x11-libs/libdrm - !x11-libs/libfontenc - !x11-libs/libFS - !x11-libs/libICE - !x11-libs/liblbxutil - !x11-libs/liboldX - !x11-libs/libSM - !x11-libs/libX11 - !x11-libs/libXau - !x11-libs/libXaw - !x11-libs/libXcomposite - !x11-libs/libXcursor - !x11-libs/libXdamage - !x11-libs/libXdmcp - !x11-libs/libXevie - !x11-libs/libXext - !x11-libs/libXfixes - !x11-libs/libXfont - !x11-libs/libXfontcache - !x11-libs/libXft - !x11-libs/libXi - !x11-libs/libXinerama - !x11-libs/libxkbfile - !x11-libs/libxkbui - !x11-libs/libXmu - !x11-libs/libXp - !x11-libs/libXpm - !x11-libs/libXprintAppUtil - !x11-libs/libXprintUtil - !x11-libs/libXrandr - !x11-libs/libXrender - !x11-libs/libXres - !x11-libs/libXScrnSaver - !x11-libs/libXt - !x11-libs/libXTrap - !x11-libs/libXtst - !x11-libs/libXv - !x11-libs/libXvMC - !x11-libs/libXxf86dga - !x11-libs/libXxf86misc - !x11-libs/libXxf86vm - !x11-libs/xtrans - !x11-misc/gccmakedep - !x11-misc/imake - !x11-misc/lndir - !x11-misc/makedepend - !x11-misc/util-macros - !x11-misc/xbitmaps - !x11-misc/xkbdata - !x11-misc/xkeyboard-config - !x11-misc/xorg-cf-files - !x11-proto/bigreqsproto - !x11-proto/compositeproto - !x11-proto/damageproto - !x11-proto/dmxproto - !x11-proto/evieext - !x11-proto/fixesproto - !x11-proto/fontcacheproto - !x11-proto/fontsproto - !x11-proto/glproto - !x11-proto/inputproto - !x11-proto/kbproto - !x11-proto/printproto - !x11-proto/randrproto - !x11-proto/recordproto - !x11-proto/renderproto - !x11-proto/resourceproto - !x11-proto/scrnsaverproto - !x11-proto/trapproto - !x11-proto/videoproto - !x11-proto/xcmiscproto - !x11-proto/xextproto - !x11-proto/xf86bigfontproto - !x11-proto/xf86dgaproto - !x11-proto/xf86driproto - !x11-proto/xf86miscproto - !x11-proto/xf86rushproto - !x11-proto/xf86vidmodeproto - !x11-proto/xineramaproto - !x11-proto/xproto - !x11-proto/xproxymanagementprotocol - !x11-themes/gentoo-xcursors - !x11-themes/xcursor-themes" - -PDEPEND="x86? ( - input_devices_synaptics? ( x11-drivers/synaptics ) - input_devices_wacom? ( x11-drivers/linuxwacom ) - ) - 3dfx? ( >=media-libs/glide-v3-3.10 ) - x11-terms/xterm" - -DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" - -pkg_setup() { - FILES_DIR="${WORKDIR}/files" - PATCHDIR="${WORKDIR}/patch" - EXCLUDED="${PATCHDIR}/excluded" - - if ! use GAPING_SECURITY_HOLE; then - local msg="Set USE=GAPING_SECURITY_HOLE to install." - eerror "$msg" - eerror "This package is subject to at least one local root vulnerability." - die "$msg" - fi - - # Set up CFLAG-related things - cflag_setup - - # See bug #35468, circular pam-X11 dep - check_pam - - # Look for invalid/dangerous USE flags and combinations - check_use_combos - - setup_multilib - - # xfs user - if use font-server; then - enewgroup xfs 33 - enewuser xfs 33 -1 /etc/X11/fs xfs - fi -} - -src_unpack() { - unpack_all - - patch_setup - - do_patch - - host_def_setup - - use_specific_hacks -} - -src_compile() { - build -} - -src_install() { - install_everything - - backward_compat_install - - fix_permissions - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - zap_host_def_cflags - - # EURO support - if ! use minimal; then - add_euro_support - fi - - setup_standard_symlinks - - if use opengl; then - fix_opengl_symlinks - fi - - libtool_archive_install - - compose_files_install - - if use font-server; then - encode_xfsft_files - fi - - if use nls; then - koi8_fonts_install - fi - - etc_files_install - - if use opengl; then - dynamic_libgl_install - fi - - fix_libtool_libdir_paths "$(find ${D} -name *.la)" - - cursor_install - - strip_execs - - if use minimal; then - minimal_install - fi - - # TEMPORARY hack: should be patched in, if it's not already - # For Battoussai's gatos stuffs: - if use sdk; then - insinto /usr/$(get_libdir)/Server/include - doins ${S}/extras/drm/shared/drm.h - fi - - xprint_install - - config_files_install -} - -pkg_preinst() { - # Do migration before anything else, so we do all the rest inside the - # symlink - - # Get rid of "standard" symlinks - # We can't overwrite symlink with directory w/ $(mv -f) - [ -L ${ROOT}usr/$(get_libdir)/X11 ] \ - && rm ${ROOT}usr/$(get_libdir)/X11 - [ -L ${ROOT}usr/include/X11 ] \ - && rm ${ROOT}usr/include/X11 - [ -L ${ROOT}usr/include/GL ] \ - && rm ${ROOT}usr/include/GL - [ -L ${ROOT}usr/bin/X11 ] \ - && rm ${ROOT}usr/bin/X11 - # Get rid of some apparent artifacts of migration - [ -L ${ROOT}usr/include/GL/GL ] \ - && rm ${ROOT}usr/include/GL/GL - [ -L ${ROOT}usr/include/X11/X11 ] \ - && rm ${ROOT}usr/include/X11/X11 - [ -d ${ROOT}usr/share/fonts/fonts ] \ - && rm -rf ${ROOT}usr/share/fonts/fonts - - # No need to do this, if it's already been done - # Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6 - # is a symlink. - if [ ! -L "/usr/X11R6" ]; then - # Migrate stuff in /usr/X11R6 to /usr - local DIR DIRS - DIRS="bin include lib" - if [ "lib" != "$(get_libdir)" ]; then - DIRS="${DIRS} $(get_libdir)" - fi - for DIR in ${DIRS}; do - migrate /usr/X11R6/${DIR} /usr/${DIR} - done - # Can't do this in the other loop because of different start and end - migrate /usr/X11R6/man /usr/share/man - fi - - update_config_files - - cleanup_fonts - - # See above comment for the same test - if [ ! -L "/usr/X11R6" ]; then - # Needs to happen after cleanup_fonts() - migrate /usr/X11R6/$(get_libdir)/X11/fonts /usr/share/fonts - - # Get rid of symlinks so we can migrate /usr/X11R6 without dying when a - # symlink tries to copy to a dir - einfo "Preparing for /usr/X11R6 -> /usr migration..." - local LINK LINKS - LINKS="bin include lib man share/info" - if [ "lib" != "$(get_libdir)" ]; then - LINKS="${LINKS} $(get_libdir)" - fi - for LINK in ${LINKS}; do - if [ -L "${ROOT}/usr/X11R6/${LINK}" ]; then - rm -fv ${ROOT}/usr/X11R6/${LINK} - fi - done - einfo "Remaining symlinks in /usr/X11R6:" - find ${ROOT}/usr/X11R6/ -type l - - # Woohoo, nothing in /usr/X11R6 after this - migrate /usr/X11R6 /usr - fi - - move_app_defaults_to_etc - - move_xkb_to_usr - - # Run this even for USE=-opengl, to clean out old stuff from possible - # USE=opengl build - dynamic_libgl_preinst -} - -pkg_postinst() { - env-update - - if [ "${ROOT}" = "/" ]; then - font_setup - - if use opengl; then - switch_opengl_implem - fi - fi - - remove_old_compose_files - - setup_tmp_files - - print_info -} - -pkg_postrm() { - fix_links -} - -############### -# pkg_setup() # -############### - -cflag_setup() { - # Set up CFLAGS - filter-flags "-funroll-loops" - - ALLOWED_FLAGS="-fstack-protector -march -mcpu -mtune -O -O0 -O1 -O2 -O3 -Os" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -pipe -fomit-frame-pointer" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -momit-leaf-frame-pointer" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" - # arch-specific section added by popular demand - case "${ARCH}" in - mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" - ;; - # -fomit-frame-pointer known to break things and is pointless - # according to ciaranm - # And hardened compiler must be softened. -- fmccor, 20.viii.04 - sparc) filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" - if has_hardened && ! use dlloader; then - einfo "Softening gcc for sparc." - ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE" - append-flags -fno-pie -fno-PIE - fi - - if [[ ${ABI} == "sparc64" ]]; then - ALLOWED_FLAGS="${ALLOWED_FLAGS} -D__sparc_v9__ -D__linux_sparc_64__" - append-flags -D__sparc_v9__ -D__linux_sparc_64__ - fi - ;; - # gcc-3.3.2 causes invalid insn error - hppa ) replace-cpu-flags 2.0 1.0 - ;; - esac - - # Recently there has been a lot of stability problem in Gentoo-land. Many - # things can be the cause to this, but I believe that it is due to gcc3 - # still having issues with optimizations, or with it not filtering bad - # combinations (protecting the user maybe from themselves) yet. - # - # This can clearly be seen in large builds like glibc, where too aggressive - # CFLAGS cause the tests to fail miserbly. - # - # Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion - # knows what he is talking about: - # - # People really shouldn't force code-specific options on... It's a - # bad idea. The -march options aren't just to look pretty. They enable - # options that are sensible (and include sse,mmx,3dnow when appropriate). - # - # The next command strips CFLAGS and CXXFLAGS from nearly all flags. If - # you do not like it, comment it, but do not bugreport if you run into - # problems. - # - # <azarah@gentoo.org> (13 Oct 2002) - strip-flags -} - -check_pam() { - if use pam && has_version x11-base/${PN}; then - einfo "Previous ${PN} installation detected." - einfo "Enabling PAM features in ${PN}." - else - einfo "Previous ${PN} installation NOT detected." - einfo "Disabling PAM features in ${PN}." - einfo "You must remerge ${PN} to enable pam." - einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468." - fi -} - -check_use_combos() { - if use static; then - # A static build disallows building the SDK. - # See config/xf86.rules. - if use sdk; then - die "The static USE flag is incompatible with the sdk USE flag." - fi - fi - - if use dmx && use doc; then - die "The dmx and doc USE flags are temporarily incompatible and result in a dead build." - fi - - # (#77949) - if use minimal && use doc; then - die "The minimal and doc USE flags are temporarily incompatible and result in a dead build." - fi - - if use xv && ! use opengl; then - eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996" - eerror "The xv USE flag currently requires the opengl flag." - die "This is a known bug. Do not report it." - fi - - if use opengl && ! use xv; then - eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936" - eerror "The opengl USE flag currently requires the xv flag." - die "This is a known bug. Do not report it." - fi - - # Echo a message to the user about bitmap-fonts - if ! use bitmap-fonts; then - ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable" - ewarn "75dpi and 100dpi fonts. Your GTK+-1.2 fonts may look" - ewarn "screwy otherwise" - - ebeep 5 - epause 10 - fi -} - -setup_multilib() { - # on amd64 we need /usr/lib64/X11/locale/lib to be a symlink - # created by the emul lib ebuild in order for adobe acrobat, staroffice, - # and a few other apps to work. - if ! has_multilib_profile; then - use amd64 && get_libdir_override lib64 - fi -} - -################ -# src_unpack() # -################ - -unpack_all() { - # Unpack source and patches - ebegin "Unpacking ${PV} source" - unpack X11R${PV}-src.tar.bz2 > /dev/null -# unpack X11R${PV}-src{1,2,3,4,5}.tar.gz > /dev/null - eend 0 - -# if use doc; then -# ebegin "Unpacking documentation" -# unpack X11R${PV}-src{6,7}.tar.gz > /dev/null -# eend 0 -# fi - - ebegin "Unpacking Gentoo files and patches" - unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null - unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null - eend 0 - - if ! use minimal; then - # Unpack TaD's gentoo cursors - ebegin "Unpacking Gentoo cursors" - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null - eend 0 - fi - - # Unpack extra fonts stuff from Mandrake - ebegin "Unpacking fonts" - if use nls; then - unpack gemini-koi8-u.tar.bz2 > /dev/null - fi - if ! use minimal; then - unpack eurofonts-X11.tar.bz2 > /dev/null - fi - if use font-server; then - unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null - fi - eend 0 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc -} - -do_patch() { - # Bulk patching - based on patch name - # Will create excluded stuff once it's needed - cd ${WORKDIR} - EPATCH_SUFFIX="patch" \ - epatch ${PATCHDIR} - cd ${S} - - # Security patches - epatch ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch - epatch ${FILESDIR}/xorg-68x-setuid.patch -} - -host_def_setup() { - HOSTCONF="config/cf/host.def" - - ebegin "Setting up ${HOSTCONF}" - cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \ - || die "host.def copy failed" - echo "#define XVendorString \"Gentoo (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \ - >> ${HOSTCONF} - - # Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and - # http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600 - # - # Makes ld bail at link time on undefined symbols - # Suggested by Mike Harris <mharris@redhat.com> - #echo "#define SharedLibraryLoadFlags -shared -Wl,-z,defs" \ - # >> ${HOSTCONF} - - # Enable i810 on x86_64 (RH #126687) - if use amd64; then - echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF} - fi - - # FHS install locations - echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF} - echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF} - echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF} - echo "#define BinDir /usr/bin" >> ${HOSTCONF} - echo "#define IncRoot /usr/include" >> ${HOSTCONF} - # This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR) - # See xc/include/Imakefile - echo "#define LinkGLToUsrInclude NO" >> ${HOSTCONF} - # /usr/X11R6/lib/X11 - echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF} - # /usr/X11R6/lib with exception of /usr/X11R6/lib/X11 - echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF} - - # Make man4 and man7 stuff get 'x' suffix like everything else - # Necessary so we can install to /usr/share/man without overwriting - echo "#define DriverManDir \$(MANSOURCEPATH)4" >> ${HOSTCONF} - echo "#define DriverManSuffix 4x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - echo "#define MiscManDir \$(MANSOURCEPATH)7" >> ${HOSTCONF} - echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - - # Don't build xterm -- use external (#54051) - echo "#define BuildXterm NO" >> ${HOSTCONF} - - # Xwrapper has been removed so we now need to use the set uid server - # again, this mustve happened somewhere after 4.3.0 in the development. - echo "#define InstallXserverSetUID YES" >> ${HOSTCONF} - echo "#define BuildServersOnly NO" >> ${HOSTCONF} - - # Don't use /lib64 if $(get_libdir) != lib64 - # Replaces 0181_all_4.3.0-amd64-nolib64.patch - if [ "$(get_libdir)" == "lib64" ]; then - echo "#define HaveLib64 YES" >> ${HOSTCONF} - sed -i '/^#define Freetype2LibDir/s:^.*$:#define Freetype2LibDir /usr/lib64:' ${HOSTCONF} - else - echo "#define HaveLib64 NO" >> ${HOSTCONF} - fi - - # Set location of DRM source to be installed - echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> ${HOSTCONF} - - if [ "$(gcc-major-version)" -eq "3" ]; then - if use x86; then - # Should fix bug #4189. gcc 3.x have problems with - # -march=pentium4 and -march=athlon-tbird - # Seems fixed on 3.3 and higher - if [ "$(gcc-minor-version)" -le "2" ]; then - replace-cpu-flags pentium4 pentium3 - replace-cpu-flags athlon athlon-tbird - fi - - if [ "$(gcc-minor-version)" -eq "4" ]; then - if [ "$(gcc-micro-version)" -lt "4" ]; then - #to fix #57602 for now, thanks Spanky (broken sse2) - if test_flag -mno-sse2; then - append-flags -mno-sse2 - fi - # (#75067) broken sse3 - if test_flag -mno-sse3; then - append-flags -mno-sse3 - fi - fi - fi - - # Try a fix for #49310, see #50931 for more info. <spyderous> - if [ "$(is-flag -fomit-frame-pointer)" ]; then - replace-cpu-flags k6 k6-2 k6-3 i586 - fi - fi - - # Without this, modules breaks with gcc3 - if [ "$(gcc-minor-version)" -eq "1" ]; then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - - if [ "$(gcc-minor-version)" -eq "2" ]; then - if [ "$(gcc-micro-version)" -lt "2" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - elif [ "$(gcc-minor-version)" -lt "2" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - elif [ "$(gcc-major-version)" -lt "3" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} - - if use static; then - echo "#define DoLoadableServer NO" >>${HOSTCONF} - else - einfo "Setting DoLoadableServer to YES." - echo "#define DoLoadableServer YES" >> ${HOSTCONF} - - if use dlloader; then - einfo "Setting MakeDllModules to YES." - echo "#define MakeDllModules YES" >> ${HOSTCONF} - if has_hardened; then - echo "#define HardenedGccSpecs YES" >> ${HOSTCONF} - fi - else - einfo "Setting MakeDllModules to NO." - echo "#define MakeDllModules NO" >> ${HOSTCONF} - fi - fi - - use_build debug XFree86Devel - use_build debug BuildDebug - use_build debug DebuggableLibraries - - if ! use debug; then - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> ${HOSTCONF} - fi - - # Remove circular dep between pam and X11, bug #35468 - # If pam is in USE and we have X11, then we can enable PAM -# if use pam && has_version x11-base/xorg-x11 - if has_version x11-base/xorg-x11; then - # If you want to have optional pam support, do it properly ... - use_build pam HasPam - use_build pam HasPamMisc - fi - - if use x86 || use alpha; then - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx; then - echo "#define HasGlide3 YES" >> ${HOSTCONF} - fi -# This won't work unless we can disable building the tdfx stuff -# entirely :/ -# use_build 3dfx HasGlide3 - fi - - if use x86; then - # optimize Mesa for architecture - use_build mmx HasMMXSupport - use_build 3dnow Has3DNowSupport - use_build sse HasSSESupport - fi - - # optimize Mesa for architecture - if use amd64; then - use_build amd64 HasMMXSupport - use_build amd64 Has3DNowSupport - use_build amd64 HasSSESupport - fi - - # Do we want the glx extension? This will turn off XF86DRI if it's off. - # DRI can't build if glx isn't built, so keep this below DRI define. - # Do this before hppa so they can turn DRI off - use_build opengl BuildGlxExt - use_build opengl BuildGLXLibrary - use_build opengl BuildXF86DRI - # Needs GL headers - use_build opengl BuildGLULibrary - - - - if use mips; then - echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF} - fi - - # Make xv optional for more minimal builds - use_build xv BuildXvLibrary - use_build xv BuildXvExt - # Depends on X11/extensions/Xv.h - use_build xv BuildXF86RushExt - use_build xv BuildXF86RushLibrary - - if use hppa; then - echo "#define DoLoadableServer NO" >> ${HOSTCONF} - echo "#define BuildXF86DRI NO" >> config/cf/host.def - echo "#undef DriDrivers" >> config/cf/host.def - echo "#define XF86CardDrivers fbdev" >> config/cf/host.def - echo "#define BuildXvExt YES" >> config/cf/host.def - fi - - - if use alpha; then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint s3 vesa" >> ${HOSTCONF} - fi - - if use ppc; then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} - fi - - if use ppc64; then - echo "#define MakeDllModules YES" >> ${HOSTCONF} - echo "#define XF86VgaHw YES" >> ${HOSTCONF} - echo "#define XF86FBDevHw YES" >> ${HOSTCONF} - echo "#define XF86CardDrivers mga fbdev v4l ati vga nv" >> ${HOSTCONF} - fi - - if use sparc; then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> ${HOSTCONF} - if has_hardened && ! use dlloader; then - einfo "Softening the assembler so cfb modules will play nice with sunffb." - echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} - echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} - fi - if ( [ -e "${ROOT}/usr/src/linux" ] \ - && ! kernel_is "2" "6" ) \ - || [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then - # Commented out next two lines due to patch from bug #61940 - # Joshua Baergen, Sept 19, 2005 -# einfo "Building for kernels less than 2.6 requires special treatment." -# echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF} - einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx." - echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \ - programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c - fi - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> ${HOSTCONF} - echo "#define HasFontconfig YES" >> ${HOSTCONF} - - # Use the xorg Xft2 lib - echo "#define SharedLibXft YES" >> ${HOSTCONF} - - # with USE="X doc' circular dep w/ virtual/ghostscript - # echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF} - # Caused issues, basic docs aren't installed - use_build doc BuildLinuxDocPS - use_build doc BuildSpecsDocs - use_build doc BuildHtmlManPages - use_build doc InstallHardcopyDocs - - # enable Japanese docs, optionally - use doc && use_build cjk InstallJapaneseDocs - - # Native Language Support Fonts - use_build nls BuildCyrillicFonts - use_build nls BuildArabicFonts - use_build nls BuildGreekFonts - use_build nls BuildHebrewFonts - use_build nls BuildThaiFonts - - if use nls; then - use_build cjk BuildCIDFonts - use_build cjk BuildJapaneseFonts - use_build cjk BuildKoreanFonts - use_build cjk BuildChineseFonts - fi - - # Crappy bitmap fonts - use_build bitmap-fonts Build75DpiFonts - use_build bitmap-fonts Build100DpiFonts - - # Type1 fonts - use_build type1-fonts BuildType1Fonts - - # TrueType fonts - use_build truetype-fonts BuildTrueTypeFonts - - # X Font Server - use_build font-server BuildFontServer - - # Distributed Multiheaded X - use_build dmx BuildDmx - - use_build insecure-drivers BuildDevelDRIDrivers - - if use ipv6; then - # In case Gentoo ever works on a system with IPv6 sockets that don't - # also listen on IPv4 (see config/cf/X11.tmpl) - echo "#define PreferXdmcpIPv6 YES" >> ${HOSTCONF} - fi - - use_build ipv6 BuildIPv6 - - if use minimal; then - # Don't build static libs - echo "#define ForceNormalLib NO" >> ${HOSTCONF} - # Turn back on needed ones - echo "#define NormalLibXau YES" >> ${HOSTCONF} - - echo "#define BuildDPSLibraries NO" >> ${HOSTCONF} - echo "#define BuildClients NO" >> ${HOSTCONF} - # BuildClients doesn't catch things in xc/programs/Xserver - # Also had to add - # 9250_all_6.8.1.904-respect-xfree86configtools-setting.patch - echo "#define BuildXFree86ConfigTools NO" >> ${HOSTCONF} - echo "#define BuildLBX NO" >> ${HOSTCONF} - - # Weird crap we don't need - echo "#define XF8_32Wid NO" >> ${HOSTCONF} - echo "#define XF8_32Bpp NO" >> ${HOSTCONF} - echo "#define XF8_16Bpp NO" >> ${HOSTCONF} - echo "#define XF24_32Bpp NO" >> ${HOSTCONF} - - # Without nls, truetype-fonts, type1-fonts, we only build misc - # Now let's try to reduce what gets built in misc - # iso8859-1 has the "fixed" font - echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF} - # 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew - echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF} - # 11 is thai, 12 isn't in misc - echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF} - - echo "#define XnestServer NO" >> ${HOSTCONF} - echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF} - echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF} - - # If you want more drivers built with minimal, file a bug - # -Donnie Berkholz <spyderous@gentoo.org> - if use x86; then - # Remove glint, tga, s3, s3virge, rendition, neomagic, i740, - # cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion - # mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers - # (nsc, i810), ati, DevelDrivers, via - # Leave vmware driver for testing minimal setups using VMWare - # XF86OSCardDrivers includes v4l and fbdev on linux - # DevelDrivers includes imstt and newport on x86 - echo "#define XF86CardDrivers vmware vesa vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} - # (#93339) - elif use sparc; then - echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \ - sunleo" >> ${HOSTCONF} - fi - fi - - # Ajax is the man for getting this going for us - echo "#define ProPoliceSupport YES" >> ${HOSTCONF} - - # Make xprint optional - use_build xprint BuildXprint - use_build xprint BuildXprintClients - # Build libXp even when xprint is off. It's just for clients, server - if ! use xprint; then - echo "#define BuildXprintLib YES" >> ${HOSTCONF} - fi - - # End the host.def definitions here - eend 0 -} - -patch_setup() { - einfo "Excluding patches..." - - # This patch is just plain broken. Results in random failures. - patch_exclude 0120*parallel-make - - # Hardened patches (both broken) - patch_exclude 9960_all_4.3.0-exec-shield-GNU - patch_exclude 9961_all_4.3.0-libGL-exec-shield - - # Xbox nvidia driver, patch is a total hack, tears apart xc/config/cf - # (#68726). Only apply when necessary so we don't screw other stuff up. - # 9990 is the driver, 9991 is xbox pci scanning (potentially useful) - if [ ! "${PROFILE_ARCH}" = "xbox" ]; then - patch_exclude 9990 9991 - fi - - # this patch comments out the Xserver line in xdm's config - # We only want it here - if ! use s390; then - patch_exclude 7500 - fi - - # if ! use gatos; then - # patch_exclude 9841_all_4.3.0-gatos-mesa - # fi - - if use debug; then - patch_exclude 5901*acecad-debug - fi - - # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]; then - patch_exclude 5850 - else - patch_exclude 5851 - fi - - # Glibc-specific patches to exclude for non-glibc systems - if use elibc_FreeBSD || use elibc_OpenBSD; then - patch_exclude 0700 - fi - einfo "Done excluding patches." -} - -use_specific_hacks() { - # uclibc lacks sinf and cosf - if use uclibc; then - sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \ - ${S}/programs/Imakefile - fi - - # Get rid of cursor sets other than core and handhelds, saves ~4MB - if use minimal; then - sed -i -e 's:SUBDIRS = redglass whiteglass handhelds:SUBDIRS = handhelds:' \ - ${S}/programs/xcursorgen/Imakefile - fi - - cd ${S} - if use doc; then - # These are not included anymore as they are obsolete - local x - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}; do - if [ -f ${x} ]; then - sed -i '/Load[[:space:]]*"\(pex5\|xie\)"/d' ${x} - fi - done - fi -} - -################# -# src_compile() # -################# - -build() { - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal xorg Makefile variable and the - # xorg build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building xorg-x11..." - if use debug; then - chmod u+x ${S}/config/util/makeg.sh - FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \ - || die "debug make World failed" - else - FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "make World failed" - fi - - if use nls; then - emake -j1 -C ${S}/nls MAKE="make" || die "nls build failed" - fi -} - -################# -# src_install() # -################# - -install_everything() { - unset MAKE_OPTS - - einfo "Installing X.org X11..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "$(gcc-version)" != "2.95" ] && use x86; then - make install MAKE="make" DESTDIR=${D} \ - || make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install MAKE="make" DESTDIR=${D} || die "install failed" - else - make install MAKE="make" DESTDIR=${D} || die "install failed" - fi - - if use sdk; then - einfo "Installing X.org X11 SDK..." - make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed" - fi - - if ! use minimal; then - einfo "Installing man pages..." - make install.man MAKE="make" DESTDIR=${D} || die "man page install failed" - einfo "Compressing man pages..." - prepman /usr - fi - - if use nls; then - cd ${S}/nls - make MAKE="make" DESTDIR=${D} install || die "nls install failed" - fi - dodoc ${S}/RELNOTES -} - -backward_compat_install() { - # Backwards compatibility for /usr/share move - dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts - - # Have the top-level libdir symlink made first, so real dirs don't get created - local DIR DIRS - if [ "lib" != "$(get_libdir)" ]; then - DIRS="${DIRS} $(get_libdir)" - fi - for DIR in ${DIRS}; do - dosym ../${DIR} /usr/X11R6/${DIR} - done - - dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc -} - -fix_permissions() { - # Fix permissions on locale/common/*.so - local x - for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do - if [ -f ${x} ]; then - fperms 0755 ${x/${D}} - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/$(get_libdir)/modules -name '*.o' -o -name '*.so'); do - if [ -f ${x} ]; then - fperms 0755 ${x/${D}} - fi - done - - # Fix perms - if ! use minimal; then - fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/bin/dga - fi -} - -zap_host_def_cflags() { - ebegin "Fixing $(get_libdir)/X11/config/host.def" - cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/$(get_libdir)/X11/config/host.def \ - || eerror "Munging host.def failed" - # theoretically, /usr/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 -} - -add_euro_support() { - ebegin "Adding Euro support" - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-10x20-lat9.pcf.gz - eend 0 -} - -setup_standard_symlinks() { - # Standard symlinks - dodir /usr/{bin,include,$(get_libdir)} - dosym ../bin /usr/bin/X11 - # Stop complains about "file or directory not existing" - dodir /usr/X11R6 - dosym ../include /usr/X11R6/include - dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb - - # Some critical directories - if ! use minimal; then - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - fi - - # Backwards compat, FHS, etc. - dosym ../../usr/X11R6/bin/Xorg /etc/X11/X -} - -libtool_archive_install() { - if use opengl; then - # .la files for libtool support - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILES_DIR}/lib/*.la - fi -} - -fix_libtool_libdir_paths() { - local dirpath - for archive in ${*} ; do - dirpath=$(dirname ${archive} | sed -e "s:^${D}::") - [[ ${dirpath::1} == "/" ]] || dirpath="/"${dirpath} - sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':" - done -} - -compose_files_install() { - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - local x - for x in $(find ${D}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case $(basename ${x}) in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ]; then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ]; then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - local i - for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \ - || eerror "sed ${i} failed" - done -} - -encode_xfsft_files() { - # Yet more Mandrake - ebegin "Encoding files for xfsft font server" - dodir /usr/share/fonts/encodings - cp -pPR ${WORKDIR}/usr/share/fonts/encodings/* \ - ${D}/usr/share/fonts/encodings - - for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc; do - if [ -f "${x}" ]; then - gzip -9 -f ${x} \ - || eerror "gzipping ${x} failed" - fi - done - eend 0 -} - -koi8_fonts_install() { - ebegin "Adding gemini-koi8 fonts" - cd ${WORKDIR}/ukr - gunzip *.Z || eerror "gunzipping gemini-koi8 fonts failed" - gzip -9 *.pcf || eerror "gzipping gemini-koi8 fonts failed" - cd ${S} - cp -pPR ${WORKDIR}/ukr ${D}/usr/share/fonts \ - || eerror "copying gemini-koi8 fonts failed" - eend 0 -} - -etc_files_install() { - insinto /etc/X11 - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/xorg.conf xorg.conf.example - - exeinto /etc/X11 - # new session management script - doexe ${FILES_DIR}/chooser.sh - # new display manager script - doexe ${FILES_DIR}/startDM.sh - exeinto /etc/X11/Sessions - # doexe skips directories, so this should be safe - doexe ${FILES_DIR}/Sessions/* - insinto /etc/env.d - doins ${FILES_DIR}/10xorg - insinto /etc/X11/xinit - doins ${FILES_DIR}/xinitrc - if ! use minimal; then - exeinto /etc/X11/xdm - doexe ${FILES_DIR}/Xsession - exeinto /etc/init.d - newexe ${FILES_DIR}/xdm.start xdm - fi - if use font-server; then - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config - fi - if use pam; then - insinto /etc/pam.d - newins ${FILES_DIR}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILES_DIR}/xserver.pamd xserver - fi - if use font-server; then - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/xfs.conf.d xfs - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib - fi - done - for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/extensions - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glxtokens.h,glext.h,glxext.h,glxmd.h,glxproto.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/include - fi - done - eend 0 -} - -cursor_install() { - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/${PN}/default/index.theme - - if ! use minimal; then - install_extra_cursors - fi -} - -strip_execs() { - if use debug || has nostrip ${FEATURES}; then - ewarn "Debug build turned on by USE=debug or FEATURES=nostrip" - ewarn "NOT stripping binaries and libraries" - else - local STRIP - if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then - STRIP=${CHOST}-strip - else - STRIP=strip - fi - einfo "Stripping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - local x - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'); do - if [ -f ${x} ]; then - # Dont do the modules ... - if [ "${x/\/usr\/$(get_libdir)\/modules}" = "${x}" ]; then - echo "$(echo ${x/${D}})" - ${STRIP} ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \ - $(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do - if [ -f ${x} ]; then - echo "$(echo ${x/${D}})" - ${STRIP} --strip-debug ${x} || : - fi - done - fi -} - -install_extra_cursors() { - # Install TaD's gentoo cursors - insinto /usr/share/cursors/${PN}/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* -} - -minimal_install() { - # Get rid of all unnecessary fonts (saves ~5.5 MB) - find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \ - -not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \; - # Woohoo, another 772K - rm -rf ${D}/usr/share/doc -} - -xprint_install() { - # If we want xprint, save the init script before deleting /etc/rc.d/ - # Requested on #68316 - if use xprint; then - xprint_init_install - else - # delete xprint stuff - rm -f ${D}/etc/{init,profile}.d/xprint* - rmdir --ignore-fail-on-non-empty ${D}/etc/{init,profile}.d - fi - - # Remove the /etc/rc.d nonsense -- not everyone is RedHat - rm -rf ${D}/etc/rc.d -} - -xprint_init_install() { - # RH-style init script, we provide a wrapper - exeinto /usr/$(get_libdir)/misc - doexe ${D}/etc/init.d/xprint - rm -f ${D}/etc/init.d/xprint - # Install the wrapper - newinitd ${FILES_DIR}/xprint.init xprint - # patch profile scripts - sed -i -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint get_xpserverlist:g" ${D}/etc/profile.d/xprint* - # move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc ${D}/etc/profile.d/xprint* - rm -f ${D}/etc/profile.d/xprint* -} - -config_files_install() { - - # Fix default config files after installing fonts to /usr/share/fonts - sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - -e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - -e "s:/usr/$(get_libdir)/fonts:/usr/share/fonts:g" \ - ${D}/etc/X11/xorg.conf.example - if use font-server; then - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - ${D}/etc/X11/fs/config - fi - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find ${D}/usr/$(get_libdir) \ - -name libGL.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 -} - -################# -# pkg_preinst() # -################# - -# We need a symlink /usr/X11R6/dir -> /usr/dir so all the packages -# whose files we move don't lose track of them. As such, we need -# _absolutely nothing_ in /usr/X11R6/dir so we can make such a symlink. -# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004 -# -# Takes two arguments -- starting location and ending location -migrate() { - einfo "Migrating from ${1} to ${2}..." - - # Strip trailing slash - if [ -z "${1##*/}" ]; then - set -- ${1%/} ${2} - fi - - if [ -e ${ROOT}${1} ]; then - # If it's not a symlink (in other words, it should be a directory) - if [ ! -L ${ROOT}${1} ]; then - einfo " ${1} isn't a symlink, migrating..." - # Move everything - rsync \ - --archive \ - --update \ - --links \ - --hard-links \ - --ignore-existing \ - --stats \ - --progress \ - --verbose \ - ${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1 - - check_migrate_return - remove_migrated_files ${1} - - if [ -e "${ROOT}${1}" ]; then - # Remove any floating .keep files so we can run rmdir - find ${ROOT}${1} -name '\.keep' -exec rm -f {} \; - # Get rid of the directory - rmdir ${ROOT}${1} - fi - - make_symlinks ${1} - else - ewarn " ${1} is a symlink, not migrating" - fi - else - ewarn " ${1} doesn't exist, not migrating" - make_symlinks ${1} - fi -} - -check_migrate_return() { - MIGRATE_RETURN="$?" - if [ "${MIGRATE_RETURN}" -eq "0" ]; then - einfo "rsync successful!" - else - eerror "rsync failed." - eerror "Check for migrate-* files in ${T}." - die "rsync failed. Exit code: ${MIGRATE_RETURN}." - fi - - # Migration fubars lib symlinks -- eradicator - if use amd64; then - if [[ -L ${ROOT}usr/lib64 ]]; then - rm ${ROOT}usr/lib64 - ln -s lib ${ROOT}usr/lib64 - elif [[ -L ${ROOT}usr/lib ]]; then - rm -f ${ROOT}usr/lib - ln -s lib64 ${ROOT}usr/lib - elif [[ -L ${ROOT}usr/lib32 ]]; then - if has_multilib_profile; then - ln -s lib ${ROOT}usr/lib32 - else - ln -s ../emul/linux/x86/usr/lib ${ROOT}usr/lib32 - fi - fi - fi -} - -remove_migrated_files() { - # This is a copy instead of a move, so we need to get rid of what - # we copied. This is a little risky if it fails, so just do it on - # success. - - # DO NOT proceed if we don't have an argument, or we kill root filesystem - if [ -z "${1}" ]; then - die "No argument to remove_migrated_files(). Want to `rm -rf ${ROOT}`?" - fi - - if [ "${MIGRATE_RETURN}" -eq "0" ]; then -# rm -rfv ${ROOT}${1} > ${T}/migrate-remove-${1//\//-}.log 2>&1 - rm -rfv ${ROOT}${1} - fi -} - -make_symlinks() { - # Put a symlink in its place - - # Special case: lib != libdir - if [ "${1##*/}" = "$(get_libdir)" -a "$(get_libdir)" != "lib" ]; then - einfo " Symlinking ${ROOT}usr/X11R6/lib -> $(get_libdir)" - ln -s $(get_libdir) ${ROOT}usr/X11R6/lib - # Special case: fonts - elif [ "${1##*/}" = "fonts" ]; then - einfo " Symlinking ${ROOT}${1} -> ../../share/fonts" - ln -s ../../share/fonts ${ROOT}${1} - # Special case: X11R6 - elif [ "${1##*/}" = "X11R6" ]; then - einfo " Symlinking ${ROOT}${1} -> ../usr" - ln -s ../usr ${ROOT}${1} - else - einfo " Symlinking ${ROOT}${1} -> ../${1##*/}" - ln -s ../${1##*/} ${ROOT}${1} - fi -} - -update_config_files() { - # Fix any installed config files for installing fonts to /usr/share/fonts - # This *needs* to be after all other installation so files aren't - # overwritten. - - if [ "${ROOT}" = "/" ]; then - einfo "Preparing any installed configuration files for font move..." - FILES="/etc/X11/xorg.conf - /etc/X11/XF86Config-4 - /etc/X11/XF86Config" - if use font-server; then - FILES="${FILES} /etc/X11/fs/config" - fi - # /etc/fonts/fonts.conf - # /etc/fonts/local.conf - - local FILE - for FILE in ${FILES}; do - if [ -e ${FILE} ]; then - # New font paths - sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \ - ${ROOT}${FILE} > ${IMAGE}${FILE} - - if [ "${FILE}" = "/etc/X11/xorg.conf" ] \ - || [ "${FILE}" = "/etc/X11/XF86Config" ] \ - || [ "${FILE}" = "/etc/X11/XF86Config-4" ]; then - # "keyboard" driver is deprecated and will be removed, - # switch to "kbd" - sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \ - ${IMAGE}${FILE} - - # This moved in the /usr/X11R6/libdir -> /usr/libdir change - sed -i \ - -e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/$(get_libdir)/X11/rgb"~\1"/usr/$(get_libdir)/X11/rgb"~' \ - -e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/lib/X11/rgb"~\1"/usr/lib/X11/rgb"~' \ - ${IMAGE}${FILE} - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*\"XkbRules\".*$::g" \ - ${IMAGE}${FILE} - fi - fi - done - fi -} - -cleanup_fonts() { - local G_FONTDIRS - G_FONTDIRS="Speedo encodings local misc util" - if use truetype-fonts; then - G_FONTDIRS="${G_FONTDIRS} TTF" - fi - if use type1-fonts; then - G_FONTDIRS="${G_FONTDIRS} Type1" - fi - if use cjk; then - G_FONTDIRS="${G_FONTDIRS} CID" - fi - if use bitmap-fonts; then - G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi" - fi - if use nls; then - G_FONTDIRS="${G_FONTDIRS} cyrillic ukr" - fi - - for G_FONTDIR in ${G_FONTDIRS}; do - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - # Not Speedo or CID, as their fonts.scale files are "real" - if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then - find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ - -o -name 'encodings.dir' -exec rm -fv {} \; - fi - done - - # Get rid of deprecated directories so our symlinks in the same location - # work -- users shouldn't be placing fonts here so that should be fine, - # they should be using ~/.fonts or /usr/share/fonts. <spyderous> - remove_font_dirs -} - -remove_font_dirs() { - if [ -e ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then - if [ ! -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then - local G_FONTDIR - for G_FONTDIR in ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/*; do - if [ -L "${G_FONTDIR}" ]; then - einfo "Removing ${G_FONTDIR} symlink." - rm -rfv ${G_FONTDIR} - else - ewarn "${G_FONTDIR} not a symlink, moving to /usr/share/fonts" - if [ -d ${G_FONTDIR} ]; then - if [ ! -e /usr/share/fonts/${G_FONTDIR##*/} ]; then - einfo "Moving ${G_FONTDIR} to /usr/share/fonts/." - mv ${G_FONTDIR} /usr/share/fonts/ - else - ewarn "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again." - fi - else - ewarn "${G_FONTDIR} does not exist." - fi - fi - done - fi - else - ewarn "${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts does not exist." - fi -} - -move_app_defaults_to_etc() { - if [ -L ${ROOT}/etc/X11/app-defaults ]; then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/$(get_libdir)/app-defaults ] \ - && [ -d ${ROOT}/usr/$(get_libdir)/app-defaults ]; then - if [ ! -d ${ROOT}/etc/X11/app-defaults ]; then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/$(get_libdir)/app-defaults ${ROOT}/etc/X11 - fi -} - -move_xkb_to_usr() { - if [ -L ${ROOT}/usr/$(get_libdir)/xkb ]; then - rm -f ${ROOT}/usr/$(get_libdir)/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] \ - && [ -d ${ROOT}/etc/X11/xkb ]; then - if [ ! -d ${ROOT}/usr/$(get_libdir)/xkb ]; then - mkdir -p ${ROOT}/usr/$(get_libdir) - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir) - fi -} - -dynamic_libgl_preinst() { - # clean the dynamic libGL stuff's home to ensure - # we don't have stale libs floating around - if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ]; then - rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/* - fi - - # make sure we do not have any stale files lying around - # that could break things. Check old and new locations. - rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL\.* \ - ${ROOT}/usr/$(get_libdir)/libGL\.* -} - -################## -# pkg_postinst() # -################## - -font_setup() { - umask 022 - - # These cause ttmkfdir to segfault :/ - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-1.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-2.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-3.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/suneu-greek.enc - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/share/fonts/encodings/encodings.dir - # - # 2) Create fonts.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir" - # Create the encodings.dir in /usr/share/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontdir -n \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${ROOT}/usr/share/fonts/encodings - - eend 0 - - ebegin "Creating fonts.scale files" - local x - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then - if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # ttmkfdir fails on some stuff, so try mkfontscale if it does - local ttmkfdir_return=$? - else - # We didn't use ttmkfdir at all - local ttmkfdir_return=2 - fi - if [ ${ttmkfdir_return} -ne 0 ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ - -a /usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ - -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating fonts.dir files" - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontdir \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft cache" - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions" - find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ]; then - ebegin "Creating FC font cache" - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi -} - -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 ${PN} -} - -remove_old_compose_files() { - for x in $(find ${ROOT}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case $(basename ${x}) in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ]; then - rm -f ${x}/Compose - fi - ;; - esac - done -} - -setup_tmp_files() { - # These need to be owned by root and the correct permissions - # (bug #8281) - local x="" - for x in ${ROOT}/tmp/.{ICE,X11}-unix; do - if [ ! -d ${x} ]; then - mkdir -p ${x} - fi - - chown root:wheel ${x} - chmod 1777 ${x} - done -} - -print_info() { - echo - einfo "Please note that the xcursors are in /usr/share/cursors/${PN}." - einfo "Any custom cursor sets should be placed in that directory." - echo - einfo "If you wish to set system-wide default cursors, please create" - einfo "/usr/local/share/cursors/${PN}/default/index.theme" - einfo "with content: \"Inherits=theme_name\" so that future" - einfo "emerges will not overwrite those settings." - echo - einfo "Listening on TCP is disabled by default with startx." - einfo "To enable it, edit /usr/bin/startx." - echo - - echo - ewarn "BEWARE:" - ewarn "/usr/X11R6/$(get_libdir) has MOVED" - ewarn "to /usr/$(get_libdir)" - ewarn "Run etc-update to update your config files." - ewarn "Old locations for anything in /usr/X11R6/$(get_libdir)" - ewarn "are deprecated." - echo - # (#76985) - einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" - einfo "for more information on configuring X." - - # Try to get people to read /usr/X11R6/libdir move - ebeep 5 - epause 10 -} - -fix_links() { - # Fix problematic links - if [ -x ${ROOT}/usr/bin/Xorg ]; then - ln -snf ../bin ${ROOT}/usr/bin/X11 - fi -} diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild deleted file mode 100644 index 0f53742..0000000 --- a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild +++ /dev/null @@ -1,2094 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild,v 1.5 2006/09/12 20:47:40 dberkholz Exp $ - -# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory -# voodoo3 cards. - -# Libraries which are now supplied in shared form that were not in the past -# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so, -# libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so, -# libxkbfile.so, libxkbui.so - -# TODO -# 1 June 2005 <spyderous@gentoo.org> -# TARGET: none -# Consider building shared libraries only, when both are provided -# Combine find loops for "Creating fonts.scale files," "Generating -# fonts.dir files and "Generating Xft cache" -# <Mr_Bones_> the loop in pkg_postinst for removing Compose can probably -# be one line of bash expansion like rm -f ${ROOT}/usr/$(get_libdir)/ -# X11/locale/{ja*|ko*|zh*}/Compose -# Clean up migration function -# - loop through lib* instead of repetition -# Fix direction of lib -> libdir symlink -# Generalize any functions that make sense to generalize (i.e., anything -# that might realistically see use elsewhere, or repetitively here) -inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib - - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) -IUSE="3dfx bitmap-fonts cjk debug doc font-server insecure-drivers ipv6 minimal - nls nocxx opengl pam sdk static truetype-fonts type1-fonts uclibc xprint xv - GAPING_SECURITY_HOLE" -# IUSE_INPUT_DEVICES="synaptics wacom" - -FILES_VER="0.1" -PATCH_VER="0.1.1" -XCUR_VER="0.3.1" -XFSFT_ENC_VER="0.1" - -S=${WORKDIR}/xc - -HOMEPAGE="http://xorg.freedesktop.org/" - -# Misc patches we may need to fetch .. -X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~joshuabaergen/distfiles/${P}-patches-${PATCH_VER}.tar.bz2 - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" - -GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2 - http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2 - mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2" - -SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 ) - font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 ) - !minimal? ( mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 ) - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - ${GENTOO_FILES} - ${X_PATCHES} - http://xorg.freedesktop.org/releases/X11R${PV}/src-single/X11R${PV}-src.tar.bz2" - -LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 - bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor - nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 - MIT SGI-B BSD || ( FTL GPL-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -DEPEND=">=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - sys-apps/groff - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-2.1.8 - >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.2.0 ) - !nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 ) - >=sys-apps/sed-4 - userland_GNU? ( sys-apps/util-linux ) - dev-lang/perl - media-libs/libpng - !<=app-emulation/emul-linux-x86-xlibs-1.2-r3" -# FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence - -RDEPEND=" - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-2.1.8 - >=media-libs/fontconfig-2.1-r1 - opengl? ( >=x11-base/opengl-update-2.2.0 ) - !nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 ) - media-libs/libpng - >=sys-libs/ncurses-5.1 - !<=app-emulation/emul-linux-x86-xlibs-1.2-r3 - !app-doc/opengl-manpages - !app-doc/xorg-docs - !app-doc/xorg-sgml-doctools - !media-fonts/encodings - !media-fonts/font-adobe-100dpi - !media-fonts/font-adobe-75dpi - !media-fonts/font-adobe-utopia-100dpi - !media-fonts/font-adobe-utopia-75dpi - !media-fonts/font-adobe-utopia-type1 - !media-fonts/font-alias - !media-fonts/font-arabic-misc - !media-fonts/font-bh-100dpi - !media-fonts/font-bh-75dpi - !media-fonts/font-bh-lucidatypewriter-100dpi - !media-fonts/font-bh-lucidatypewriter-75dpi - !media-fonts/font-bh-ttf - !media-fonts/font-bh-type1 - !media-fonts/font-bitstream-100dpi - !media-fonts/font-bitstream-75dpi - !media-fonts/font-bitstream-speedo - !media-fonts/font-bitstream-type1 - !media-fonts/font-cronyx-cyrillic - !media-fonts/font-cursor-misc - !media-fonts/font-daewoo-misc - !media-fonts/font-dec-misc - !media-fonts/font-ibm-type1 - !media-fonts/font-isas-misc - !media-fonts/font-jis-misc - !media-fonts/font-micro-misc - !media-fonts/font-misc-cyrillic - !media-fonts/font-misc-ethiopic - !media-fonts/font-misc-meltho - !media-fonts/font-misc-misc - !media-fonts/font-mutt-misc - !media-fonts/font-schumacher-misc - !media-fonts/font-screen-cyrillic - !media-fonts/font-sony-misc - !media-fonts/font-sun-misc - !media-fonts/font-util - !media-fonts/font-winitzki-cyrillic - !media-fonts/font-xfree86-type1 - !media-libs/mesa - !x11-apps/appres - !x11-apps/bdftopcf - !x11-apps/beforelight - !x11-apps/bitmap - !x11-apps/editres - !x11-apps/fonttosfnt - !x11-apps/fslsfonts - !x11-apps/fstobdf - !x11-apps/iceauth - !x11-apps/ico - !x11-apps/lbxproxy - !x11-apps/listres - !x11-apps/luit - !x11-apps/mesa-progs - !x11-apps/mkcfm - !x11-apps/mkfontdir - !x11-apps/mkfontscale - !x11-apps/oclock - !x11-apps/proxymngr - !x11-apps/rgb - !x11-apps/rstart - !x11-apps/scripts - !x11-apps/sessreg - !x11-apps/setxkbmap - !x11-apps/showfont - !x11-apps/smproxy - !x11-wm/twm - !x11-apps/viewres - !x11-apps/x11perf - !x11-apps/xauth - !x11-apps/xbiff - !x11-apps/xcalc - !x11-apps/xclipboard - !x11-apps/xclock - !x11-apps/xcmsdb - !x11-apps/xconsole - !x11-apps/xcursorgen - !x11-apps/xdbedizzy - !x11-apps/xditview - !x11-apps/xdm - !x11-apps/xdpyinfo - !x11-apps/xdriinfo - !x11-apps/xedit - !x11-apps/xev - !x11-apps/xeyes - !x11-apps/xf86dga - !x11-apps/xfd - !x11-apps/xfindproxy - !x11-apps/xfontsel - !x11-apps/xfs - !x11-apps/xfsinfo - !x11-apps/xfwp - !x11-apps/xgamma - !x11-apps/xgc - !x11-apps/xhost - !x11-apps/xinit - !x11-apps/xkbcomp - !x11-apps/xkbevd - !x11-apps/xkbprint - !x11-apps/xkbutils - !x11-apps/xkill - !x11-apps/xload - !x11-apps/xlogo - !x11-apps/xlsatoms - !x11-apps/xlsclients - !x11-apps/xlsfonts - !x11-apps/xmag - !x11-apps/xman - !x11-apps/xmessage - !x11-apps/xmh - !x11-apps/xmodmap - !x11-apps/xmore - !x11-apps/xphelloworld - !x11-apps/xplsprinters - !x11-apps/xpr - !x11-apps/xprehashprinterlist - !x11-apps/xprop - !x11-apps/xrandr - !x11-apps/xrdb - !x11-apps/xrefresh - !x11-apps/xrx - !x11-apps/xset - !x11-apps/xsetmode - !x11-apps/xsetpointer - !x11-apps/xsetroot - !x11-apps/xsm - !x11-apps/xstdcmap - !x11-apps/xtrap - !x11-apps/xvidtune - !x11-apps/xvinfo - !x11-apps/xwd - !x11-apps/xwininfo - !x11-apps/xwud - !x11-base/xorg-server - !x11-drivers/xf86-input-acecad - !x11-drivers/xf86-input-aiptek - !x11-drivers/xf86-input-calcomp - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-input-digitaledge - !x11-drivers/xf86-input-dmc - !x11-drivers/xf86-input-dynapro - !x11-drivers/xf86-input-elo2300 - !x11-drivers/xf86-input-elographics - !x11-drivers/xf86-input-evdev - !x11-drivers/xf86-input-fpit - !x11-drivers/xf86-input-hyperpen - !x11-drivers/xf86-input-jamstudio - !x11-drivers/xf86-input-joystick - !x11-drivers/xf86-input-keyboard - !x11-drivers/xf86-input-magellan - !x11-drivers/xf86-input-magictouch - !x11-drivers/xf86-input-microtouch - !x11-drivers/xf86-input-mouse - !x11-drivers/xf86-input-mutouch - !x11-drivers/xf86-input-palmax - !x11-drivers/xf86-input-penmount - !x11-drivers/xf86-input-spaceorb - !x11-drivers/xf86-input-summa - !x11-drivers/xf86-input-tek4957 - !x11-drivers/xf86-input-ur98 - !x11-drivers/xf86-input-vmmouse - !x11-drivers/xf86-input-void - !x11-drivers/xf86-video-apm - !x11-drivers/xf86-video-ark - !x11-drivers/xf86-video-ati - !x11-drivers/xf86-video-chips - !x11-drivers/xf86-video-cirrus - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-dummy - !x11-drivers/xf86-video-fbdev - !x11-drivers/xf86-video-glint - !x11-drivers/xf86-video-i128 - !x11-drivers/xf86-video-i740 - !x11-drivers/xf86-video-i810 - !x11-drivers/xf86-video-imstt - !x11-drivers/xf86-video-mga - !x11-drivers/xf86-video-neomagic - !x11-drivers/xf86-video-newport - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-nv - !x11-drivers/xf86-video-rendition - !x11-drivers/xf86-video-s3 - !x11-drivers/xf86-video-s3virge - !x11-drivers/xf86-video-savage - !x11-drivers/xf86-video-siliconmotion - !x11-drivers/xf86-video-sis - !x11-drivers/xf86-video-sisusb - !x11-drivers/xf86-video-sunbw2 - !x11-drivers/xf86-video-suncg14 - !x11-drivers/xf86-video-suncg3 - !x11-drivers/xf86-video-suncg6 - !x11-drivers/xf86-video-sunffb - !x11-drivers/xf86-video-sunleo - !x11-drivers/xf86-video-suntcx - !x11-drivers/xf86-video-tdfx - !x11-drivers/xf86-video-tga - !x11-drivers/xf86-video-trident - !x11-drivers/xf86-video-tseng - !x11-drivers/xf86-video-v4l - !x11-drivers/xf86-video-vesa - !x11-drivers/xf86-video-vga - !x11-drivers/xf86-video-via - !x11-drivers/xf86-video-vmware - !x11-drivers/xf86-video-voodoo - !x11-libs/libdmx - !x11-libs/libdrm - !x11-libs/libfontenc - !x11-libs/libFS - !x11-libs/libICE - !x11-libs/liblbxutil - !x11-libs/liboldX - !x11-libs/libSM - !x11-libs/libX11 - !x11-libs/libXau - !x11-libs/libXaw - !x11-libs/libXcomposite - !x11-libs/libXcursor - !x11-libs/libXdamage - !x11-libs/libXdmcp - !x11-libs/libXevie - !x11-libs/libXext - !x11-libs/libXfixes - !x11-libs/libXfont - !x11-libs/libXfontcache - !x11-libs/libXft - !x11-libs/libXi - !x11-libs/libXinerama - !x11-libs/libxkbfile - !x11-libs/libxkbui - !x11-libs/libXmu - !x11-libs/libXp - !x11-libs/libXpm - !x11-libs/libXprintAppUtil - !x11-libs/libXprintUtil - !x11-libs/libXrandr - !x11-libs/libXrender - !x11-libs/libXres - !x11-libs/libXScrnSaver - !x11-libs/libXt - !x11-libs/libXTrap - !x11-libs/libXtst - !x11-libs/libXv - !x11-libs/libXvMC - !x11-libs/libXxf86dga - !x11-libs/libXxf86misc - !x11-libs/libXxf86vm - !x11-libs/xtrans - !x11-misc/gccmakedep - !x11-misc/imake - !x11-misc/lndir - !x11-misc/makedepend - !x11-misc/util-macros - !x11-misc/xbitmaps - !x11-misc/xkbdata - !x11-misc/xkeyboard-config - !x11-misc/xorg-cf-files - !x11-proto/bigreqsproto - !x11-proto/compositeproto - !x11-proto/damageproto - !x11-proto/dmxproto - !x11-proto/evieext - !x11-proto/fixesproto - !x11-proto/fontcacheproto - !x11-proto/fontsproto - !x11-proto/glproto - !x11-proto/inputproto - !x11-proto/kbproto - !x11-proto/printproto - !x11-proto/randrproto - !x11-proto/recordproto - !x11-proto/renderproto - !x11-proto/resourceproto - !x11-proto/scrnsaverproto - !x11-proto/trapproto - !x11-proto/videoproto - !x11-proto/xcmiscproto - !x11-proto/xextproto - !x11-proto/xf86bigfontproto - !x11-proto/xf86dgaproto - !x11-proto/xf86driproto - !x11-proto/xf86miscproto - !x11-proto/xf86rushproto - !x11-proto/xf86vidmodeproto - !x11-proto/xineramaproto - !x11-proto/xproto - !x11-proto/xproxymanagementprotocol - !x11-themes/gentoo-xcursors - !x11-themes/xcursor-themes" - -PDEPEND="x86? ( - input_devices_synaptics? ( x11-drivers/synaptics ) - input_devices_wacom? ( x11-drivers/linuxwacom ) - ) - 3dfx? ( >=media-libs/glide-v3-3.10 ) - x11-terms/xterm" - -DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" - -pkg_setup() { - FILES_DIR="${WORKDIR}/files" - PATCHDIR="${WORKDIR}/patch" - EXCLUDED="${PATCHDIR}/excluded" - - if ! use GAPING_SECURITY_HOLE; then - local msg="Set USE=GAPING_SECURITY_HOLE to install." - eerror "$msg" - eerror "This package is subject to at least one local root vulnerability." - die "$msg" - fi - - # Set up CFLAG-related things - cflag_setup - - # See bug #35468, circular pam-X11 dep - check_pam - - # Look for invalid/dangerous USE flags and combinations - check_use_combos - - setup_multilib - - # xfs user - if use font-server; then - enewgroup xfs 33 - enewuser xfs 33 -1 /etc/X11/fs xfs - fi -} - -src_unpack() { - unpack_all - - patch_setup - - do_patch - - host_def_setup - - use_specific_hacks -} - -src_compile() { - build -} - -src_install() { - install_everything - - backward_compat_install - - fix_permissions - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - zap_host_def_cflags - - # EURO support - if ! use minimal; then - add_euro_support - fi - - setup_standard_symlinks - - if use opengl; then - fix_opengl_symlinks - fi - - libtool_archive_install - - compose_files_install - - if use font-server; then - encode_xfsft_files - fi - - if use nls; then - koi8_fonts_install - fi - - etc_files_install - - if use opengl; then - dynamic_libgl_install - fi - - fix_libtool_libdir_paths "$(find ${D} -name *.la)" - - cursor_install - - strip_execs - - if use minimal; then - minimal_install - fi - - # TEMPORARY hack: should be patched in, if it's not already - # For Battoussai's gatos stuffs: - if use sdk; then - insinto /usr/$(get_libdir)/Server/include - doins ${S}/extras/drm/shared/drm.h - fi - - xprint_install - - config_files_install -} - -pkg_preinst() { - # Do migration before anything else, so we do all the rest inside the - # symlink - - # Get rid of "standard" symlinks - # We can't overwrite symlink with directory w/ $(mv -f) - [ -L ${ROOT}usr/$(get_libdir)/X11 ] \ - && rm ${ROOT}usr/$(get_libdir)/X11 - [ -L ${ROOT}usr/include/X11 ] \ - && rm ${ROOT}usr/include/X11 - [ -L ${ROOT}usr/include/GL ] \ - && rm ${ROOT}usr/include/GL - [ -L ${ROOT}usr/bin/X11 ] \ - && rm ${ROOT}usr/bin/X11 - # Get rid of some apparent artifacts of migration - [ -L ${ROOT}usr/include/GL/GL ] \ - && rm ${ROOT}usr/include/GL/GL - [ -L ${ROOT}usr/include/X11/X11 ] \ - && rm ${ROOT}usr/include/X11/X11 - [ -d ${ROOT}usr/share/fonts/fonts ] \ - && rm -rf ${ROOT}usr/share/fonts/fonts - - # No need to do this, if it's already been done - # Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6 - # is a symlink. - if [ ! -L "/usr/X11R6" ]; then - # Migrate stuff in /usr/X11R6 to /usr - local DIR DIRS - DIRS="bin include lib" - if [ "lib" != "$(get_libdir)" ]; then - DIRS="${DIRS} $(get_libdir)" - fi - for DIR in ${DIRS}; do - migrate /usr/X11R6/${DIR} /usr/${DIR} - done - # Can't do this in the other loop because of different start and end - migrate /usr/X11R6/man /usr/share/man - fi - - update_config_files - - cleanup_fonts - - # See above comment for the same test - if [ ! -L "/usr/X11R6" ]; then - # Needs to happen after cleanup_fonts() - migrate /usr/X11R6/$(get_libdir)/X11/fonts /usr/share/fonts - - # Get rid of symlinks so we can migrate /usr/X11R6 without dying when a - # symlink tries to copy to a dir - einfo "Preparing for /usr/X11R6 -> /usr migration..." - local LINK LINKS - LINKS="bin include lib man share/info" - if [ "lib" != "$(get_libdir)" ]; then - LINKS="${LINKS} $(get_libdir)" - fi - for LINK in ${LINKS}; do - if [ -L "${ROOT}/usr/X11R6/${LINK}" ]; then - rm -fv ${ROOT}/usr/X11R6/${LINK} - fi - done - einfo "Remaining symlinks in /usr/X11R6:" - find ${ROOT}/usr/X11R6/ -type l - - # Woohoo, nothing in /usr/X11R6 after this - migrate /usr/X11R6 /usr - fi - - move_app_defaults_to_etc - - move_xkb_to_usr - - # Run this even for USE=-opengl, to clean out old stuff from possible - # USE=opengl build - dynamic_libgl_preinst -} - -pkg_postinst() { - env-update - - if [ "${ROOT}" = "/" ]; then - font_setup - - if use opengl; then - switch_opengl_implem - fi - fi - - remove_old_compose_files - - setup_tmp_files - - print_info -} - -pkg_postrm() { - fix_links -} - -############### -# pkg_setup() # -############### - -cflag_setup() { - # Set up CFLAGS - filter-flags "-funroll-loops" - - ALLOWED_FLAGS="-fstack-protector -march -mcpu -mtune -O -O0 -O1 -O2 -O3 -Os" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -pipe -fomit-frame-pointer" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -momit-leaf-frame-pointer" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -g -g0 -g1 -g2 -g3" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -ggdb -ggdb0 -ggdb1 -ggdb2 -ggdb3" - # arch-specific section added by popular demand - case "${ARCH}" in - mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mips1 -mips2 -mips3 -mips4 -mabi" - ;; - # -fomit-frame-pointer known to break things and is pointless - # according to ciaranm - # And hardened compiler must be softened. -- fmccor, 20.viii.04 - sparc) filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" - if [[ ${ABI} == "sparc64" ]]; then - ALLOWED_FLAGS="${ALLOWED_FLAGS} -D__sparc_v9__ -D__linux_sparc_64__" - append-flags -D__sparc_v9__ -D__linux_sparc_64__ - fi - ;; - # gcc-3.3.2 causes invalid insn error - hppa ) replace-cpu-flags 2.0 1.0 - ;; - esac - - # Recently there has been a lot of stability problem in Gentoo-land. Many - # things can be the cause to this, but I believe that it is due to gcc3 - # still having issues with optimizations, or with it not filtering bad - # combinations (protecting the user maybe from themselves) yet. - # - # This can clearly be seen in large builds like glibc, where too aggressive - # CFLAGS cause the tests to fail miserbly. - # - # Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion - # knows what he is talking about: - # - # People really shouldn't force code-specific options on... It's a - # bad idea. The -march options aren't just to look pretty. They enable - # options that are sensible (and include sse,mmx,3dnow when appropriate). - # - # The next command strips CFLAGS and CXXFLAGS from nearly all flags. If - # you do not like it, comment it, but do not bugreport if you run into - # problems. - # - # <azarah@gentoo.org> (13 Oct 2002) - strip-flags -} - -check_pam() { - if use pam && has_version x11-base/${PN}; then - einfo "Previous ${PN} installation detected." - einfo "Enabling PAM features in ${PN}." - else - einfo "Previous ${PN} installation NOT detected." - einfo "Disabling PAM features in ${PN}." - einfo "You must remerge ${PN} to enable pam." - einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468." - fi -} - -check_use_combos() { - if use static; then - # A static build disallows building the SDK. - # See config/xf86.rules. - if use sdk; then - die "The static USE flag is incompatible with the sdk USE flag." - fi - fi - - # (#77949) - if use minimal && use doc; then - die "The minimal and doc USE flags are incompatible and result in a dead build." - fi - - if use xv && ! use opengl; then - eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996" - eerror "The xv USE flag currently requires the opengl flag." - die "This is a known bug. Do not report it." - fi - - if use opengl && ! use xv; then - eerror "See http://bugs.gentoo.org/show_bug.cgi?id=76936" - eerror "The opengl USE flag currently requires the xv flag." - die "This is a known bug. Do not report it." - fi - - # Echo a message to the user about bitmap-fonts - if ! use bitmap-fonts; then - ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable" - ewarn "75dpi and 100dpi fonts. Your GTK+-1.2 fonts may look" - ewarn "screwy otherwise" - - ebeep 5 - epause 10 - fi -} - -setup_multilib() { - # on amd64 we need /usr/lib64/X11/locale/lib to be a symlink - # created by the emul lib ebuild in order for adobe acrobat, staroffice, - # and a few other apps to work. - if ! has_multilib_profile; then - use amd64 && get_libdir_override lib64 - fi -} - -################ -# src_unpack() # -################ - -unpack_all() { - # Unpack source and patches - ebegin "Unpacking ${PV} source" - unpack X11R${PV}-src.tar.bz2 > /dev/null - eend 0 - - ebegin "Unpacking Gentoo files and patches" - unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null - unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null - eend 0 - - if ! use minimal; then - # Unpack TaD's gentoo cursors - ebegin "Unpacking Gentoo cursors" - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null - eend 0 - fi - - # Unpack extra fonts stuff from Mandrake - ebegin "Unpacking fonts" - if use nls; then - unpack gemini-koi8-u.tar.bz2 > /dev/null - fi - if ! use minimal; then - unpack eurofonts-X11.tar.bz2 > /dev/null - fi - if use font-server; then - unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null - fi - eend 0 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc -} - -do_patch() { - # Bulk patching - based on patch name - # Will create excluded stuff once it's needed - cd ${WORKDIR} - EPATCH_SUFFIX="patch" \ - epatch ${PATCHDIR} - cd ${S} - - # Security patches - epatch ${FILESDIR}/CVE-2006-1526-xrender-mitri.patch - epatch ${FILESDIR}/x11r6.9.0-setuid.diff - - # Fix dual-head - epatch ${FILESDIR}/${PV}-fix-rom-read-dualhead.patch -} - -host_def_setup() { - HOSTCONF="config/cf/host.def" - - ebegin "Setting up ${HOSTCONF}" - cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \ - || die "host.def copy failed" - echo "#define XVendorString \"Gentoo (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \ - >> ${HOSTCONF} - - # Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and - # http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600 - # - # Makes ld bail at link time on undefined symbols - # Suggested by Mike Harris <mharris@redhat.com> - #echo "#define SharedLibraryLoadFlags -shared -Wl,-z,defs" \ - # >> ${HOSTCONF} - - # Enable i810 on x86_64 (RH #126687) - if use amd64; then - echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF} - fi - - # FHS install locations - echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF} - echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF} - echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF} - # Single quotes so FONTDIR doesn't get run - echo '#define FontEncDir $(FONTDIR)/encodings' >> ${HOSTCONF} - echo "#define BinDir /usr/bin" >> ${HOSTCONF} - echo "#define IncRoot /usr/include" >> ${HOSTCONF} - # This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR) - # See xc/include/Imakefile - echo "#define LinkGLToUsrInclude NO" >> ${HOSTCONF} - # /usr/X11R6/lib/X11 - echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF} - # /usr/X11R6/lib with exception of /usr/X11R6/lib/X11 - echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF} - - # Make man4 and man7 stuff get 'x' suffix like everything else - # Necessary so we can install to /usr/share/man without overwriting - echo "#define DriverManDir \$(MANSOURCEPATH)4" >> ${HOSTCONF} - echo "#define DriverManSuffix 4x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - echo "#define MiscManDir \$(MANSOURCEPATH)7" >> ${HOSTCONF} - echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - - # Don't build xterm -- use external (#54051) - echo "#define BuildXterm NO" >> ${HOSTCONF} - - # Xwrapper has been removed so we now need to use the set uid server - # again, this mustve happened somewhere after 4.3.0 in the development. - echo "#define InstallXserverSetUID YES" >> ${HOSTCONF} - echo "#define BuildServersOnly NO" >> ${HOSTCONF} - - # Don't use /lib64 if $(get_libdir) != lib64 - # Replaces 0181_all_4.3.0-amd64-nolib64.patch - if [ "$(get_libdir)" == "lib64" ]; then - echo "#define HaveLib64 YES" >> ${HOSTCONF} - sed -i '/^#define Freetype2LibDir/s:^.*$:#define Freetype2LibDir /usr/lib64:' ${HOSTCONF} - else - echo "#define HaveLib64 NO" >> ${HOSTCONF} - fi - - # Set location of DRM source to be installed - echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> ${HOSTCONF} - - if [ "$(gcc-major-version)" -eq "3" ]; then - if use x86; then - # Should fix bug #4189. gcc 3.x have problems with - # -march=pentium4 and -march=athlon-tbird - # Seems fixed on 3.3 and higher - if [ "$(gcc-minor-version)" -le "2" ]; then - replace-cpu-flags pentium4 pentium3 - replace-cpu-flags athlon athlon-tbird - fi - - if [ "$(gcc-minor-version)" -eq "4" ]; then - if [ "$(gcc-micro-version)" -lt "4" ]; then - #to fix #57602 for now, thanks Spanky (broken sse2) - if test_flag -mno-sse2; then - append-flags -mno-sse2 - fi - # (#75067) broken sse3 - if test_flag -mno-sse3; then - append-flags -mno-sse3 - fi - fi - fi - - # Try a fix for #49310, see #50931 for more info. <spyderous> - if [ "$(is-flag -fomit-frame-pointer)" ]; then - replace-cpu-flags k6 k6-2 k6-3 i586 - fi - fi - - # Without this, modules breaks with gcc3 - if [ "$(gcc-minor-version)" -eq "1" ]; then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - - if [ "$(gcc-minor-version)" -eq "2" ]; then - if [ "$(gcc-micro-version)" -lt "2" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - elif [ "$(gcc-minor-version)" -lt "2" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - elif [ "$(gcc-major-version)" -lt "3" ]; then - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - fi - - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} - - if use static; then - echo "#define DoLoadableServer NO" >>${HOSTCONF} - else - einfo "Setting DoLoadableServer to YES." - echo "#define DoLoadableServer YES" >> ${HOSTCONF} - - if has_hardened; then - echo "#define HardenedGccSpecs YES" >> ${HOSTCONF} - fi - fi - - use_build debug XFree86Devel - use_build debug BuildDebug - use_build debug DebuggableLibraries - - if ! use debug; then - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> ${HOSTCONF} - fi - - # Remove circular dep between pam and X11, bug #35468 - # If pam is in USE and we have X11, then we can enable PAM -# if use pam && has_version x11-base/xorg-x11 - if has_version x11-base/xorg-x11; then - # If you want to have optional pam support, do it properly ... - use_build pam HasPam - use_build pam HasPamMisc - fi - - if use x86 || use alpha; then - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx; then - echo "#define HasGlide3 YES" >> ${HOSTCONF} - fi -# This won't work unless we can disable building the tdfx stuff -# entirely :/ -# use_build 3dfx HasGlide3 - fi - - # Do we want the glx extension? This will turn off XF86DRI if it's off. - # DRI can't build if glx isn't built, so keep this below DRI define. - # Do this before hppa so they can turn DRI off - use_build opengl BuildGlxExt - use_build opengl BuildGLXLibrary - use_build opengl BuildXF86DRI - # Needs GL headers - use_build opengl BuildGLULibrary - - - - if use mips; then - echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF} - fi - - # Make xv optional for more minimal builds - use_build xv BuildXvLibrary - use_build xv BuildXvExt - # Depends on X11/extensions/Xv.h - use_build xv BuildXF86RushExt - use_build xv BuildXF86RushLibrary - - if use hppa; then - echo "#define DoLoadableServer NO" >> ${HOSTCONF} - echo "#define BuildXF86DRI NO" >> config/cf/host.def - echo "#undef DriDrivers" >> config/cf/host.def - echo "#define XF86CardDrivers fbdev" >> config/cf/host.def - echo "#define BuildXvExt YES" >> config/cf/host.def - fi - - - if use alpha; then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint s3 vesa" >> ${HOSTCONF} - fi - - if use ppc; then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} - fi - - if use ppc64; then - echo "#define MakeDllModules YES" >> ${HOSTCONF} - echo "#define XF86VgaHw YES" >> ${HOSTCONF} - echo "#define XF86FBDevHw YES" >> ${HOSTCONF} - echo "#define XF86CardDrivers mga fbdev v4l ati vga nv" >> ${HOSTCONF} - fi - - if use sparc; then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> ${HOSTCONF} - if ( [ -e "${ROOT}/usr/src/linux" ] \ - && ! kernel_is "2" "6" ) \ - || [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then - einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx." - echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \ - programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c - fi - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> ${HOSTCONF} - echo "#define HasFontconfig YES" >> ${HOSTCONF} - - # Use the xorg Xft2 lib - echo "#define SharedLibXft YES" >> ${HOSTCONF} - - # with USE="X doc' circular dep w/ virtual/ghostscript - # echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF} - # Caused issues, basic docs aren't installed - use_build doc BuildLinuxDocPS - use_build doc BuildSpecsDocs - use_build doc BuildHtmlManPages - use_build doc InstallHardcopyDocs - - # enable Japanese docs, optionally - use doc && use_build cjk InstallJapaneseDocs - - # Native Language Support Fonts - use_build nls BuildCyrillicFonts - use_build nls BuildArabicFonts - use_build nls BuildGreekFonts - use_build nls BuildHebrewFonts - use_build nls BuildThaiFonts - - if use nls; then - use_build cjk BuildCIDFonts - use_build cjk BuildJapaneseFonts - use_build cjk BuildKoreanFonts - use_build cjk BuildChineseFonts - fi - - # Crappy bitmap fonts - use_build bitmap-fonts Build75DpiFonts - use_build bitmap-fonts Build100DpiFonts - - # Type1 fonts - use_build type1-fonts BuildType1Fonts - - # TrueType fonts - use_build truetype-fonts BuildTrueTypeFonts - - # X Font Server - use_build font-server BuildFontServer - - use_build insecure-drivers BuildDevelDRIDrivers - - # (#134604) sunffb compile broken - use insecure-drivers \ - && echo "#define DevelDRIDrivers mach64 unichrome" \ - >> ${HOSTCONF} - - if use ipv6; then - # In case Gentoo ever works on a system with IPv6 sockets that don't - # also listen on IPv4 (see config/cf/X11.tmpl) - echo "#define PreferXdmcpIPv6 YES" >> ${HOSTCONF} - fi - - use_build ipv6 BuildIPv6 - - if use minimal; then - # Don't build static libs - echo "#define ForceNormalLib NO" >> ${HOSTCONF} - # Turn back on needed ones - echo "#define NormalLibXau YES" >> ${HOSTCONF} - - echo "#define BuildDPSLibraries NO" >> ${HOSTCONF} - echo "#define BuildClients NO" >> ${HOSTCONF} - - # BuildClients doesn't catch things in xc/programs/Xserver - # Also had to add - # 9250_all_6.8.1.904-respect-xfree86configtools-setting.patch - echo "#define BuildXFree86ConfigTools NO" >> ${HOSTCONF} - echo "#define BuildLBX NO" >> ${HOSTCONF} - - # Weird crap we don't need - echo "#define XF8_32Wid NO" >> ${HOSTCONF} - echo "#define XF8_32Bpp NO" >> ${HOSTCONF} - echo "#define XF8_16Bpp NO" >> ${HOSTCONF} - echo "#define XF24_32Bpp NO" >> ${HOSTCONF} - - # Without nls, truetype-fonts, type1-fonts, we only build misc - # Now let's try to reduce what gets built in misc - # iso8859-1 has the "fixed" font - echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF} - # 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew - echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF} - # 11 is thai, 12 isn't in misc - echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF} - echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF} - - echo "#define BuildDmx NO" >> ${HOSTCONF} - echo "#define XnestServer NO" >> ${HOSTCONF} - echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF} - echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF} - - # If you want more drivers built with minimal, file a bug - # -Donnie Berkholz <spyderous@gentoo.org> - if use x86; then - # Remove glint, tga, s3, s3virge, rendition, neomagic, i740, - # cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion - # mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers - # (nsc, i810), ati, DevelDrivers, via - # Leave vmware driver for testing minimal setups using VMWare - # XF86OSCardDrivers includes v4l and fbdev on linux - # DevelDrivers includes imstt and newport on x86 - echo "#define XF86CardDrivers vmware vesa vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} - # (#93339) - elif use sparc; then - echo "#define XF86CardDrivers vesa vga fbdev sunffb suncg6 \ - sunleo" >> ${HOSTCONF} - fi - fi - - # Ajax is the man for getting this going for us - echo "#define ProPoliceSupport YES" >> ${HOSTCONF} - - # Make xprint optional - use_build xprint BuildXprint - use_build xprint BuildXprintClients - # Build libXp even when xprint is off. It's just for clients, server - if ! use xprint; then - echo "#define BuildXprintLib YES" >> ${HOSTCONF} - fi - - # End the host.def definitions here - eend 0 -} - -patch_setup() { - einfo "Excluding patches..." - - patch_exclude 9020 9030 - patch_exclude 9913 9914 9915 9920 - - # This patch is just plain broken. Results in random failures. - patch_exclude 0120*parallel-make - - # Hardened patches (both broken) - patch_exclude 9960_all_4.3.0-exec-shield-GNU - patch_exclude 9961_all_4.3.0-libGL-exec-shield - - # Xbox nvidia driver, patch is a total hack, tears apart xc/config/cf - # (#68726). Only apply when necessary so we don't screw other stuff up. - # 9990 is the driver, 9991 is xbox pci scanning (potentially useful) - if [ ! "${PROFILE_ARCH}" = "xbox" ]; then - patch_exclude 9990 9991 - fi - - # this patch comments out the Xserver line in xdm's config - # We only want it here - if ! use s390; then - patch_exclude 7500 - fi - - # if ! use gatos; then - # patch_exclude 9841_all_4.3.0-gatos-mesa - # fi - - if use debug; then - patch_exclude 5901*acecad-debug - fi - - # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - if use 3dfx && [ "${TDFX_RISKY}" = "yes" ]; then - patch_exclude 5850 - else - patch_exclude 5851 - fi - - # Glibc-specific patches to exclude for non-glibc systems - if use elibc_FreeBSD || use elibc_OpenBSD; then - patch_exclude 0700 - fi - einfo "Done excluding patches." -} - -use_specific_hacks() { - # uclibc lacks sinf and cosf - if use uclibc; then - sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \ - ${S}/programs/Imakefile - fi - - # Get rid of cursor sets other than core and handhelds, saves ~4MB - if use minimal; then - sed -i -e 's:SUBDIRS = redglass whiteglass handhelds:SUBDIRS = handhelds:' \ - ${S}/programs/xcursorgen/Imakefile - fi - - cd ${S} - if use doc; then - # These are not included anymore as they are obsolete - local x - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}; do - if [ -f ${x} ]; then - sed -i '/Load[[:space:]]*"\(pex5\|xie\)"/d' ${x} - fi - done - fi -} - -################# -# src_compile() # -################# - -build() { - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal xorg Makefile variable and the - # xorg build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building xorg-x11..." - if use debug; then - chmod u+x ${S}/config/util/makeg.sh - FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \ - || die "debug make World failed" - else - FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "make World failed" - fi - - if use nls; then - emake -j1 -C ${S}/nls MAKE="make" || die "nls build failed" - fi -} - -################# -# src_install() # -################# - -install_everything() { - unset MAKE_OPTS - - einfo "Installing X.org X11..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "$(gcc-version)" != "2.95" ] && use x86; then - make install MAKE="make" DESTDIR=${D} \ - || make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install MAKE="make" DESTDIR=${D} || die "install failed" - else - make install MAKE="make" DESTDIR=${D} || die "install failed" - fi - - if use sdk; then - einfo "Installing X.org X11 SDK..." - make install.sdk MAKE="make" DESTDIR=${D} || die "sdk install failed" - fi - - if ! use minimal; then - einfo "Installing man pages..." - make install.man MAKE="make" DESTDIR=${D} || die "man page install failed" - einfo "Compressing man pages..." - prepman /usr - fi - - if use nls; then - cd ${S}/nls - make MAKE="make" DESTDIR=${D} install || die "nls install failed" - fi - dodoc ${S}/RELNOTES -} - -backward_compat_install() { - # Backwards compatibility for /usr/share move - dosym ../../share/fonts /usr/$(get_libdir)/X11/fonts - - # Have the top-level libdir symlink made first, so real dirs don't get created - local DIR DIRS - if [ "lib" != "$(get_libdir)" ]; then - DIRS="${DIRS} $(get_libdir)" - fi - for DIR in ${DIRS}; do - dosym ../${DIR} /usr/X11R6/${DIR} - done - - dosym ../../../share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc -} - -fix_permissions() { - # Fix permissions on locale/common/*.so - local x - for x in ${D}/usr/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so*; do - if [ -f ${x} ]; then - fperms 0755 ${x/${D}} - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/$(get_libdir)/modules -name '*.o' -o -name '*.so'); do - if [ -f ${x} ]; then - fperms 0755 ${x/${D}} - fi - done - - # Fix perms - if ! use minimal; then - fperms 755 /usr/$(get_libdir)/X11/xkb/geometry/sgi /usr/bin/dga - fi -} - -zap_host_def_cflags() { - ebegin "Fixing $(get_libdir)/X11/config/host.def" - cp ${D}/usr/$(get_libdir)/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/$(get_libdir)/X11/config/host.def \ - || eerror "Munging host.def failed" - # theoretically, /usr/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 -} - -add_euro_support() { - ebegin "Adding Euro support" - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir)" \ - ${D}/usr/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-10x20-lat9.pcf.gz - eend 0 -} - -setup_standard_symlinks() { - # Standard symlinks - dodir /usr/{bin,include,$(get_libdir)} - dosym ../bin /usr/bin/X11 - # Stop complains about "file or directory not existing" - dodir /usr/X11R6 - dosym ../include /usr/X11R6/include - dosym ../../usr/$(get_libdir)/X11/xkb /etc/X11/xkb - - # Some critical directories - if ! use minimal; then - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - fi - - # Backwards compat, FHS, etc. - dosym ../../usr/X11R6/bin/Xorg /etc/X11/X -} - -libtool_archive_install() { - if use opengl; then - # .la files for libtool support - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILES_DIR}/lib/*.la - fi -} - -fix_libtool_libdir_paths() { - local dirpath - for archive in ${*} ; do - dirpath=$(dirname ${archive} | sed -e "s:^${D}::") - [[ ${dirpath::1} == "/" ]] || dirpath="/"${dirpath} - sed -i ${archive} -e "s:^libdir.*:libdir=\'${dirpath}\':" - done -} - -compose_files_install() { - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - local x - for x in $(find ${D}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case $(basename ${x}) in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ]; then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ]; then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - local i - for i in ${D}/usr/$(get_libdir)/X11/locale/*/Compose; do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" ${i} \ - || eerror "sed ${i} failed" - done -} - -encode_xfsft_files() { - # Yet more Mandrake - ebegin "Encoding files for xfsft font server" - dodir /usr/share/fonts/encodings - cp -pPR ${WORKDIR}/usr/share/fonts/encodings/* \ - ${D}/usr/share/fonts/encodings - - for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc; do - if [ -f "${x}" ]; then - gzip -9 -f ${x} \ - || eerror "gzipping ${x} failed" - fi - done - eend 0 -} - -koi8_fonts_install() { - ebegin "Adding gemini-koi8 fonts" - cd ${WORKDIR}/ukr - gunzip *.Z || eerror "gunzipping gemini-koi8 fonts failed" - gzip -9 *.pcf || eerror "gzipping gemini-koi8 fonts failed" - cd ${S} - cp -pPR ${WORKDIR}/ukr ${D}/usr/share/fonts \ - || eerror "copying gemini-koi8 fonts failed" - eend 0 -} - -etc_files_install() { - insinto /etc/X11 - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/xorg.conf xorg.conf.example - - exeinto /etc/X11 - # new session management script - doexe ${FILES_DIR}/chooser.sh - # new display manager script - doexe ${FILES_DIR}/startDM.sh - exeinto /etc/X11/Sessions - # doexe skips directories, so this should be safe - doexe ${FILES_DIR}/Sessions/* - insinto /etc/env.d - doins ${FILES_DIR}/10xorg - insinto /etc/X11/xinit - doins ${FILES_DIR}/xinitrc - if ! use minimal; then - exeinto /etc/X11/xdm - doexe ${FILES_DIR}/Xsession - exeinto /etc/init.d - newexe ${FILES_DIR}/xdm.start xdm - fi - if use font-server; then - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config - fi - if use pam; then - insinto /etc/pam.d - newins ${FILES_DIR}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILES_DIR}/xserver.pamd xserver - fi - if use font-server; then - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/xfs.conf.d xfs - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${PN}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/lib - fi - done - for x in ${D}/usr/$(get_libdir)/modules/extensions/libglx*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/extensions - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glxtokens.h,glext.h,glxext.h,glxmd.h,glxproto.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/include - fi - done - eend 0 -} - -cursor_install() { - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/${PN}/default/index.theme - - if ! use minimal; then - install_extra_cursors - fi -} - -strip_execs() { - if use debug || has nostrip ${FEATURES}; then - ewarn "Debug build turned on by USE=debug or FEATURES=nostrip" - ewarn "NOT stripping binaries and libraries" - else - local STRIP - if [ ! -z "${CBUILD}" ] && [ "${CBUILD}" != "${CHOST}" ]; then - STRIP=${CHOST}-strip - else - STRIP=strip - fi - einfo "Stripping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - local x - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'); do - if [ -f ${x} ]; then - # Dont do the modules ... - if [ "${x/\/usr\/$(get_libdir)\/modules}" = "${x}" ]; then - echo "$(echo ${x/${D}})" - ${STRIP} ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/lib}/*.so.* \ - $(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.*; do - if [ -f ${x} ]; then - echo "$(echo ${x/${D}})" - ${STRIP} --strip-debug ${x} || : - fi - done - fi -} - -install_extra_cursors() { - # Install TaD's gentoo cursors - insinto /usr/share/cursors/${PN}/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* -} - -minimal_install() { - # Get rid of all unnecessary fonts (saves ~5.5 MB) - find ${D}/usr/share/fonts/misc/ -name '*.pcf.gz' \ - -not -name '*6x13*' -not -name 'cursor.pcf.gz' -exec rm {} \; - # Woohoo, another 772K - rm -rf ${D}/usr/share/doc -} - -xprint_install() { - # If we want xprint, save the init script before deleting /etc/rc.d/ - # Requested on #68316 - if use xprint; then - xprint_init_install - else - # delete xprint stuff - rm -f ${D}/etc/{init,profile}.d/xprint* - rmdir --ignore-fail-on-non-empty ${D}/etc/{init,profile}.d - fi - - # Remove the /etc/rc.d nonsense -- not everyone is RedHat - rm -rf ${D}/etc/rc.d -} - -xprint_init_install() { - # RH-style init script, we provide a wrapper - exeinto /usr/$(get_libdir)/misc - doexe ${D}/etc/init.d/xprint - rm -f ${D}/etc/init.d/xprint - # Install the wrapper - newinitd ${FILES_DIR}/xprint.init xprint - # patch profile scripts - sed -i -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint get_xpserverlist:g" ${D}/etc/profile.d/xprint* - # move profile scripts, we can't touch /etc/profile.d/ in Gentoo - dodoc ${D}/etc/profile.d/xprint* - rm -f ${D}/etc/profile.d/xprint* -} - -config_files_install() { - - # Fix default config files after installing fonts to /usr/share/fonts - sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - -e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - -e "s:/usr/$(get_libdir)/fonts:/usr/share/fonts:g" \ - ${D}/etc/X11/xorg.conf.example - if use font-server; then - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ - ${D}/etc/X11/fs/config - fi - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example -} - -fix_opengl_symlinks() { - # Remove invalid symlinks - local LINK - for LINK in $(find ${D}/usr/$(get_libdir) \ - -name libGL.* -type l); do - rm -f ${LINK} - done - # Create required symlinks - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 -} - -################# -# pkg_preinst() # -################# - -# We need a symlink /usr/X11R6/dir -> /usr/dir so all the packages -# whose files we move don't lose track of them. As such, we need -# _absolutely nothing_ in /usr/X11R6/dir so we can make such a symlink. -# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004 -# -# Takes two arguments -- starting location and ending location -migrate() { - einfo "Migrating from ${1} to ${2}..." - - # Strip trailing slash - if [ -z "${1##*/}" ]; then - set -- ${1%/} ${2} - fi - - if [ -e ${ROOT}${1} ]; then - # If it's not a symlink (in other words, it should be a directory) - if [ ! -L ${ROOT}${1} ]; then - einfo " ${1} isn't a symlink, migrating..." - # Move everything - rsync \ - --archive \ - --update \ - --links \ - --hard-links \ - --ignore-existing \ - --stats \ - --progress \ - --verbose \ - ${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1 - - check_migrate_return - remove_migrated_files ${1} - - if [ -e "${ROOT}${1}" ]; then - # Remove any floating .keep files so we can run rmdir - find ${ROOT}${1} -name '\.keep' -exec rm -f {} \; - # Get rid of the directory - rmdir ${ROOT}${1} - fi - - make_symlinks ${1} - else - ewarn " ${1} is a symlink, not migrating" - fi - else - ewarn " ${1} doesn't exist, not migrating" - make_symlinks ${1} - fi -} - -check_migrate_return() { - MIGRATE_RETURN="$?" - if [ "${MIGRATE_RETURN}" -eq "0" ]; then - einfo "rsync successful!" - else - die "rsync failed. Exit code: ${MIGRATE_RETURN}." - fi - - # Migration fubars lib symlinks -- eradicator - if use amd64; then - if [[ -L ${ROOT}usr/lib64 ]]; then - rm ${ROOT}usr/lib64 - ln -s lib ${ROOT}usr/lib64 - elif [[ -L ${ROOT}usr/lib ]]; then - rm -f ${ROOT}usr/lib - ln -s lib64 ${ROOT}usr/lib - elif [[ -L ${ROOT}usr/lib32 ]]; then - if has_multilib_profile; then - ln -s lib ${ROOT}usr/lib32 - else - ln -s ../emul/linux/x86/usr/lib ${ROOT}usr/lib32 - fi - fi - fi -} - -remove_migrated_files() { - # This is a copy instead of a move, so we need to get rid of what - # we copied. This is a little risky if it fails, so just do it on - # success. - - # DO NOT proceed if we don't have an argument, or we kill root filesystem - if [ -z "${1}" ]; then - die "No argument to remove_migrated_files(). Want to `rm -rf ${ROOT}`?" - fi - - if [ "${MIGRATE_RETURN}" -eq "0" ]; then -# rm -rfv ${ROOT}${1} > ${T}/migrate-remove-${1//\//-}.log 2>&1 - rm -rfv ${ROOT}${1} - fi -} - -make_symlinks() { - # Put a symlink in its place - - # Special case: lib != libdir - if [ "${1##*/}" = "$(get_libdir)" -a "$(get_libdir)" != "lib" ]; then - einfo " Symlinking ${ROOT}usr/X11R6/lib -> $(get_libdir)" - ln -s $(get_libdir) ${ROOT}usr/X11R6/lib - # Special case: fonts - elif [ "${1##*/}" = "fonts" ]; then - einfo " Symlinking ${ROOT}${1} -> ../../share/fonts" - ln -s ../../share/fonts ${ROOT}${1} - # Special case: X11R6 - elif [ "${1##*/}" = "X11R6" ]; then - einfo " Symlinking ${ROOT}${1} -> ../usr" - ln -s ../usr ${ROOT}${1} - else - einfo " Symlinking ${ROOT}${1} -> ../${1##*/}" - ln -s ../${1##*/} ${ROOT}${1} - fi -} - -update_config_files() { - # Fix any installed config files for installing fonts to /usr/share/fonts - # This *needs* to be after all other installation so files aren't - # overwritten. - - if [ "${ROOT}" = "/" ]; then - einfo "Preparing any installed configuration files for font move..." - FILES="/etc/X11/xorg.conf - /etc/X11/XF86Config-4 - /etc/X11/XF86Config" - if use font-server; then - FILES="${FILES} /etc/X11/fs/config" - fi - # /etc/fonts/fonts.conf - # /etc/fonts/local.conf - - local FILE - for FILE in ${FILES}; do - if [ -e ${FILE} ]; then - # New font paths - sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \ - ${ROOT}${FILE} > ${IMAGE}${FILE} - - if [ "${FILE}" = "/etc/X11/xorg.conf" ] \ - || [ "${FILE}" = "/etc/X11/XF86Config" ] \ - || [ "${FILE}" = "/etc/X11/XF86Config-4" ]; then - # "keyboard" driver is deprecated and will be removed, - # switch to "kbd" - sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \ - ${IMAGE}${FILE} - - # This moved in the /usr/X11R6/libdir -> /usr/libdir change - sed -i \ - -e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/$(get_libdir)/X11/rgb"~\1"/usr/$(get_libdir)/X11/rgb"~' \ - -e 's~^\([ \t]*RgbPath[ \t]\+\)"/usr/X11R6/lib/X11/rgb"~\1"/usr/lib/X11/rgb"~' \ - ${IMAGE}${FILE} - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*\"XkbRules\".*$::g" \ - ${IMAGE}${FILE} - fi - fi - done - fi -} - -cleanup_fonts() { - local G_FONTDIRS - G_FONTDIRS="Speedo encodings local misc util" - if use truetype-fonts; then - G_FONTDIRS="${G_FONTDIRS} TTF" - fi - if use type1-fonts; then - G_FONTDIRS="${G_FONTDIRS} Type1" - fi - if use cjk; then - G_FONTDIRS="${G_FONTDIRS} CID" - fi - if use bitmap-fonts; then - G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi" - fi - if use nls; then - G_FONTDIRS="${G_FONTDIRS} cyrillic ukr" - fi - - for G_FONTDIR in ${G_FONTDIRS}; do - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - # Not Speedo or CID, as their fonts.scale files are "real" - if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]; then - find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ - -o -name 'encodings.dir' -exec rm -fv {} \; - fi - done - - # Get rid of deprecated directories so our symlinks in the same location - # work -- users shouldn't be placing fonts here so that should be fine, - # they should be using ~/.fonts or /usr/share/fonts. <spyderous> - remove_font_dirs -} - -remove_font_dirs() { - if [ -e ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then - if [ ! -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts ]; then - local G_FONTDIR - for G_FONTDIR in ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/*; do - if [ -L "${G_FONTDIR}" ]; then - einfo "Removing ${G_FONTDIR} symlink." - rm -rfv ${G_FONTDIR} - else - ewarn "${G_FONTDIR} not a symlink, moving to /usr/share/fonts" - if [ -d ${G_FONTDIR} ]; then - if [ ! -e /usr/share/fonts/${G_FONTDIR##*/} ]; then - einfo "Moving ${G_FONTDIR} to /usr/share/fonts/." - mv ${G_FONTDIR} /usr/share/fonts/ - else - ewarn "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again." - fi - else - ewarn "${G_FONTDIR} does not exist." - fi - fi - done - fi - else - ewarn "${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts does not exist." - fi -} - -move_app_defaults_to_etc() { - if [ -L ${ROOT}/etc/X11/app-defaults ]; then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/$(get_libdir)/app-defaults ] \ - && [ -d ${ROOT}/usr/$(get_libdir)/app-defaults ]; then - if [ ! -d ${ROOT}/etc/X11/app-defaults ]; then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/$(get_libdir)/app-defaults ${ROOT}/etc/X11 - fi -} - -move_xkb_to_usr() { - if [ -L ${ROOT}/usr/$(get_libdir)/xkb ]; then - rm -f ${ROOT}/usr/$(get_libdir)/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] \ - && [ -d ${ROOT}/etc/X11/xkb ]; then - if [ ! -d ${ROOT}/usr/$(get_libdir)/xkb ]; then - mkdir -p ${ROOT}/usr/$(get_libdir) - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/$(get_libdir) - fi -} - -dynamic_libgl_preinst() { - # clean the dynamic libGL stuff's home to ensure - # we don't have stale libs floating around - if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ]; then - rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/* - fi - - # make sure we do not have any stale files lying around - # that could break things. Check old and new locations. - rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL\.* \ - ${ROOT}/usr/$(get_libdir)/libGL\.* -} - -################## -# pkg_postinst() # -################## - -font_setup() { - umask 022 - - # These cause ttmkfdir to segfault :/ - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-1.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-2.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-3.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/suneu-greek.enc - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/share/fonts/encodings/encodings.dir - # - # 2) Create fonts.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir" - # Create the encodings.dir in /usr/share/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontdir -n \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${ROOT}/usr/share/fonts/encodings - - eend 0 - - ebegin "Creating fonts.scale files" - local x - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ]; then - if [ -x ${ROOT}/usr/bin/ttmkfdir ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # ttmkfdir fails on some stuff, so try mkfontscale if it does - local ttmkfdir_return=$? - else - # We didn't use ttmkfdir at all - local ttmkfdir_return=2 - fi - if [ ${ttmkfdir_return} -ne 0 ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ - -a /usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ - -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating fonts.dir files" - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontdir \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft cache" - for x in $(find ${ROOT}/usr/share/fonts/* -maxdepth 1 -type d); do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions" - find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ]; then - ebegin "Creating FC font cache" - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi -} - -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 ${PN} -} - -remove_old_compose_files() { - for x in $(find ${ROOT}/usr/$(get_libdir)/X11/locale/ -mindepth 1 -type d); do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case $(basename ${x}) in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ]; then - rm -f ${x}/Compose - fi - ;; - esac - done -} - -setup_tmp_files() { - # These need to be owned by root and the correct permissions - # (bug #8281) - local x="" - for x in ${ROOT}/tmp/.{ICE,X11}-unix; do - if [ ! -d ${x} ]; then - mkdir -p ${x} - fi - - chown root:wheel ${x} - chmod 1777 ${x} - done -} - -print_info() { - echo - einfo "Please note that the xcursors are in /usr/share/cursors/${PN}." - einfo "Any custom cursor sets should be placed in that directory." - echo - einfo "If you wish to set system-wide default cursors, please create" - einfo "/usr/local/share/cursors/${PN}/default/index.theme" - einfo "with content: \"Inherits=theme_name\" so that future" - einfo "emerges will not overwrite those settings." - echo - einfo "Listening on TCP is disabled by default with startx." - einfo "To enable it, edit /usr/bin/startx." - echo - - einfo "If you have a Radeon, set this option for direct rendering:" - einfo "Option \"ColorTiling\" \"false\"" - einfo "The Mesa in these developmental snapshots is out of date." - echo - einfo "Binary drivers may be broken in >=6.8.99.8." - einfo "See https://bugs.freedesktop.org/show_bug.cgi?id=3066." - - # (#76985) - einfo "Visit http://www.gentoo.org/doc/en/index.xml?catid=desktop" - einfo "for more information on configuring X." - - # Try to get people to read this, pending #11359 - ebeep 5 - epause 10 -} - -fix_links() { - # Fix problematic links - if [ -x ${ROOT}/usr/bin/Xorg ]; then - ln -snf ../bin ${ROOT}/usr/bin/X11 - fi -} diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest deleted file mode 100644 index a4129d5..0000000 --- a/x11-drivers/xf86-input-evdev/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86-input-evdev-9999.ebuild 766 RMD160 278f9e2992335c2cb7267167a0f28c80fcbe0f3f SHA1 c402b1345a56f2125de7ac71467edc6559310d7f SHA256 b52329b064ff0ea820a3a3e97ba505b7db62485dd868c62a1b08cf30214459cc diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild deleted file mode 100644 index 06c46e4..0000000 --- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -XDPVER=4 -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}" - -inherit git x-modular - -DESCRIPTION="Generic Linux input driver" -SRC_URI="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" - -RDEPEND="x11-base/xorg-server" -DEPEND="${RDEPEND} - || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) - >=x11-proto/inputproto-1.4 - x11-proto/randrproto - x11-proto/xproto" - -src_unpack() { - x-modular_specs_check - x-modular_server_supports_drivers_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest deleted file mode 100644 index c6eda94..0000000 --- a/x11-drivers/xf86-input-keyboard/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86-input-keyboard-9999.ebuild 607 RMD160 41ff691c51d7f174ab4d17b14426b9e2e9e64b59 SHA1 a8facf7690372c7947871d691be5948263a4df0a SHA256 8811704219350afab5f48116b378f50b7495e332240face583a9315b56c95219 diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild deleted file mode 100644 index 9ed81e0..0000000 --- a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-9999.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.3.0.ebuild,v 1.1 2008/03/24 04:07:06 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" -XDPVER="4" - -inherit x-modular - -DESCRIPTION="Keyboard input driver" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND=">=x11-base/xorg-server-1.3.99" -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/kbproto - x11-proto/randrproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest deleted file mode 100644 index 6915ae4..0000000 --- a/x11-drivers/xf86-input-mouse/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86-input-mouse-9999.ebuild 595 RMD160 501a6558d4c1ec9bcd1ba8572e9ba7b64da4e91b SHA1 ed18c1704c8f4bf0de84560e9cf50474df4a252a SHA256 7eec5fd5399c2fdadf5b2a9753edc60ec4c16b899ddf1739d17c0b48f16a4b52 diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild deleted file mode 100644 index b5dd90c..0000000 --- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-9999.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.3.0.ebuild,v 1.1 2008/03/24 04:08:35 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" -XDPVER=4 - -inherit x-modular - -DESCRIPTION="X.Org driver for mouse input devices" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/randrproto - x11-proto/xproto" diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest deleted file mode 100644 index 507030e..0000000 --- a/x11-drivers/xf86-input-vmmouse/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86-input-vmmouse-9999.ebuild 765 RMD160 1efedbc6ca6c8eab89e1ad55e92610cdb15a47cb SHA1 8f1ddfb5497f6d27b50604ce88a1df93de28158c SHA256 21624cdda3cb479798d4f6755fc76bc70979767638f9f98e71282a2f021878f7 diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild deleted file mode 100644 index 14ec43c..0000000 --- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -XDPVER=4 -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}" - -inherit git x-modular - -DESCRIPTION="VMWare mouse input driver" -SRC_URI="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" - -RDEPEND="x11-base/xorg-server" -DEPEND="${RDEPEND} - || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) - >=x11-proto/inputproto-1.4 - x11-proto/randrproto - x11-proto/xproto" - -src_unpack() { - x-modular_specs_check - x-modular_server_supports_drivers_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest deleted file mode 100644 index cc390fc..0000000 --- a/x11-drivers/xf86-video-ati/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SHA1 51dc48aba9d3e2613d230837d369ebcab86b4c5c SHA256 79540e91ab1baf462ded22a5ef0f3cff0d95bef22db4ec13ea7101dbff29aa74 -AUX r128.xinf 2491 RMD160 02f5ae030596643bdc2ce4982ee47fdbdf656f95 SHA1 cee72fd687711845f4fc435cac00b715fc19b1d3 SHA256 d8f50f12b291d526353aa5d76c95137dafbff22bf47cbb751b686252d104279b -AUX radeon.xinf 12504 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c SHA1 1f4d98536d013d3ac6999781578d381bbd94023f SHA256 f23555826bfce07dfaafba60957e347e36fdb694c71bc3ad39d172e3863e7c96 -EBUILD xf86-video-ati-9999.ebuild 1202 RMD160 783b0e1d9ab8e0898b702b8eb4cf1e9481a1083a SHA1 8e7f51642a6723e9572339291c7dc88c725a3a6f SHA256 d22adb0e88f682773d7211f22463aa20d8668356c018f35019c8df4ee5298384 -EBUILD xf86-video-ati-9999_pre12.ebuild 1265 RMD160 48ead6417f1632b97e8b95c16640c73dad5a425c SHA1 6a069a33744171c0b757b6a6170e3738f73463f8 SHA256 2a4d38aa581dc45a0bc63891ee171f2667c0d8bb7c0d0e963ba10219d26f069f diff --git a/x11-drivers/xf86-video-ati/files/ati.xinf b/x11-drivers/xf86-video-ati/files/ati.xinf deleted file mode 100644 index b089297..0000000 --- a/x11-drivers/xf86-video-ati/files/ati.xinf +++ /dev/null @@ -1,39 +0,0 @@ -alias pcivideo:v00001002d00004158sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004354sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004358sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004554sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004654sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004742sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004744sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004747sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004749sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d0000474Csv*sd*bc*sc*i* ati -alias pcivideo:v00001002d0000474Dsv*sd*bc*sc*i* ati -alias pcivideo:v00001002d0000474Esv*sd*bc*sc*i* ati -alias pcivideo:v00001002d0000474Fsv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004750sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004751sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004752sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004753sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004754sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004755sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004756sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004757sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004758sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004759sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d0000475Asv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C42sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C44sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C47sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C49sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C4Dsv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C4Esv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C50sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C51sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C52sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C53sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00004C54sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00005354sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00005654sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00005655sv*sd*bc*sc*i* ati -alias pcivideo:v00001002d00005656sv*sd*bc*sc*i* ati diff --git a/x11-drivers/xf86-video-ati/files/r128.xinf b/x11-drivers/xf86-video-ati/files/r128.xinf deleted file mode 100644 index 7101783..0000000 --- a/x11-drivers/xf86-video-ati/files/r128.xinf +++ /dev/null @@ -1,47 +0,0 @@ -alias pcivideo:v00001002d00004C45sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00004C46sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00004D46sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00004D4Csv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005041sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005042sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005043sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005044sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005045sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005046sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005047sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005048sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005049sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Asv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Bsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Csv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Dsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Esv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000504Fsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005050sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005051sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005052sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005053sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005054sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005055sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005056sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005057sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005058sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005245sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005246sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005247sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000524Bsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000524Csv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005345sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005346sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005347sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005348sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000534Bsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000534Csv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000534Dsv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000534Esv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005446sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d0000544Csv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005452sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005453sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005454sv*sd*bc*sc*i* r128 -alias pcivideo:v00001002d00005455sv*sd*bc*sc*i* r128 diff --git a/x11-drivers/xf86-video-ati/files/radeon.xinf b/x11-drivers/xf86-video-ati/files/radeon.xinf deleted file mode 100644 index 1eaf4e1..0000000 --- a/x11-drivers/xf86-video-ati/files/radeon.xinf +++ /dev/null @@ -1,197 +0,0 @@ -# Secret decoder ring: -# R100: Original radeon through 7500 (rv200 counts as R100) -# R200: 8500 through 9250 -# R300: 9500 through X600 -# R400: X700 through X850 -# R500: X1xxx -# -# TODO: add mobility series info -# -# There are lots of "secondary" PCI IDs for that other OS; we don't list -# them here and the driver ignores them anyway. - -alias pcivideo:v00001002d00003150sv*sd*bc*sc*i* radeon # M24 -alias pcivideo:v00001002d00003151sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003152sv*sd*bc*sc*i* radeon # M22 -alias pcivideo:v00001002d00003153sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003154sv*sd*bc*sc*i* radeon # M24 -alias pcivideo:v00001002d00003156sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003E50sv*sd*bc*sc*i* radeon # rv380 -alias pcivideo:v00001002d00003E51sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003E52sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003E53sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00003E54sv*sd*bc*sc*i* radeon # rv380 -alias pcivideo:v00001002d00003E56sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00004136sv*sd*bc*sc*i* radeon # IGP 320M -alias pcivideo:v00001002d00004137sv*sd*bc*sc*i* radeon # IGP 3[345]0 -alias pcivideo:v00001002d00004144sv*sd*bc*sc*i* radeon # R300 AD -alias pcivideo:v00001002d00004145sv*sd*bc*sc*i* radeon # R300 AE -alias pcivideo:v00001002d00004146sv*sd*bc*sc*i* radeon # R300 AF -alias pcivideo:v00001002d00004147sv*sd*bc*sc*i* radeon # R300 AG -alias pcivideo:v00001002d00004148sv*sd*bc*sc*i* radeon # R350 AH -alias pcivideo:v00001002d00004149sv*sd*bc*sc*i* radeon # R350 AI -alias pcivideo:v00001002d0000414Asv*sd*bc*sc*i* radeon # R350 AJ -alias pcivideo:v00001002d0000414Bsv*sd*bc*sc*i* radeon # R350 AK -alias pcivideo:v00001002d00004150sv*sd*bc*sc*i* radeon # RV350 AP -alias pcivideo:v00001002d00004151sv*sd*bc*sc*i* radeon # RV350 AQ -alias pcivideo:v00001002d00004152sv*sd*bc*sc*i* radeon # RV350 AR -alias pcivideo:v00001002d00004153sv*sd*bc*sc*i* radeon # RV350 AS -alias pcivideo:v00001002d00004154sv*sd*bc*sc*i* radeon # RV350 AT -alias pcivideo:v00001002d00004155sv*sd*bc*sc*i* radeon # RV350 AU -alias pcivideo:v00001002d00004156sv*sd*bc*sc*i* radeon # RV350 AV -alias pcivideo:v00001002d00004157sv*sd*bc*sc*i* radeon # RV350 AW -alias pcivideo:v00001002d00004237sv*sd*bc*sc*i* radeon # 7000 IGP -alias pcivideo:v00001002d00004242sv*sd*bc*sc*i* radeon # R200 BB -alias pcivideo:v00001002d00004243sv*sd*bc*sc*i* radeon # R200 DC -alias pcivideo:v00001002d00004336sv*sd*bc*sc*i* radeon # Mobility U1 -alias pcivideo:v00001002d00004337sv*sd*bc*sc*i* radeon # IGP 3[345]0M -alias pcivideo:v00001002d00004437sv*sd*bc*sc*i* radeon # Mobility 7000 IGP -alias pcivideo:v00001002d00004964sv*sd*bc*sc*i* radeon # RV250 Id -alias pcivideo:v00001002d00004965sv*sd*bc*sc*i* radeon # RV250 Ie -alias pcivideo:v00001002d00004966sv*sd*bc*sc*i* radeon # RV250 If -alias pcivideo:v00001002d00004967sv*sd*bc*sc*i* radeon # RV250 Ig -alias pcivideo:v00001002d00004A48sv*sd*bc*sc*i* radeon # R420 JH -alias pcivideo:v00001002d00004A49sv*sd*bc*sc*i* radeon # R420 JI -alias pcivideo:v00001002d00004A4Asv*sd*bc*sc*i* radeon # R420 JJ -alias pcivideo:v00001002d00004A4Bsv*sd*bc*sc*i* radeon # R420 JK -alias pcivideo:v00001002d00004A4Csv*sd*bc*sc*i* radeon # R420 JL -alias pcivideo:v00001002d00004A4Dsv*sd*bc*sc*i* radeon # R420 JM -alias pcivideo:v00001002d00004A4Esv*sd*bc*sc*i* radeon # M18 JN -alias pcivideo:v00001002d00004A50sv*sd*bc*sc*i* radeon # R420 JP -alias pcivideo:v00001002d00004A54sv*sd*bc*sc*i* radeon # R420 JT -alias pcivideo:v00001002d00004B49sv*sd*bc*sc*i* radeon # R480 -alias pcivideo:v00001002d00004B4Asv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00004B4Bsv*sd*bc*sc*i* radeon # R480 -alias pcivideo:v00001002d00004B4Csv*sd*bc*sc*i* radeon # R481 -alias pcivideo:v00001002d00004C57sv*sd*bc*sc*i* radeon # M7 LW -alias pcivideo:v00001002d00004C58sv*sd*bc*sc*i* radeon # M7 LX -alias pcivideo:v00001002d00004C59sv*sd*bc*sc*i* radeon # M6 LY -alias pcivideo:v00001002d00004C5Asv*sd*bc*sc*i* radeon # M6 LZ -alias pcivideo:v00001002d00004C64sv*sd*bc*sc*i* radeon # M9 Ld -alias pcivideo:v00001002d00004C65sv*sd*bc*sc*i* radeon # M9 Le -alias pcivideo:v00001002d00004C66sv*sd*bc*sc*i* radeon # R250 Lf -alias pcivideo:v00001002d00004C67sv*sd*bc*sc*i* radeon # R250 Lg -# alias pcivideo:v00001002d00004C6Esv*sd*bc*sc*i* radeon # secondary -alias pcivideo:v00001002d00004E44sv*sd*bc*sc*i* radeon # R300 ND -alias pcivideo:v00001002d00004E45sv*sd*bc*sc*i* radeon # R300 NE -alias pcivideo:v00001002d00004E46sv*sd*bc*sc*i* radeon # RV350 NF -alias pcivideo:v00001002d00004E47sv*sd*bc*sc*i* radeon # R300 NG -alias pcivideo:v00001002d00004E48sv*sd*bc*sc*i* radeon # R350 NH -alias pcivideo:v00001002d00004E49sv*sd*bc*sc*i* radeon # R350 NI -alias pcivideo:v00001002d00004E4Asv*sd*bc*sc*i* radeon # RV350 NJ -alias pcivideo:v00001002d00004E4Bsv*sd*bc*sc*i* radeon # R350 NK -alias pcivideo:v00001002d00004E50sv*sd*bc*sc*i* radeon # RV350 NP -alias pcivideo:v00001002d00004E51sv*sd*bc*sc*i* radeon # M10 NQ -alias pcivideo:v00001002d00004E52sv*sd*bc*sc*i* radeon # RV350 NR -alias pcivideo:v00001002d00004E53sv*sd*bc*sc*i* radeon # M10 NS -alias pcivideo:v00001002d00004E54sv*sd*bc*sc*i* radeon # M10 NT -alias pcivideo:v00001002d00004E56sv*sd*bc*sc*i* radeon # M10 NV -# 4F72? seems unlikely, in a secondary range. -alias pcivideo:v00001002d00005144sv*sd*bc*sc*i* radeon # R100 QD -alias pcivideo:v00001002d00005145sv*sd*bc*sc*i* radeon # R100 QE -alias pcivideo:v00001002d00005146sv*sd*bc*sc*i* radeon # R100 QF -alias pcivideo:v00001002d00005147sv*sd*bc*sc*i* radeon # R100 QG -# old school method of doing magic names for subdevices -# alias pcivideo:v00001002d00005148sv00001002sd0000010Abc*sc*i* radeon -# alias pcivideo:v00001002d00005148sv00001002sd00000152bc*sc*i* radeon -# alias pcivideo:v00001002d00005148sv00001002sd00000162bc*sc*i* radeon -# alias pcivideo:v00001002d00005148sv00001002sd00000172bc*sc*i* radeon -alias pcivideo:v00001002d00005148sv*sd*bc*sc*i* radeon # R200 QH -alias pcivideo:v00001002d00005149sv*sd*bc*sc*i* radeon # R200 QI -alias pcivideo:v00001002d0000514Asv*sd*bc*sc*i* radeon # R200 QJ -alias pcivideo:v00001002d0000514Bsv*sd*bc*sc*i* radeon # R200 QK -alias pcivideo:v00001002d0000514Csv*sd*bc*sc*i* radeon # R200 QL -alias pcivideo:v00001002d0000514Dsv*sd*bc*sc*i* radeon # R200 QM -alias pcivideo:v00001002d0000514Esv*sd*bc*sc*i* radeon # R200 QN -alias pcivideo:v00001002d0000514Fsv*sd*bc*sc*i* radeon # R200 QO -alias pcivideo:v00001002d00005154sv*sd*bc*sc*i* radeon # R200 QT -alias pcivideo:v00001002d00005155sv*sd*bc*sc*i* radeon # R200 QU -alias pcivideo:v00001002d00005157sv*sd*bc*sc*i* radeon # RV200 QW -alias pcivideo:v00001002d00005158sv*sd*bc*sc*i* radeon # RV200 QX -# alias pcivideo:v00001002d00005159sv00001002sd0000000Bbc*sc*i* radeon -# alias pcivideo:v00001002d00005159sv00001002sd0000013Abc*sc*i* radeon -alias pcivideo:v00001002d00005159sv*sd*bc*sc*i* radeon # RV200 QY -alias pcivideo:v00001002d0000515Asv*sd*bc*sc*i* radeon # RV200 QZ -alias pcivideo:v00001002d0000515Esv*sd*bc*sc*i* radeon # ES1000 -alias pcivideo:v00001002d0000515Fsv*sd*bc*sc*i* radeon # ES1000 (?) -alias pcivideo:v00001002d00005168sv*sd*bc*sc*i* radeon # R200 Qh -alias pcivideo:v00001002d00005169sv*sd*bc*sc*i* radeon # R200 Qi -alias pcivideo:v00001002d0000516Asv*sd*bc*sc*i* radeon # R200 Qj -alias pcivideo:v00001002d0000516Bsv*sd*bc*sc*i* radeon # R200 Qk -alias pcivideo:v00001002d0000516Csv*sd*bc*sc*i* radeon # R200 Ql -alias pcivideo:v00001002d00005460sv*sd*bc*sc*i* radeon # M22 -alias pcivideo:v00001002d00005461sv*sd*bc*sc*i* radeon # M24 -alias pcivideo:v00001002d00005462sv*sd*bc*sc*i* radeon # M22 -alias pcivideo:v00001002d00005463sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005464sv*sd*bc*sc*i* radeon # M22 -alias pcivideo:v00001002d00005465sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005466sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005467sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005548sv*sd*bc*sc*i* radeon # R423 UH -alias pcivideo:v00001002d00005549sv*sd*bc*sc*i* radeon # R423 UI -alias pcivideo:v00001002d0000554Asv*sd*bc*sc*i* radeon # R423 UJ -alias pcivideo:v00001002d0000554Bsv*sd*bc*sc*i* radeon # R423 UK -alias pcivideo:v00001002d0000554Csv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d0000554Dsv*sd*bc*sc*i* radeon # R430 UM -alias pcivideo:v00001002d0000554Esv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d0000554Fsv*sd*bc*sc*i* radeon # R430 UO -alias pcivideo:v00001002d00005550sv*sd*bc*sc*i* radeon # R423 UP -alias pcivideo:v00001002d00005551sv*sd*bc*sc*i* radeon # R423 UQ -alias pcivideo:v00001002d00005552sv*sd*bc*sc*i* radeon # R423 UR -alias pcivideo:v00001002d00005554sv*sd*bc*sc*i* radeon # R423 UT -alias pcivideo:v00001002d0000564Asv*sd*bc*sc*i* radeon # M26 -alias pcivideo:v00001002d0000564Bsv*sd*bc*sc*i* radeon # M26 -alias pcivideo:v00001002d0000564Fsv*sd*bc*sc*i* radeon # M26 -alias pcivideo:v00001002d00005652sv*sd*bc*sc*i* radeon # M26 -alias pcivideo:v00001002d00005653sv*sd*bc*sc*i* radeon # M26 -alias pcivideo:v00001002d00005834sv*sd*bc*sc*i* radeon # RS300M -alias pcivideo:v00001002d00005835sv*sd*bc*sc*i* radeon # RS300M -alias pcivideo:v00001002d00005836sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005837sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005944sv*sd*bc*sc*i* radeon # RV280 -alias pcivideo:v00001002d00005954sv*sd*bc*sc*i* radeon # RS480 -alias pcivideo:v00001002d00005955sv*sd*bc*sc*i* radeon # RS482 -alias pcivideo:v00001002d00005960sv*sd*bc*sc*i* radeon # RV280 -alias pcivideo:v00001002d00005961sv*sd*bc*sc*i* radeon # RV280 -alias pcivideo:v00001002d00005962sv*sd*bc*sc*i* radeon # RV280 -alias pcivideo:v00001002d00005964sv*sd*bc*sc*i* radeon # RV280 -alias pcivideo:v00001002d00005965sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005969sv*sd*bc*sc*i* radeon # ES1000 -alias pcivideo:v00001002d00005974sv*sd*bc*sc*i* radeon # RS482 -alias pcivideo:v00001002d00005975sv*sd*bc*sc*i* radeon # RS482 -alias pcivideo:v00001002d00005A41sv*sd*bc*sc*i* radeon # RS400 -alias pcivideo:v00001002d00005A42sv*sd*bc*sc*i* radeon # RS400 -alias pcivideo:v00001002d00005A61sv*sd*bc*sc*i* radeon # RC410 -alias pcivideo:v00001002d00005A62sv*sd*bc*sc*i* radeon # RC410 -alias pcivideo:v00001002d00005B60sv*sd*bc*sc*i* radeon # RV370 -alias pcivideo:v00001002d00005B61sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005B62sv*sd*bc*sc*i* radeon # RV380 -alias pcivideo:v00001002d00005B63sv*sd*bc*sc*i* radeon # RV370 -alias pcivideo:v00001002d00005B64sv*sd*bc*sc*i* radeon # RV370 -alias pcivideo:v00001002d00005B65sv*sd*bc*sc*i* radeon # RV370 -alias pcivideo:v00001002d00005B66sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005B67sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005B70sv*sd*bc*sc*i* radeon # RV370 -alias pcivideo:v00001002d00005B72sv*sd*bc*sc*i* radeon # RV380 -alias pcivideo:v00001002d00005C61sv*sd*bc*sc*i* radeon # M9+ -alias pcivideo:v00001002d00005C63sv*sd*bc*sc*i* radeon # M9+ -alias pcivideo:v00001002d00005D48sv*sd*bc*sc*i* radeon # M28 -alias pcivideo:v00001002d00005D49sv*sd*bc*sc*i* radeon # M28 -alias pcivideo:v00001002d00005D4Asv*sd*bc*sc*i* radeon # M28 -alias pcivideo:v00001002d00005D4Csv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005D4Dsv*sd*bc*sc*i* radeon # R480 -alias pcivideo:v00001002d00005D4Esv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005D4Fsv*sd*bc*sc*i* radeon # R480 -alias pcivideo:v00001002d00005D50sv*sd*bc*sc*i* radeon # XXX not in pci.ids -alias pcivideo:v00001002d00005D52sv*sd*bc*sc*i* radeon # R480 -alias pcivideo:v00001002d00005D57sv*sd*bc*sc*i* radeon # R423 -alias pcivideo:v00001002d00005E48sv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005E49sv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005E4Asv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005E4Bsv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005E4Csv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005E4Dsv*sd*bc*sc*i* radeon # RV410 -alias pcivideo:v00001002d00005F57sv*sd*bc*sc*i* radeon # R423 -alias pcivideo:v00001002d00007834sv*sd*bc*sc*i* radeon # 9100 IGP -alias pcivideo:v00001002d00007835sv*sd*bc*sc*i* radeon # 9200 IGP -alias pcivideo:v00001002d00007C37sv*sd*bc*sc*i* radeon # RV350 diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild deleted file mode 100644 index c9eff01..0000000 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild,v 1.1 2007/05/21 05:25:33 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -XDPVER=4 - -inherit x-modular git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}" - -DESCRIPTION="ATI video driver" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -SRC_URI="" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2" -DEPEND="${RDEPEND} - >=x11-misc/util-macros-1.1.3 - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xf86miscproto - x11-proto/xproto - dri? ( x11-proto/glproto - x11-proto/xf86driproto - >=x11-libs/libdrm-2 )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -pkg_setup() { - if use dri && ! built_with_use x11-base/xorg-server dri; then - die "Build x11-base/xorg-server with USE=dri." - fi -} - -src_unpack() { - x-modular_specs_check - x-modular_server_supports_drivers_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999_pre12.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999_pre12.ebuild deleted file mode 100644 index 46af34f..0000000 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999_pre12.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild,v 1.1 2007/05/21 05:25:33 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" -XDPVER=4 - -EGIT_BRANCH="randr-1.2" - -inherit x-modular git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}" - -DESCRIPTION="ATI video driver -- RandR 1.2 (monitor hotplug) branch" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -SRC_URI="" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2" -DEPEND="${RDEPEND} - >=x11-misc/util-macros-1.1.3 - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xf86miscproto - x11-proto/xproto - dri? ( x11-proto/glproto - x11-proto/xf86driproto - >=x11-libs/libdrm-2 )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -pkg_setup() { - if use dri && ! built_with_use x11-base/xorg-server dri; then - die "Build x11-base/xorg-server with USE=dri." - fi -} - -src_unpack() { - x-modular_specs_check - x-modular_server_supports_drivers_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest deleted file mode 100644 index 5bbbaeb..0000000 --- a/x11-drivers/xf86-video-intel/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -EBUILD xf86-video-intel-9999.ebuild 1236 RMD160 cdc5b1c795cdb88c2f77024e536900901af35a72 SHA1 06c17dcfa2071440ff6c75c359cf77213cb9a85e SHA256 beffec6074a77b4e2597fcc4e1a69774cf88fefc53379c1200b14670e676e83e -MD5 124281b7e0abfb9991c76c580534401c xf86-video-intel-9999.ebuild 1236 -RMD160 cdc5b1c795cdb88c2f77024e536900901af35a72 xf86-video-intel-9999.ebuild 1236 -SHA256 beffec6074a77b4e2597fcc4e1a69774cf88fefc53379c1200b14670e676e83e xf86-video-intel-9999.ebuild 1236 diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild deleted file mode 100644 index fc3b802..0000000 --- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-2.0.0.ebuild,v 1.1 2007/04/21 05:56:37 joshuabaergen Exp $ - -# Must be before x-modular eclass is inherited -# Enable snapshot to get the man page in the right place -# This should be fixed with a XDP patch later -SNAPSHOT="yes" -XDPVER=-1 - -inherit x-modular git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/driver/${PN}" - -DESCRIPTION="X.Org driver for Intel cards" - -KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd" -SRC_URI="" -IUSE="dri" - -RDEPEND=">=x11-base/xorg-server-1.2 - x11-libs/libXvMC" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/xextproto - x11-proto/xproto - dri? ( x11-proto/xf86driproto - >=x11-libs/libdrm-2.2 - x11-libs/libX11 )" - -CONFIGURE_OPTIONS="$(use_enable dri)" - -pkg_setup() { - if use dri && ! built_with_use x11-base/xorg-server dri; then - die "Build x11-base/xorg-server with USE=dri." - fi -} - -src_unpack() { - x-modular_specs_check - x-modular_server_supports_drivers_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest deleted file mode 100644 index 4cba0ba..0000000 --- a/x11-libs/cairo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX 22336.patch 40606 RMD160 afb7cf9253b1e3f688ef6ce0ce6e103423e89feb SHA1 3ee4c5b39e9f9cfaa13c89b28971e2896067769d SHA256 e8d0214bbc6c155e790a4e0aef5c9855eb3109de2702a9fcbf57b80b9b98d7d5 -EBUILD cairo-9999.ebuild 2189 RMD160 a0b84dab327824c78f32682aa807296768e0b941 SHA1 79fad559da8509c8c7becc1cb946498d8dfdd067 SHA256 5ed4fc36129332dce2628f7b4bf92415ae55053bb873a9e07c6de3ee179c32fa diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild deleted file mode 100644 index 9547bef..0000000 --- a/x11-libs/cairo/cairo-9999.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.4.ebuild,v 1.1 2006/08/26 01:06:47 cardoe Exp $ - -inherit eutils flag-o-matic autotools git - -EGIT_REPO_URI="git://git.cairographics.org/git/cairo" -#EGIT_BOOTSTRAP="eautoreconf" -EGIT_PATCHES="${FILESDIR}/*.patch" - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -#SRC_URI="http://cairographics.org/releases/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="directfb doc glitz pdf png svg X xcb" - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2.1.4 - X? ( - || ( - ( - x11-libs/libXrender - x11-libs/libXext - x11-libs/libX11 - ) - virtual/x11 - ) - virtual/xft - ) - xcb? ( >=x11-libs/libxcb-1.1.90.1 ) - directfb? ( >=dev-libs/DirectFB-0.9.24 ) - glitz? ( >=media-libs/glitz-0.5.1 ) - png? ( media-libs/libpng ) - svg? ( dev-libs/libxml2 ) - !<x11-libs/cairo-0.2" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - X? ( || ( x11-proto/renderproto virtual/x11 ) ) - doc? ( - >=dev-util/gtk-doc-1.3 - ~app-text/docbook-xml-dtd-4.2 - )" - -src_unpack() { - git_src_unpack - cd "${S}" - touch boilerplate/Makefile.am.features src/Makefile.am.features ChangeLog - eautoreconf -} - -src_compile() { - #gets rid of fbmmx.c inlining warnings - append-flags -finline-limit=1200 - - econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \ - $(use_enable png) $(use_enable svg) $(use_enable pdf) \ - $(use_enable xcb) \ - $(use_enable glitz) --enable-freetype --enable-ps \ - || die "configure failed" - - emake || die "compile failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} - -pkg_postinst() { - echo - ewarn "You will most likely need to run revdep-rebuild after emerging this" - echo -} diff --git a/x11-libs/cairo/files/22336.patch b/x11-libs/cairo/files/22336.patch deleted file mode 100644 index a78c0fe..0000000 --- a/x11-libs/cairo/files/22336.patch +++ /dev/null @@ -1,1343 +0,0 @@ -diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c -index dedd337..64a8911 100644 ---- a/src/cairo-font-options.c -+++ b/src/cairo-font-options.c -@@ -39,6 +39,7 @@ - static const cairo_font_options_t _cairo_font_options_nil = { - CAIRO_ANTIALIAS_DEFAULT, - CAIRO_SUBPIXEL_ORDER_DEFAULT, -+ CAIRO_LCD_FILTER_DEFAULT, - CAIRO_HINT_STYLE_DEFAULT, - CAIRO_HINT_METRICS_DEFAULT - }; -@@ -54,6 +55,7 @@ _cairo_font_options_init_default (cairo_font_options_t *options) - { - options->antialias = CAIRO_ANTIALIAS_DEFAULT; - options->subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; -+ options->lcd_filter = CAIRO_LCD_FILTER_DEFAULT; - options->hint_style = CAIRO_HINT_STYLE_DEFAULT; - options->hint_metrics = CAIRO_HINT_METRICS_DEFAULT; - } -@@ -64,6 +66,7 @@ _cairo_font_options_init_copy (cairo_font_options_t *options, - { - options->antialias = other->antialias; - options->subpixel_order = other->subpixel_order; -+ options->lcd_filter = other->lcd_filter; - options->hint_style = other->hint_style; - options->hint_metrics = other->hint_metrics; - } -@@ -189,6 +192,8 @@ cairo_font_options_merge (cairo_font_options_t *options, - options->antialias = other->antialias; - if (other->subpixel_order != CAIRO_SUBPIXEL_ORDER_DEFAULT) - options->subpixel_order = other->subpixel_order; -+ if (other->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) -+ options->lcd_filter = other->lcd_filter; - if (other->hint_style != CAIRO_HINT_STYLE_DEFAULT) - options->hint_style = other->hint_style; - if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT) -@@ -221,6 +226,7 @@ cairo_font_options_equal (const cairo_font_options_t *options, - - return (options->antialias == other->antialias && - options->subpixel_order == other->subpixel_order && -+ options->lcd_filter == other->lcd_filter && - options->hint_style == other->hint_style && - options->hint_metrics == other->hint_metrics); - } -@@ -246,7 +252,8 @@ cairo_font_options_hash (const cairo_font_options_t *options) - - return ((options->antialias) | - (options->subpixel_order << 4) | -- (options->hint_style << 8) | -+ (options->lcd_filter << 8) | -+ (options->hint_style << 12) | - (options->hint_metrics << 16)); - } - slim_hidden_def (cairo_font_options_hash); -@@ -328,6 +335,48 @@ cairo_font_options_get_subpixel_order (const cairo_font_options_t *options) - } - - /** -+ * _cairo_font_options_set_lcd_filter: -+ * @options: a #cairo_font_options_t -+ * @lcd_filter: the new LCD filter -+ * -+ * Sets the LCD filter for the font options object. The LCD filter -+ * specifies how pixels are filtered when rendered with an antialiasing -+ * mode of %CAIRO_ANTIALIAS_SUBPIXEL. See the documentation for -+ * #cairo_lcd_filter_t for full details. -+ * -+ * Since: 1.8 -+ **/ -+void -+_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, -+ cairo_lcd_filter_t lcd_filter) -+{ -+ if (cairo_font_options_status (options)) -+ return; -+ -+ options->lcd_filter = lcd_filter; -+} -+ -+/** -+ * _cairo_font_options_get_lcd_filter: -+ * @options: a #cairo_font_options_t -+ * -+ * Gets the LCD filter for the font options object. -+ * See the documentation for #cairo_lcd_filter_t for full details. -+ * -+ * Return value: the LCD filter for the font options object -+ * -+ * Since: 1.8 -+ **/ -+cairo_lcd_filter_t -+_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options) -+{ -+ if (cairo_font_options_status ((cairo_font_options_t *) options)) -+ return CAIRO_LCD_FILTER_DEFAULT; -+ -+ return options->lcd_filter; -+} -+ -+/** - * cairo_font_options_set_hint_style: - * @options: a #cairo_font_options_t - * @hint_style: the new hint style -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 17699de..aaf8620 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -57,6 +57,30 @@ - #include FT_SYNTHESIS_H - #endif - -+#if HAVE_FT_LIBRARY_SETLCDFILTER -+#include FT_LCD_FILTER_H -+#endif -+ -+/* Fontconfig version older than 2.6 didn't have these options */ -+#ifndef FC_LCD_FILTER -+#define FC_LCD_FILTER "lcdfilter" -+#endif -+/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */ -+#ifndef FC_LCD_NONE -+#define FC_LCD_NONE 0 -+#define FC_LCD_DEFAULT 1 -+#define FC_LCD_LIGHT 2 -+#define FC_LCD_LEGACY 3 -+#endif -+ -+/* FreeType version older than 2.3.5(?) didn't have these options */ -+#ifndef FT_LCD_FILTER_NONE -+#define FT_LCD_FILTER_NONE 0 -+#define FT_LCD_FILTER_DEFAULT 1 -+#define FT_LCD_FILTER_LIGHT 2 -+#define FT_LCD_FILTER_LEGACY 16 -+#endif -+ - #define DOUBLE_TO_26_6(d) ((FT_F26Dot6)((d) * 64.0)) - #define DOUBLE_FROM_26_6(t) ((double)(t) / 64.0) - #define DOUBLE_TO_16_16(d) ((FT_Fixed)((d) * 65536.0)) -@@ -168,6 +192,25 @@ typedef struct _cairo_ft_unscaled_font_map { - int num_open_faces; - } cairo_ft_unscaled_font_map_t; - -+static cairo_bool_t _ft_can_lcd_filter (void) { -+#if HAVE_FT_LIBRARY_SETLCDFILTER -+ FT_Library library; -+ FT_Error fterror; -+ -+ FT_Init_FreeType(&library); -+ fterror = FT_Library_SetLcdFilter(library, FT_LCD_FILTER_DEFAULT); -+ -+ if (fterror != FT_Err_Unimplemented_Feature) -+ return TRUE; -+ else -+ return FALSE; -+ -+ FT_Done_FreeType(library); -+#else -+ return FALSE; -+#endif -+} -+ - static cairo_ft_unscaled_font_map_t *cairo_ft_unscaled_font_map = NULL; - - static void -@@ -746,6 +789,282 @@ _cairo_ft_unscaled_font_set_scale (cairo_ft_unscaled_font_t *unscaled, - return CAIRO_STATUS_SUCCESS; - } - -+/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot -+ * into a different format. For example, we want to convert a -+ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit -+ * ARGB or ABGR bitmap. -+ * -+ * this function prepares a target descriptor for this operation. -+ * -+ * input :: target bitmap descriptor. The function will set its -+ * 'width', 'rows' and 'pitch' fields, and only these -+ * -+ * slot :: the glyph slot containing the source bitmap. this -+ * function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP -+ * -+ * mode :: the requested final rendering mode. supported values are -+ * MONO, NORMAL (i.e. gray), LCD and LCD_V -+ * -+ * the function returns the size in bytes of the corresponding buffer, -+ * it's up to the caller to allocate the corresponding memory block -+ * before calling _fill_xrender_bitmap -+ * -+ * it also returns -1 in case of error (e.g. incompatible arguments, -+ * like trying to convert a gray bitmap into a monochrome one) -+ */ -+static int -+_compute_xrender_bitmap_size(FT_Bitmap *target, -+ FT_GlyphSlot slot, -+ FT_Render_Mode mode) -+{ -+ FT_Bitmap *ftbit; -+ int width, height, pitch; -+ -+ if (slot->format != FT_GLYPH_FORMAT_BITMAP) -+ return -1; -+ -+ /* compute the size of the final bitmap */ -+ ftbit = &slot->bitmap; -+ -+ width = ftbit->width; -+ height = ftbit->rows; -+ pitch = (width + 3) & ~3; -+ -+ switch (ftbit->pixel_mode) { -+ case FT_PIXEL_MODE_MONO: -+ if (mode == FT_RENDER_MODE_MONO) { -+ pitch = (((width + 31) & ~31) >> 3); -+ break; -+ } -+ /* fall-through */ -+ -+ case FT_PIXEL_MODE_GRAY: -+ if (mode == FT_RENDER_MODE_LCD || -+ mode == FT_RENDER_MODE_LCD_V) -+ { -+ /* each pixel is replicated into a 32-bit ARGB value */ -+ pitch = width * 4; -+ } -+ break; -+ -+ case FT_PIXEL_MODE_LCD: -+ if (mode != FT_RENDER_MODE_LCD) -+ return -1; -+ -+ /* horz pixel triplets are packed into 32-bit ARGB values */ -+ width /= 3; -+ pitch = width * 4; -+ break; -+ -+ case FT_PIXEL_MODE_LCD_V: -+ if (mode != FT_RENDER_MODE_LCD_V) -+ return -1; -+ -+ /* vert pixel triplets are packed into 32-bit ARGB values */ -+ height /= 3; -+ pitch = width * 4; -+ break; -+ -+ default: /* unsupported source format */ -+ return -1; -+ } -+ -+ target->width = width; -+ target->rows = height; -+ target->pitch = pitch; -+ target->buffer = NULL; -+ -+ return pitch * height; -+} -+ -+/* this functions converts the glyph bitmap found in a FT_GlyphSlot -+ * into a different format (see _compute_xrender_bitmap_size) -+ * -+ * you should call this function after _compute_xrender_bitmap_size -+ * -+ * target :: target bitmap descriptor. Note that its 'buffer' pointer -+ * must point to memory allocated by the caller -+ * -+ * slot :: the glyph slot containing the source bitmap -+ * -+ * mode :: the requested final rendering mode -+ * -+ * bgr :: boolean, set if BGR or VBGR pixel ordering is needed -+ */ -+static void -+_fill_xrender_bitmap(FT_Bitmap *target, -+ FT_GlyphSlot slot, -+ FT_Render_Mode mode, -+ int bgr) -+{ -+ FT_Bitmap *ftbit = &slot->bitmap; -+ unsigned char *srcLine = ftbit->buffer; -+ unsigned char *dstLine = target->buffer; -+ int src_pitch = ftbit->pitch; -+ int width = target->width; -+ int height = target->rows; -+ int pitch = target->pitch; -+ int subpixel; -+ int h; -+ -+ subpixel = (mode == FT_RENDER_MODE_LCD || -+ mode == FT_RENDER_MODE_LCD_V); -+ -+ if (src_pitch < 0) -+ srcLine -= src_pitch * (ftbit->rows - 1); -+ -+ target->pixel_mode = ftbit->pixel_mode; -+ -+ switch (ftbit->pixel_mode) { -+ case FT_PIXEL_MODE_MONO: -+ if (subpixel) { -+ /* convert mono to ARGB32 values */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { -+ int x; -+ -+ for (x = 0; x < width; x++) { -+ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) -+ ((unsigned int *) dstLine)[x] = 0xffffffffU; -+ } -+ } -+ target->pixel_mode = FT_PIXEL_MODE_LCD; -+ -+ } else if (mode == FT_RENDER_MODE_NORMAL) { -+ /* convert mono to 8-bit gray */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { -+ int x; -+ -+ for (x = 0; x < width; x++) { -+ if (srcLine[(x >> 3)] & (0x80 >> (x & 7))) -+ dstLine[x] = 0xff; -+ } -+ } -+ target->pixel_mode = FT_PIXEL_MODE_GRAY; -+ -+ } else { -+ /* copy mono to mono */ -+ -+ int bytes = (width + 7) >> 3; -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) -+ memcpy (dstLine, srcLine, bytes); -+ } -+ break; -+ -+ case FT_PIXEL_MODE_GRAY: -+ if (subpixel) { -+ /* convert gray to ARGB32 values */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { -+ int x; -+ unsigned int *dst = (unsigned int *) dstLine; -+ -+ for (x = 0; x < width; x++) { -+ unsigned int pix = srcLine[x]; -+ -+ pix |= (pix << 8); -+ pix |= (pix << 16); -+ -+ dst[x] = pix; -+ } -+ } -+ target->pixel_mode = FT_PIXEL_MODE_LCD; -+ } else { -+ /* copy gray into gray */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) -+ memcpy (dstLine, srcLine, width); -+ } -+ break; -+ -+ case FT_PIXEL_MODE_LCD: -+ if (!bgr) { -+ /* convert horizontal RGB into ARGB32 */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { -+ int x; -+ unsigned char *src = srcLine; -+ unsigned int *dst = (unsigned int *) dstLine; -+ -+ for (x = 0; x < width; x++, src += 3) { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[0] << 16) | -+ ((unsigned int)src[1] << 8) | -+ ((unsigned int)src[2] ) | -+ ((unsigned int)src[1] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } else { -+ /* convert horizontal BGR into ARGB32 */ -+ -+ for (h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch) { -+ -+ int x; -+ unsigned char *src = srcLine; -+ unsigned int *dst = (unsigned int *) dstLine; -+ -+ for (x = 0; x < width; x++, src += 3) { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[2] << 16) | -+ ((unsigned int)src[1] << 8) | -+ ((unsigned int)src[0] ) | -+ ((unsigned int)src[1] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ break; -+ -+ default: /* FT_PIXEL_MODE_LCD_V */ -+ /* convert vertical RGB into ARGB32 */ -+ if (!bgr) { -+ -+ for (h = height; h > 0; h--, srcLine += 3 * src_pitch, dstLine += pitch) { -+ int x; -+ unsigned char* src = srcLine; -+ unsigned int* dst = (unsigned int *) dstLine; -+ -+ for (x = 0; x < width; x++, src += 1) { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[0] << 16) | -+ ((unsigned int)src[src_pitch] << 8) | -+ ((unsigned int)src[src_pitch*2] ) | -+ ((unsigned int)src[src_pitch] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } else { -+ -+ for (h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch) { -+ int x; -+ unsigned char *src = srcLine; -+ unsigned int *dst = (unsigned int *) dstLine; -+ -+ for (x = 0; x < width; x++, src += 1) { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[src_pitch * 2] << 16) | -+ ((unsigned int)src[src_pitch] << 8) | -+ ((unsigned int)src[0] ) | -+ ((unsigned int)src[src_pitch] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ } -+} -+ -+ - /* Empirically-derived subpixel filtering values thanks to Keith - * Packard and libXft. */ - static const int filters[3][3] = { -@@ -775,7 +1094,6 @@ _get_bitmap_surface (FT_Bitmap *bitmap, - int width, height, stride; - unsigned char *data; - int format = CAIRO_FORMAT_A8; -- cairo_bool_t subpixel = FALSE; - - width = bitmap->width; - height = bitmap->rows; -@@ -817,7 +1135,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, - - #ifndef WORDS_BIGENDIAN - { -- uint8_t *d = data; -+ uint8_t *d = data; - int count = stride * height; - - while (count--) { -@@ -844,108 +1162,115 @@ _get_bitmap_surface (FT_Bitmap *bitmap, - data = _cairo_malloc_ab (height, stride); - if (!data) - return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- - memcpy (data, bitmap->buffer, stride * height); - } -- format = CAIRO_FORMAT_A8; -- break; -- case CAIRO_ANTIALIAS_SUBPIXEL: { -- int x, y; -- unsigned char *in_line, *out_line, *in; -- unsigned int *out; -- unsigned int red, green, blue; -- int rf, gf, bf; -- int s; -- int o, os; -- unsigned char *data_rgba; -- unsigned int width_rgba, stride_rgba; -- int vmul = 1; -- int hmul = 1; -+ format = CAIRO_FORMAT_A8; -+ break; -+ case CAIRO_ANTIALIAS_SUBPIXEL: -+ if (_ft_can_lcd_filter()) { -+ /* if we get there, the data from the source bitmap -+ * really comes from _fill_xrender_bitmap, and is -+ * made of 32-bit ARGB or ABGR values */ -+ assert (own_buffer != 0); -+ assert (bitmap->pixel_mode != FT_PIXEL_MODE_GRAY); - -- switch (font_options->subpixel_order) { -- case CAIRO_SUBPIXEL_ORDER_DEFAULT: -- case CAIRO_SUBPIXEL_ORDER_RGB: -- case CAIRO_SUBPIXEL_ORDER_BGR: -- default: -- width /= 3; -- hmul = 3; -- break; -- case CAIRO_SUBPIXEL_ORDER_VRGB: -- case CAIRO_SUBPIXEL_ORDER_VBGR: -- vmul = 3; -- height /= 3; -- break; -- } -- /* -- * Filter the glyph to soften the color fringes -- */ -- width_rgba = width; -- stride = bitmap->pitch; -- stride_rgba = (width_rgba * 4 + 3) & ~3; -- data_rgba = calloc (stride_rgba, height); -- if (unlikely (data_rgba == NULL)) { -- if (own_buffer) -+ data = bitmap->buffer; -+ stride = bitmap->pitch; -+ format = CAIRO_FORMAT_ARGB32; -+ } else { -+ int x, y; -+ unsigned char *in_line, *out_line, *in; -+ unsigned int *out; -+ unsigned int red, green, blue; -+ int rf, gf, bf; -+ int s; -+ int o, os; -+ unsigned char *data_rgba; -+ unsigned int width_rgba, stride_rgba; -+ int vmul = 1; -+ int hmul = 1; -+ -+ switch (font_options->subpixel_order) { -+ case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ case CAIRO_SUBPIXEL_ORDER_RGB: -+ case CAIRO_SUBPIXEL_ORDER_BGR: -+ default: -+ width /= 3; -+ hmul = 3; -+ break; -+ case CAIRO_SUBPIXEL_ORDER_VRGB: -+ case CAIRO_SUBPIXEL_ORDER_VBGR: -+ vmul = 3; -+ height /= 3; -+ break; -+ } -+ /* -+ * Filter the glyph to soften the color fringes -+ */ -+ width_rgba = width; -+ stride = bitmap->pitch; -+ stride_rgba = (width_rgba * 4 + 3) & ~3; -+ data_rgba = calloc (stride_rgba, height); -+ if (data_rgba == NULL) { -+ if (own_buffer) - free (bitmap->buffer); -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- } -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ } - -- os = 1; -- switch (font_options->subpixel_order) { -- case CAIRO_SUBPIXEL_ORDER_VRGB: -- os = stride; -- case CAIRO_SUBPIXEL_ORDER_DEFAULT: -- case CAIRO_SUBPIXEL_ORDER_RGB: -- default: -- rf = 0; -- gf = 1; -- bf = 2; -- break; -- case CAIRO_SUBPIXEL_ORDER_VBGR: -- os = stride; -- case CAIRO_SUBPIXEL_ORDER_BGR: -- bf = 0; -- gf = 1; -- rf = 2; -- break; -- } -- in_line = bitmap->buffer; -- out_line = data_rgba; -- for (y = 0; y < height; y++) -- { -- in = in_line; -- out = (unsigned int *) out_line; -- in_line += stride * vmul; -- out_line += stride_rgba; -- for (x = 0; x < width * hmul; x += hmul) -+ os = 1; -+ switch (font_options->subpixel_order) { -+ case CAIRO_SUBPIXEL_ORDER_VRGB: -+ os = stride; -+ case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ case CAIRO_SUBPIXEL_ORDER_RGB: -+ default: -+ rf = 0; -+ gf = 1; -+ bf = 2; -+ break; -+ case CAIRO_SUBPIXEL_ORDER_VBGR: -+ os = stride; -+ case CAIRO_SUBPIXEL_ORDER_BGR: -+ bf = 0; -+ gf = 1; -+ rf = 2; -+ break; -+ } -+ in_line = bitmap->buffer; -+ out_line = data_rgba; -+ for (y = 0; y < height; y++) - { -- red = green = blue = 0; -- o = 0; -- for (s = 0; s < 3; s++) -+ in = in_line; -+ out = (unsigned int *) out_line; -+ in_line += stride * vmul; -+ out_line += stride_rgba; -+ for (x = 0; x < width * hmul; x += hmul) - { -- red += filters[rf][s]*in[x+o]; -- green += filters[gf][s]*in[x+o]; -- blue += filters[bf][s]*in[x+o]; -- o += os; -+ red = green = blue = 0; -+ o = 0; -+ for (s = 0; s < 3; s++) -+ { -+ red += filters[rf][s]*in[x+o]; -+ green += filters[gf][s]*in[x+o]; -+ blue += filters[bf][s]*in[x+o]; -+ o += os; -+ } -+ red = red / 65536; -+ green = green / 65536; -+ blue = blue / 65536; -+ *out++ = (green << 24) | (red << 16) | (green << 8) | blue; - } -- red = red / 65536; -- green = green / 65536; -- blue = blue / 65536; -- *out++ = (green << 24) | (red << 16) | (green << 8) | blue; - } -- } - -- /* Images here are stored in native format. The -- * backend must convert to its own format as needed -- */ -- -- if (own_buffer) -+ /* Images here are stored in native format. The -+ * backend must convert to its own format as needed -+ */ -+ if (own_buffer) - free (bitmap->buffer); -- data = data_rgba; -- stride = stride_rgba; -- format = CAIRO_FORMAT_ARGB32; -- subpixel = TRUE; -- break; -- } -+ data = data_rgba; -+ stride = stride_rgba; -+ format = CAIRO_FORMAT_ARGB32; -+ } - } - break; - case FT_PIXEL_MODE_GRAY2: -@@ -966,7 +1291,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, - return (*surface)->base.status; - } - -- if (subpixel) -+ if (font_options->antialias == CAIRO_ANTIALIAS_SUBPIXEL) - pixman_image_set_component_alpha ((*surface)->pixman_image, TRUE); - - _cairo_image_surface_assume_ownership_of_data ((*surface)); -@@ -994,16 +1319,67 @@ _render_glyph_outline (FT_Face face, - cairo_font_options_t *font_options, - cairo_image_surface_t **surface) - { -+ int rgba = FC_RGBA_UNKNOWN; -+ int lcd_filter = FT_LCD_FILTER_LEGACY; - FT_GlyphSlot glyphslot = face->glyph; - FT_Outline *outline = &glyphslot->outline; - FT_Bitmap bitmap; - FT_BBox cbox; -- FT_Matrix matrix; -- int hmul = 1; -- int vmul = 1; -- unsigned int width, height, stride; -- cairo_bool_t subpixel = FALSE; -+ unsigned int width, height; -+ double device_offset_left, device_offset_top; - cairo_status_t status; -+ cairo_bool_t ft_can_filter = FALSE; -+ FT_Error fterror; -+ FT_Library library = glyphslot->library; -+ FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL; -+ -+#if HAVE_FT_LIBRARY_SETLCDFILTER -+ fterror = FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); -+ if(fterror != FT_Err_Unimplemented_Feature) -+ ft_can_filter = TRUE; -+#endif -+ -+ switch (font_options->antialias) { -+ case CAIRO_ANTIALIAS_NONE: -+ render_mode = FT_RENDER_MODE_MONO; -+ break; -+ case CAIRO_ANTIALIAS_SUBPIXEL: -+ switch (font_options->lcd_filter) { -+ case CAIRO_LCD_FILTER_NONE: -+ lcd_filter = FT_LCD_FILTER_NONE; -+ break; -+ case CAIRO_LCD_FILTER_DEFAULT: -+ case CAIRO_LCD_FILTER_INTRA_PIXEL: -+ lcd_filter = FT_LCD_FILTER_LEGACY; -+ break; -+ case CAIRO_LCD_FILTER_FIR3: -+ lcd_filter = FT_LCD_FILTER_LIGHT; -+ break; -+ case CAIRO_LCD_FILTER_FIR5: -+ lcd_filter = FT_LCD_FILTER_DEFAULT; -+ break; -+ } -+ -+ if (ft_can_filter) { -+ switch (font_options->subpixel_order) { -+ case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ case CAIRO_SUBPIXEL_ORDER_RGB: -+ case CAIRO_SUBPIXEL_ORDER_BGR: -+ render_mode = FT_RENDER_MODE_LCD; -+ break; -+ -+ case CAIRO_SUBPIXEL_ORDER_VRGB: -+ case CAIRO_SUBPIXEL_ORDER_VBGR: -+ render_mode = FT_RENDER_MODE_LCD_V; -+ break; -+ } -+ } -+ -+ break; -+ case CAIRO_ANTIALIAS_DEFAULT: -+ case CAIRO_ANTIALIAS_GRAY: -+ render_mode = FT_RENDER_MODE_NORMAL; -+ } - - FT_Outline_Get_CBox (outline, &cbox); - -@@ -1014,20 +1390,21 @@ _render_glyph_outline (FT_Face face, - - width = (unsigned int) ((cbox.xMax - cbox.xMin) >> 6); - height = (unsigned int) ((cbox.yMax - cbox.yMin) >> 6); -- stride = (width * hmul + 3) & ~3; - - if (width * height == 0) { - cairo_format_t format; - /* Looks like fb handles zero-sized images just fine */ -- switch (font_options->antialias) { -- case CAIRO_ANTIALIAS_NONE: -+ switch (render_mode) { -+ case FT_RENDER_MODE_MONO: - format = CAIRO_FORMAT_A1; - break; -- case CAIRO_ANTIALIAS_SUBPIXEL: -+ case FT_RENDER_MODE_LCD: -+ case FT_RENDER_MODE_LCD_V: - format= CAIRO_FORMAT_ARGB32; - break; -- case CAIRO_ANTIALIAS_DEFAULT: -- case CAIRO_ANTIALIAS_GRAY: -+ case FT_RENDER_MODE_LIGHT: -+ case FT_RENDER_MODE_NORMAL: -+ case FT_RENDER_MODE_MAX: - default: - format = CAIRO_FORMAT_A8; - break; -@@ -1037,75 +1414,142 @@ _render_glyph_outline (FT_Face face, - cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); - if ((*surface)->base.status) - return (*surface)->base.status; -- } else { - -- matrix.xx = matrix.yy = 0x10000L; -- matrix.xy = matrix.yx = 0; -+ } else { -+ int bitmap_size; - -- switch (font_options->antialias) { -- case CAIRO_ANTIALIAS_NONE: -- bitmap.pixel_mode = FT_PIXEL_MODE_MONO; -- bitmap.num_grays = 1; -- stride = ((width + 31) & -32) >> 3; -- break; -- case CAIRO_ANTIALIAS_DEFAULT: -- case CAIRO_ANTIALIAS_GRAY: -- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -- bitmap.num_grays = 256; -- stride = (width + 3) & -4; -- break; -- case CAIRO_ANTIALIAS_SUBPIXEL: -- switch (font_options->subpixel_order) { -- case CAIRO_SUBPIXEL_ORDER_RGB: -- case CAIRO_SUBPIXEL_ORDER_BGR: -- case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ if (ft_can_filter) { -+ switch (render_mode) { -+ case FT_RENDER_MODE_LCD: -+ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_BGR) { -+ rgba = FC_RGBA_BGR; -+ } else { -+ rgba = FC_RGBA_RGB; -+ } -+ break; -+ case FT_RENDER_MODE_LCD_V: -+ if (font_options->subpixel_order == CAIRO_SUBPIXEL_ORDER_VBGR) { -+ rgba = FC_RGBA_VBGR; -+ } else { -+ rgba = FC_RGBA_VRGB; -+ } -+ break; -+ case FT_RENDER_MODE_MONO: -+ case FT_RENDER_MODE_LIGHT: -+ case FT_RENDER_MODE_NORMAL: -+ case FT_RENDER_MODE_MAX: - default: -- matrix.xx *= 3; -- hmul = 3; -- subpixel = TRUE; - break; -- case CAIRO_SUBPIXEL_ORDER_VRGB: -- case CAIRO_SUBPIXEL_ORDER_VBGR: -- matrix.yy *= 3; -- vmul = 3; -- subpixel = TRUE; -+ } -+ -+#if HAVE_FT_LIBRARY_SETLCDFILTER -+ FT_Library_SetLcdFilter (library, lcd_filter); -+#endif -+ -+ fterror = FT_Render_Glyph (face->glyph, render_mode); -+ -+#if HAVE_FT_LIBRARY_SETLCDFILTER -+ FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE); -+#endif -+ -+ if (fterror != 0) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ -+ bitmap_size = _compute_xrender_bitmap_size (&bitmap, -+ face->glyph, -+ render_mode); -+ if (bitmap_size < 0) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ -+ bitmap.buffer = calloc (1, bitmap_size); -+ if (bitmap.buffer == NULL) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ -+ _fill_xrender_bitmap (&bitmap, face->glyph, render_mode, -+ (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR)); -+ -+ device_offset_left = (double)-glyphslot->bitmap_left; -+ device_offset_top = (double)+glyphslot->bitmap_top; -+ } else { -+ FT_Matrix matrix; -+ int hmul = 1; -+ int vmul = 1; -+ unsigned int stride; -+ -+ stride = (width * hmul + 3) & ~3; -+ -+ matrix.xx = matrix.yy = 0x10000L; -+ matrix.xy = matrix.yx = 0; -+ -+ switch (font_options->antialias) { -+ case CAIRO_ANTIALIAS_NONE: -+ bitmap.pixel_mode = FT_PIXEL_MODE_MONO; -+ bitmap.num_grays = 1; -+ stride = ((width + 31) & -32) >> 3; -+ break; -+ case CAIRO_ANTIALIAS_DEFAULT: -+ case CAIRO_ANTIALIAS_GRAY: -+ bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -+ bitmap.num_grays = 256; -+ stride = (width + 3) & -4; - break; -+ case CAIRO_ANTIALIAS_SUBPIXEL: -+ switch (font_options->subpixel_order) { -+ case CAIRO_SUBPIXEL_ORDER_RGB: -+ case CAIRO_SUBPIXEL_ORDER_BGR: -+ case CAIRO_SUBPIXEL_ORDER_DEFAULT: -+ default: -+ matrix.xx *= 3; -+ hmul = 3; -+ break; -+ case CAIRO_SUBPIXEL_ORDER_VRGB: -+ case CAIRO_SUBPIXEL_ORDER_VBGR: -+ matrix.yy *= 3; -+ vmul = 3; -+ break; -+ } -+ -+ FT_Outline_Transform (outline, &matrix); -+ -+ bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -+ bitmap.num_grays = 256; -+ stride = (width * hmul + 3) & -4; - } -- FT_Outline_Transform (outline, &matrix); - -- bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; -- bitmap.num_grays = 256; -- stride = (width * hmul + 3) & -4; -- } -+ bitmap.pitch = stride; -+ bitmap.width = width * hmul; -+ bitmap.rows = height * vmul; -+ bitmap.buffer = calloc (stride, bitmap.rows); -+ if (bitmap.buffer == NULL) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- bitmap.pitch = stride; -- bitmap.width = width * hmul; -- bitmap.rows = height * vmul; -- bitmap.buffer = calloc (stride, bitmap.rows); -- if (unlikely (bitmap.buffer == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); - -- FT_Outline_Translate (outline, -cbox.xMin*hmul, -cbox.yMin*vmul); -+ if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { -+ free (bitmap.buffer); -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ } - -- if (FT_Outline_Get_Bitmap (glyphslot->library, outline, &bitmap) != 0) { -- free (bitmap.buffer); -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ device_offset_left = floor (-(double) cbox.xMin / 64.0); -+ device_offset_top = floor (+(double) cbox.yMax / 64.0); - } - -+ /* Note: -+ * _get_bitmap_surface will free bitmap.buffer if there is an error -+ */ - status = _get_bitmap_surface (&bitmap, TRUE, font_options, surface); - if (unlikely (status)) - return status; -- } - -- /* -- * Note: the font's coordinate system is upside down from ours, so the -- * Y coordinate of the control box needs to be negated. Moreover, device -- * offsets are position of glyph origin relative to top left while xMin -- * and yMax are offsets of top left relative to origin. Another negation. -- */ -- cairo_surface_set_device_offset (&(*surface)->base, -- floor (-(double) cbox.xMin / 64.0), -- floor (+(double) cbox.yMax / 64.0)); -+ /* Note: the font's coordinate system is upside down from ours, so the -+ * Y coordinate of the control box needs to be negated. Moreover, device -+ * offsets are position of glyph origin relative to top left while xMin -+ * and yMax are offsets of top left relative to origin. Another negation. -+ */ -+ cairo_surface_set_device_offset (&(*surface)->base, -+ device_offset_left, -+ device_offset_top); -+ } - - return CAIRO_STATUS_SUCCESS; - } -@@ -1173,7 +1617,7 @@ _transform_glyph_bitmap (cairo_matrix_t * shape, - * the "shape" portion of the font transform - */ - original_to_transformed = *shape; -- -+ - cairo_surface_get_device_offset (&(*surface)->base, &origin_x, &origin_y); - orig_width = cairo_image_surface_get_width (&(*surface)->base); - orig_height = cairo_image_surface_get_height (&(*surface)->base); -@@ -1322,9 +1766,10 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret) - if (FcPatternGetBool (pattern, - FC_ANTIALIAS, 0, &antialias) != FcResultMatch) - antialias = FcTrue; -- -+ - if (antialias) { - cairo_subpixel_order_t subpixel_order; -+ int lcd_filter; - - /* disable hinting if requested */ - if (FcPatternGetBool (pattern, -@@ -1360,8 +1805,27 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret) - ft_options.base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; - } - --#ifdef FC_HINT_STYLE -- if (FcPatternGetInteger (pattern, -+ if (FcPatternGetInteger (pattern, -+ FC_LCD_FILTER, 0, &lcd_filter) == FcResultMatch) -+ { -+ switch (lcd_filter) { -+ case FC_LCD_NONE: -+ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_NONE; -+ break; -+ case FC_LCD_DEFAULT: -+ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR5; -+ break; -+ case FC_LCD_LIGHT: -+ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_FIR3; -+ break; -+ case FC_LCD_LEGACY: -+ ft_options.base.lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; -+ break; -+ } -+ } -+ -+#ifdef FC_HINT_STYLE -+ if (FcPatternGetInteger (pattern, - FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) - hintstyle = FC_HINT_FULL; - -@@ -1370,7 +1834,7 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret) - - switch (hintstyle) { - case FC_HINT_NONE: -- ft_options.base.hint_style = CAIRO_HINT_STYLE_NONE; -+ ft_options.base.hint_style = CAIRO_HINT_STYLE_NONE; - break; - case FC_HINT_SLIGHT: - ft_options.base.hint_style = CAIRO_HINT_STYLE_SLIGHT; -@@ -1414,14 +1878,14 @@ _get_pattern_ft_options (FcPattern *pattern, cairo_ft_options_t *ret) - - if (vertical_layout) - ft_options.load_flags |= FT_LOAD_VERTICAL_LAYOUT; -- -+ - #ifndef FC_EMBOLDEN - #define FC_EMBOLDEN "embolden" - #endif - if (FcPatternGetBool (pattern, - FC_EMBOLDEN, 0, &embolden) != FcResultMatch) - embolden = FcFalse; -- -+ - if (embolden) - ft_options.extra_flags |= CAIRO_FT_OPTIONS_EMBOLDEN; - -@@ -1437,7 +1901,7 @@ _cairo_ft_options_merge (cairo_ft_options_t *options, - - /* clear load target mode */ - load_flags &= ~(FT_LOAD_TARGET_(FT_LOAD_TARGET_MODE(other->load_flags))); -- -+ - if (load_flags & FT_LOAD_NO_HINTING) - other->base.hint_style = CAIRO_HINT_STYLE_NONE; - -@@ -1448,7 +1912,7 @@ _cairo_ft_options_merge (cairo_ft_options_t *options, - } - - if (other->base.antialias == CAIRO_ANTIALIAS_SUBPIXEL && -- (options->base.antialias == CAIRO_ANTIALIAS_DEFAULT || -+ (options->base.antialias == CAIRO_ANTIALIAS_DEFAULT || - options->base.antialias == CAIRO_ANTIALIAS_GRAY)) { - options->base.antialias = CAIRO_ANTIALIAS_SUBPIXEL; - options->base.subpixel_order = other->base.subpixel_order; -@@ -1460,6 +1924,12 @@ _cairo_ft_options_merge (cairo_ft_options_t *options, - if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) - options->base.hint_style = CAIRO_HINT_STYLE_NONE; - -+ if (options->base.lcd_filter == CAIRO_LCD_FILTER_DEFAULT) -+ options->base.lcd_filter = other->base.lcd_filter; -+ -+ if (other->base.lcd_filter == CAIRO_LCD_FILTER_NONE) -+ options->base.lcd_filter = CAIRO_LCD_FILTER_NONE; -+ - if (options->base.antialias == CAIRO_ANTIALIAS_NONE) { - if (options->base.hint_style == CAIRO_HINT_STYLE_NONE) - load_flags |= FT_LOAD_NO_HINTING; -@@ -1472,7 +1942,7 @@ _cairo_ft_options_merge (cairo_ft_options_t *options, - load_flags |= FT_LOAD_NO_HINTING; - break; - case CAIRO_HINT_STYLE_SLIGHT: -- load_target = FT_LOAD_TARGET_LIGHT; -+ load_target |= FT_LOAD_TARGET_LIGHT; - break; - case CAIRO_HINT_STYLE_MEDIUM: - break; -@@ -1887,18 +2357,18 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, - FT_Pos x1, x2; - FT_Pos y1, y2; - FT_Pos advance; -- -+ - if (!vertical_layout) { - x1 = (metrics->horiBearingX) & -64; - x2 = (metrics->horiBearingX + metrics->width + 63) & -64; - y1 = (-metrics->horiBearingY) & -64; - y2 = (-metrics->horiBearingY + metrics->height + 63) & -64; -- -+ - advance = ((metrics->horiAdvance + 32) & -64); -- -+ - fs_metrics.x_bearing = DOUBLE_FROM_26_6 (x1) * x_factor; - fs_metrics.y_bearing = DOUBLE_FROM_26_6 (y1) * y_factor; -- -+ - fs_metrics.width = DOUBLE_FROM_26_6 (x2 - x1) * x_factor; - fs_metrics.height = DOUBLE_FROM_26_6 (y2 - y1) * y_factor; - -@@ -1909,12 +2379,12 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, - x2 = (metrics->vertBearingX + metrics->width + 63) & -64; - y1 = (metrics->vertBearingY) & -64; - y2 = (metrics->vertBearingY + metrics->height + 63) & -64; -- -+ - advance = ((metrics->vertAdvance + 32) & -64); -- -+ - fs_metrics.x_bearing = DOUBLE_FROM_26_6 (x1) * x_factor; - fs_metrics.y_bearing = DOUBLE_FROM_26_6 (y1) * y_factor; -- -+ - fs_metrics.width = DOUBLE_FROM_26_6 (x2 - x1) * x_factor; - fs_metrics.height = DOUBLE_FROM_26_6 (y2 - y1) * y_factor; - -@@ -1928,7 +2398,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, - if (!vertical_layout) { - fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->horiBearingX) * x_factor; - fs_metrics.y_bearing = DOUBLE_FROM_26_6 (-metrics->horiBearingY) * y_factor; -- -+ - if (hint_metrics || glyph->format != FT_GLYPH_FORMAT_OUTLINE) - fs_metrics.x_advance = DOUBLE_FROM_26_6 (metrics->horiAdvance) * x_factor; - else -@@ -1937,7 +2407,7 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, - } else { - fs_metrics.x_bearing = DOUBLE_FROM_26_6 (metrics->vertBearingX) * x_factor; - fs_metrics.y_bearing = DOUBLE_FROM_26_6 (metrics->vertBearingY) * y_factor; -- -+ - fs_metrics.x_advance = 0 * x_factor; - if (hint_metrics || glyph->format != FT_GLYPH_FORMAT_OUTLINE) - fs_metrics.y_advance = DOUBLE_FROM_26_6 (metrics->vertAdvance) * y_factor; -@@ -2429,6 +2899,34 @@ _cairo_ft_font_options_substitute (const cairo_font_options_t *options, - } - } - -+ if (options->lcd_filter != CAIRO_LCD_FILTER_DEFAULT) -+ { -+ if (FcPatternGet (pattern, FC_LCD_FILTER, 0, &v) == FcResultNoMatch) -+ { -+ int lcd_filter; -+ -+ switch (options->lcd_filter) { -+ case CAIRO_LCD_FILTER_NONE: -+ lcd_filter = FT_LCD_FILTER_NONE; -+ break; -+ case CAIRO_LCD_FILTER_DEFAULT: -+ case CAIRO_LCD_FILTER_INTRA_PIXEL: -+ lcd_filter = FT_LCD_FILTER_LEGACY; -+ break; -+ case CAIRO_LCD_FILTER_FIR3: -+ lcd_filter = FT_LCD_FILTER_LIGHT; -+ break; -+ default: -+ case CAIRO_LCD_FILTER_FIR5: -+ lcd_filter = FT_LCD_FILTER_DEFAULT; -+ break; -+ } -+ -+ if (! FcPatternAddInteger (pattern, FC_LCD_FILTER, lcd_filter)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); -+ } -+ } -+ - if (options->hint_style != CAIRO_HINT_STYLE_DEFAULT) - { - if (FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) -@@ -2802,10 +3300,10 @@ cairo_bool_t - _cairo_ft_scaled_font_is_vertical (cairo_scaled_font_t *scaled_font) - { - cairo_ft_scaled_font_t *ft_scaled_font; -- -+ - if (!_cairo_scaled_font_is_ft (scaled_font)) - return FALSE; -- -+ - ft_scaled_font = (cairo_ft_scaled_font_t *) scaled_font; - if (ft_scaled_font->ft_options.load_flags & FT_LOAD_VERTICAL_LAYOUT) - return TRUE; -diff --git a/src/cairo-mutex.c b/src/cairo-mutex.c -index 5b6a6e1..8b50a2e 100644 ---- a/src/cairo-mutex.c -+++ b/src/cairo-mutex.c -@@ -35,7 +35,7 @@ - - #include "cairo-mutex-private.h" - --#define CAIRO_MUTEX_DECLARE(mutex) cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; -+#define CAIRO_MUTEX_DECLARE(mutex) cairo_private cairo_mutex_t mutex = CAIRO_MUTEX_NIL_INITIALIZER; - #include "cairo-mutex-list-private.h" - #undef CAIRO_MUTEX_DECLARE - -diff --git a/src/cairo-surface.c b/src/cairo-surface.c -index 4dd034e..52a271c 100644 ---- a/src/cairo-surface.c -+++ b/src/cairo-surface.c -@@ -64,6 +64,7 @@ const cairo_surface_t name = { \ - FALSE, /* has_font_options */ \ - { CAIRO_ANTIALIAS_DEFAULT, /* antialias */ \ - CAIRO_SUBPIXEL_ORDER_DEFAULT, /* subpixel_order */ \ -+ CAIRO_LCD_FILTER_DEFAULT, /* lcd_filter */ \ - CAIRO_HINT_STYLE_DEFAULT, /* hint_style */ \ - CAIRO_HINT_METRICS_DEFAULT /* hint_metrics */ \ - } /* font_options */ \ -diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h -index 149d894..acd4f49 100644 ---- a/src/cairo-types-private.h -+++ b/src/cairo-types-private.h -@@ -116,9 +116,35 @@ struct _cairo_array { - cairo_bool_t is_snapshot; - }; - -+ -+/** -+ * cairo_lcd_filter_t: -+ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for -+ * font backend and target device -+ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering -+ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter -+ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel -+ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel -+ * -+ * The LCD filter specifies the low-pass filter applied to LCD-optimized -+ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL. -+ * -+ * Note: This API was temporarily made available in the public -+ * interface during the 1.7.x development series, but was made private -+ * before 1.8. -+ **/ -+typedef enum _cairo_lcd_filter { -+ CAIRO_LCD_FILTER_DEFAULT, -+ CAIRO_LCD_FILTER_NONE, -+ CAIRO_LCD_FILTER_INTRA_PIXEL, -+ CAIRO_LCD_FILTER_FIR3, -+ CAIRO_LCD_FILTER_FIR5 -+} cairo_lcd_filter_t; -+ - struct _cairo_font_options { - cairo_antialias_t antialias; - cairo_subpixel_order_t subpixel_order; -+ cairo_lcd_filter_t lcd_filter; - cairo_hint_style_t hint_style; - cairo_hint_metrics_t hint_metrics; - }; -diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c -index 3b1ae2e..ddd24f8 100644 ---- a/src/cairo-xlib-screen.c -+++ b/src/cairo-xlib-screen.c -@@ -153,13 +153,22 @@ _cairo_xlib_init_screen_font_options (Display *dpy, - cairo_bool_t xft_antialias; - int xft_hintstyle; - int xft_rgba; -+ int xft_lcdfilter; - cairo_antialias_t antialias; - cairo_subpixel_order_t subpixel_order; -+ cairo_lcd_filter_t lcd_filter; - cairo_hint_style_t hint_style; - - if (!get_boolean_default (dpy, "antialias", &xft_antialias)) - xft_antialias = TRUE; - -+ if (!get_integer_default (dpy, "lcdfilter", &xft_lcdfilter)) { -+ /* -1 is an non-existant Fontconfig constant used to differentiate -+ * the case when no lcdfilter property is available. -+ */ -+ xft_lcdfilter = -1; -+ } -+ - if (!get_boolean_default (dpy, "hinting", &xft_hinting)) - xft_hinting = TRUE; - -@@ -242,6 +251,24 @@ _cairo_xlib_init_screen_font_options (Display *dpy, - subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT; - } - -+ switch (xft_lcdfilter) { -+ case FC_LCD_NONE: -+ lcd_filter = CAIRO_LCD_FILTER_NONE; -+ break; -+ case FC_LCD_DEFAULT: -+ lcd_filter = CAIRO_LCD_FILTER_FIR5; -+ break; -+ case FC_LCD_LIGHT: -+ lcd_filter = CAIRO_LCD_FILTER_FIR3; -+ break; -+ case FC_LCD_LEGACY: -+ lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL; -+ break; -+ default: -+ lcd_filter = CAIRO_LCD_FILTER_DEFAULT; -+ break; -+ } -+ - if (xft_antialias) { - if (subpixel_order == CAIRO_SUBPIXEL_ORDER_DEFAULT) - antialias = CAIRO_ANTIALIAS_GRAY; -@@ -254,6 +281,7 @@ _cairo_xlib_init_screen_font_options (Display *dpy, - cairo_font_options_set_hint_style (&info->font_options, hint_style); - cairo_font_options_set_antialias (&info->font_options, antialias); - cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order); -+ _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter); - cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON); - } - -diff --git a/src/cairoint.h b/src/cairoint.h -index a67dff5..2c0531a 100644 ---- a/src/cairoint.h -+++ b/src/cairoint.h -@@ -1411,6 +1411,13 @@ cairo_private void - _cairo_font_options_init_copy (cairo_font_options_t *options, - const cairo_font_options_t *other); - -+cairo_private void -+_cairo_font_options_set_lcd_filter (cairo_font_options_t *options, -+ cairo_lcd_filter_t lcd_filter); -+ -+cairo_private cairo_lcd_filter_t -+_cairo_font_options_get_lcd_filter (const cairo_font_options_t *options); -+ - /* cairo-hull.c */ - cairo_private cairo_status_t - _cairo_hull_compute (cairo_pen_vertex_t *vertices, int *num_vertices); diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest deleted file mode 100644 index e6abba8..0000000 --- a/x11-libs/libFS/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libFS-9999.ebuild 390 RMD160 ad7c0907a31080e0993066693112b61a377c550d SHA1 f408c10a5c1f5e72cfb82af95ac048bd85a2be04 SHA256 081ca7500ca43e04fbb798dc062c92a79ee4138aff24763497470fc43d1fda49 diff --git a/x11-libs/libFS/libFS-9999.ebuild b/x11-libs/libFS/libFS-9999.ebuild deleted file mode 100644 index a449721..0000000 --- a/x11-libs/libFS/libFS-9999.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org FS library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="x11-libs/xtrans - x11-proto/xproto - x11-proto/fontsproto" -DEPEND="${RDEPEND}" - -CONFIGURE_OPTIONS="$(use_enable ipv6)" diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest deleted file mode 100644 index 307c050..0000000 --- a/x11-libs/libICE/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libICE-9999.ebuild 369 RMD160 c8e663010f2c8ae11bcde386e0ed84ff89ac0947 SHA1 65af5fa0c0eac5b97dc98f096c28c96543672698 SHA256 7dde112fee277c614d666bc0f2a02b7ef639c28a254145ed62f8dfb66d590551 diff --git a/x11-libs/libICE/libICE-9999.ebuild b/x11-libs/libICE/libICE-9999.ebuild deleted file mode 100644 index a5fa254..0000000 --- a/x11-libs/libICE/libICE-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org ICE library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="x11-libs/xtrans - x11-proto/xproto" -DEPEND="${RDEPEND}" - -CONFIGURE_OPTIONS="$(use_enable ipv6)" diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest deleted file mode 100644 index bc914c4..0000000 --- a/x11-libs/libSM/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libSM-9999.ebuild 385 RMD160 70323cbde8b0b8ef51236fea5025433284548ded SHA1 2f6829c9c9b3cfac93a29cc8ac28cb9e689acf92 SHA256 a45acc9b15a5c7ecd000278a39f61211a80a33bc5645d7e8816b3a766e9d7804 diff --git a/x11-libs/libSM/libSM-9999.ebuild b/x11-libs/libSM/libSM-9999.ebuild deleted file mode 100644 index 7553ba7..0000000 --- a/x11-libs/libSM/libSM-9999.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org SM library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="x11-libs/libICE - x11-libs/xtrans - x11-proto/xproto" -DEPEND="${RDEPEND}" - -CONFIGURE_OPTIONS="$(use_enable ipv6)" diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest deleted file mode 100644 index e0486d2..0000000 --- a/x11-libs/libX11/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX xlib-0001-Use-XCB-s-new-socket-handoff-mechanism-rather-than-t.patch 25297 RMD160 1129779af77f552090559b009fe03c2625abd3bd SHA1 74820193a00e0c9c0f3d5d016535bcf2d7f3aa70 SHA256 81d33def627a6aea4bdf6d52f6d46e685f5e1803e4c393baa098a50bb0a9f10c -AUX xlib-0002-Fix-XAllocID-race-hold-the-user-display-lock-until.patch 1322 RMD160 c0d141b8bedc95bd0ea17b4f1dc22e89337a31fd SHA1 53fecb881ae3198ca739a07cd3a87c59b0a8fb61 SHA256 954285da20bfaab3e03e766852a68549034d44f9d28bdf72e1aebf2284f3f9e7 -AUX xlib-0003-Permit-only-one-Xlib-thread-to-block-waiting-for-eve.patch 3118 RMD160 9472410a4ed9cd16cd6b4cb5d1e2beef509836b5 SHA1 0350f6429c0a22a05e9d5e1e7e52bde1106c9d42 SHA256 67407d74fd1263030775b988d51b5c5e9b04cbf93fd0cba26d977db833d7ae88 -AUX xlib-0004-Ensure-that-_XReadEvents-always-leaves-an-event-in-t.patch 1042 RMD160 4c622ffd1ac7a2e6d797db5a77beb292e33390f7 SHA1 94c4c628fbb7ef2a71e9127f776b897fec7dfc5e SHA256 25700d5d441e891a4f23991b5ec8a440f2e76bd0cb43a42036c8032f51f83227 -EBUILD libX11-9999.ebuild 901 RMD160 24824ec1eb169b240d6663f91b8e0386f6031433 SHA1 778a31238a818a5c0b55f24640436af685c5355d SHA256 7ceef42410cf4d6406e01a7d2d490c58166c5a1efd11882e026a0facad421f8b diff --git a/x11-libs/libX11/files/xlib-0001-Use-XCB-s-new-socket-handoff-mechanism-rather-than-t.patch b/x11-libs/libX11/files/xlib-0001-Use-XCB-s-new-socket-handoff-mechanism-rather-than-t.patch deleted file mode 100644 index e500492..0000000 --- a/x11-libs/libX11/files/xlib-0001-Use-XCB-s-new-socket-handoff-mechanism-rather-than-t.patch +++ /dev/null @@ -1,774 +0,0 @@ -From 50d5c8363da0cd10217d4f24e8561ed9a1e1881e Mon Sep 17 00:00:00 2001 -From: Josh Triplett <josh@freedesktop.org> -Date: Sat, 15 Mar 2008 17:22:00 -0700 -Subject: [PATCH 1/4] Use XCB's new socket handoff mechanism rather than the old XCB Xlib lock. - -Previously, Xlib/XCB used XCB's Xlib lock to prevent XCB from sending -requests between calls to Xlib's LockDisplay and UnlockDisplay macros. -Xlib/XCB then sent all of its requests using XCB's xcb_send_request, and -had to flush its requests when unlocking the display. - -XCB 1.2 adds a new socket handoff mechanism, xcb_take_socket. Replace -much of the existing Xlib/XCB implementation with the use of -xcb_take_socket to take ownership of the write side of the X connection -socket, and a return_socket callback which writes any outstanding requests -with xcb_writev. This approach allows Xlib/XCB to use the same buffering -as traditional Xlib did. In particular, programs which use Xlib/XCB and -never make XCB calls will never need to hand the socket back to XCB, and -vice versa. - -This allows us to discard large quantities of synchronization code from -Xlib/XCB, together with the synchronization bugs present in that code. -Several test cases which previously failed now work perfectly, including -multi-threaded ico. In addition, the infamous locking correctness -assertions, triggered when double-locking or when unlocking without a -previous lock, no longer exist, because Xlib/XCB no longer has any reason -to care more about application locking than traditional Xlib does. - -Furthermore, the handoff approach provides great improvements to -performance. Results from x11perf's XNoOp test, which represented the -worst case for the lock-based Xlib/XCB: - -Traditional Xlib: average 19100000/sec -Lock-based Xlib/XCB: average 3350000/sec -Handoff-based Xlib/XCB: average 17400000/sec - -Thus, for no-ops, the handoff mechanism provides more than a 4x speedup to -Xlib/XCB, bringing Xlib/XCB within 9% of traditional Xlib no-op -performance. Of course, real-world workloads do not use no-op, so your -mileage may vary. In particular, since no-ops represent the worst case, -we expect real workloads to more closely match the performance of -traditional Xlib. - -While removing synchronization code, we changed _XReply to not drop -any locks when calling xcb_wait_for_reply; previously, we had to carefully -avoid a deadlock between the Display lock and the XCB Xlib lock. Holding -the locks reduces implementation complexity and should not impact applications. - -Commit by Jamey Sharp and Josh Triplett. -XCB's handoff mechanism inspired by Keith Packard. ---- - configure.ac | 4 +- - src/Makefile.am | 1 - - src/OpenDis.c | 27 +++---- - src/Xxcbint.h | 27 +----- - src/xcb_io.c | 194 +++++++++++++++++++++++++++++----------------- - src/xcb_lock.c | 235 ------------------------------------------------------- - 6 files changed, 140 insertions(+), 348 deletions(-) - delete mode 100644 src/xcb_lock.c - -diff --git a/configure.ac b/configure.ac -index 5febfb3..6141fa4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,8 +52,8 @@ no) - AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation]) - ;; - *) -- X11_REQUIRES="xcb-xlib >= 1.1.90" -- X11_EXTRA_DEPS="xcb-xlib" -+ X11_REQUIRES="xcb >= 1.2" -+ X11_EXTRA_DEPS="xcb >= 1.2" - xdmauth="no" # XCB handles all auth - AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation]) - ;; -diff --git a/src/Makefile.am b/src/Makefile.am -index 564e03f..3380f81 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -342,7 +342,6 @@ EXTRA_DIST = \ - - if XCB - libX11_la_SOURCES += \ -- xcb_lock.c \ - xcb_disp.c \ - xcb_io.c \ - Xxcbint.h -diff --git a/src/OpenDis.c b/src/OpenDis.c -index d5089e8..aa2541f 100644 ---- a/src/OpenDis.c -+++ b/src/OpenDis.c -@@ -261,13 +261,6 @@ XOpenDisplay ( - return(NULL); - } - --#if USE_XCB -- if (!_XCBInitDisplayLock(dpy)) { -- OutOfMemory (dpy, setup); -- return(NULL); -- } --#endif -- - if (!_XPollfdCacheInit(dpy)) { - OutOfMemory (dpy, setup); - return(NULL); -@@ -292,6 +285,10 @@ XOpenDisplay ( - return(NULL); - } - dpy->bufmax = dpy->buffer + conn_buf_size; -+#if USE_XCB -+ dpy->xcb->real_bufmax = dpy->bufmax; -+ dpy->bufmax = dpy->buffer; -+#endif - - /* Set up the input event queue and input event queue parameters. */ - dpy->head = dpy->tail = NULL; -@@ -652,6 +649,12 @@ XOpenDisplay ( - UnlockDisplay(dpy); - #endif /* !USE_XCB */ - -+#if USE_XCB -+ dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection); -+ if(dpy->bigreq_size <= dpy->max_request_size) -+ dpy->bigreq_size = 0; -+#endif /* USE_XCB */ -+ - /* - * Set up other stuff clients are always going to use. - */ -@@ -673,12 +676,6 @@ XOpenDisplay ( - */ - (void) XSynchronize(dpy, _Xdebug); - --#if USE_XCB -- dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection); -- if(dpy->bigreq_size <= dpy->max_request_size) -- dpy->bigreq_size = 0; --#endif /* USE_XCB */ -- - /* - * get availability of large requests, and - * get the resource manager database off the root window. -@@ -883,10 +880,6 @@ void _XFreeDisplayStructure(dpy) - Xfree (dpy->scratch_buffer); - FreeDisplayLock(dpy); - --#if USE_XCB -- _XCBShutdownDisplayLock(dpy); --#endif /* USE_XCB */ -- - if (dpy->qfree) { - register _XQEvent *qelt = dpy->qfree; - -diff --git a/src/Xxcbint.h b/src/Xxcbint.h -index cc73749..1b3137b 100644 ---- a/src/Xxcbint.h -+++ b/src/Xxcbint.h -@@ -5,34 +5,28 @@ - #define XXCBINT_H - - #include <assert.h> -+#include <stdint.h> - #include <X11/Xlibint.h> - #include <X11/Xlib-xcb.h> --#include "locking.h" /* really just want X11/Xthreads.h but can't have it. */ - --#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0) --#define assert_sequence_less(a,b) assert(XCB_SEQUENCE_COMPARE((a), <=, (b))) -+#define XLIB_SEQUENCE_COMPARE(a,op,b) (((long) (a) - (long) (b)) op 0) - - typedef struct PendingRequest PendingRequest; - struct PendingRequest { - PendingRequest *next; -- xcondition_rec condition; -- int waiters; /* Number of threads waiting; -1 if no wait needed */ -- unsigned int sequence; -+ unsigned long sequence; - }; - - typedef struct _X11XCBPrivate { -- struct _XLockPtrs lock_fns; - xcb_connection_t *connection; - PendingRequest *pending_requests; - PendingRequest **pending_requests_tail; - xcb_generic_event_t *next_event; -- const char *request_extra; -- int request_extra_size; -- char *partial_request; -- int partial_request_offset; -+ char *real_bufmax; - char *reply_data; - int reply_length; - int reply_consumed; -+ uint64_t last_flushed; - enum XEventQueueOwner event_owner; - XID next_xid; - } _X11XCBPrivate; -@@ -42,15 +36,4 @@ typedef struct _X11XCBPrivate { - int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *screenp); - void _XFreeX11XCBStructure(Display *dpy); - --/* xcb_lock.c */ -- --int _XCBInitDisplayLock(Display *dpy); --void _XCBShutdownDisplayLock(Display *dpy); -- --/* _XGetXCBBuffer and _XPutXCBBuffer calls must be paired and must not -- * be nested. */ -- --void _XGetXCBBuffer(Display *dpy); --void _XPutXCBBuffer(Display *dpy); -- - #endif /* XXCBINT_H */ -diff --git a/src/xcb_io.c b/src/xcb_io.c -index dcbe5a8..830ddb9 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -5,12 +5,50 @@ - #include "locking.h" - #include "Xxcbint.h" - #include <xcb/xcbext.h> --#include <xcb/xcbxlib.h> - - #include <assert.h> -+#include <inttypes.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - -+static void return_socket(void *closure) -+{ -+ Display *dpy = closure; -+ LockDisplay(dpy); -+ _XSend(dpy, 0, 0); -+ dpy->bufmax = dpy->buffer; -+ UnlockDisplay(dpy); -+} -+ -+static void require_socket(Display *dpy) -+{ -+ if(dpy->bufmax == dpy->buffer) -+ { -+ uint64_t sent; -+ int flags = 0; -+ /* if we don't own the event queue, we have to ask XCB -+ * to set our errors aside for us. */ -+ if(dpy->xcb->event_owner != XlibOwnsEventQueue) -+ flags = XCB_REQUEST_CHECKED; -+ if(!xcb_take_socket(dpy->xcb->connection, return_socket, dpy, -+ flags, &sent)) -+ _XIOError(dpy); -+ /* Xlib uses unsigned long for sequence numbers. XCB -+ * uses 64-bit internally, but currently exposes an -+ * unsigned int API. If these differ, Xlib cannot track -+ * the full 64-bit sequence number if 32-bit wrap -+ * happens while Xlib does not own the socket. A -+ * complete fix would be to make XCB's public API use -+ * 64-bit sequence numbers. */ -+ assert(!(sizeof(unsigned long) > sizeof(unsigned int) -+ && dpy->xcb->event_owner == XlibOwnsEventQueue -+ && (sent - dpy->last_request_read >= (UINT64_C(1) << 32)))); -+ dpy->xcb->last_flushed = dpy->request = sent; -+ dpy->bufmax = dpy->xcb->real_bufmax; -+ } -+} -+ - /* Call internal connection callbacks for any fds that are currently - * ready to read. This function will not block unless one of the - * callbacks blocks. -@@ -68,15 +106,6 @@ static void check_internal_connections(Display *dpy) - } - } - --static void condition_wait(Display *dpy, xcondition_t cv) --{ -- _XPutXCBBuffer(dpy); -- xcb_xlib_unlock(dpy->xcb->connection); -- ConditionWait(dpy, cv); -- xcb_xlib_lock(dpy->xcb->connection); -- _XGetXCBBuffer(dpy); --} -- - static void call_handlers(Display *dpy, xcb_generic_reply_t *buf) - { - _XAsyncHandler *async, *next; -@@ -105,7 +134,17 @@ static xcb_generic_event_t * wait_or_poll_for_event(Display *dpy, int wait) - return event; - } - --static void process_responses(Display *dpy, int wait_for_first_event, xcb_generic_error_t **current_error, unsigned int current_request) -+/* Widen a 32-bit sequence number into a native-word-size (unsigned long) -+ * sequence number. Treating the comparison as a 1 and shifting it avoids a -+ * conditional branch, and shifting by 16 twice avoids a compiler warning when -+ * sizeof(unsigned long) == 4. */ -+static void widen(unsigned long *wide, unsigned int narrow) -+{ -+ unsigned long new = (*wide & ~0xFFFFFFFFUL) | narrow; -+ *wide = new + ((unsigned long) (new < *wide) << 16 << 16); -+} -+ -+static void process_responses(Display *dpy, int wait_for_first_event, xcb_generic_error_t **current_error, unsigned long current_request) - { - void *reply; - xcb_generic_event_t *event = dpy->xcb->next_event; -@@ -114,13 +153,18 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi - if(!event && dpy->xcb->event_owner == XlibOwnsEventQueue) - event = wait_or_poll_for_event(dpy, wait_for_first_event); - -+ require_socket(dpy); -+ - while(1) - { - PendingRequest *req = dpy->xcb->pending_requests; -- assert(!(req && current_request && !XCB_SEQUENCE_COMPARE(req->sequence, <=, current_request))); -- if(event && (!req || XCB_SEQUENCE_COMPARE(event->full_sequence, <=, req->sequence))) -+ unsigned long event_sequence = dpy->last_request_read; -+ if(event) -+ widen(&event_sequence, event->full_sequence); -+ assert(!(req && current_request && !XLIB_SEQUENCE_COMPARE(req->sequence, <=, current_request))); -+ if(event && (!req || XLIB_SEQUENCE_COMPARE(event_sequence, <=, req->sequence))) - { -- dpy->last_request_read = event->full_sequence; -+ dpy->last_request_read = event_sequence; - if(event->response_type != X_Error) - { - /* GenericEvents may be > 32 bytes. In this -@@ -139,7 +183,7 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi - _XEnq(dpy, (xEvent *) event); - wait_for_first_event = 0; - } -- else if(current_error && event->full_sequence == current_request) -+ else if(current_error && event_sequence == current_request) - { - /* This can only occur when called from - * _XReply, which doesn't need a new event. */ -@@ -152,18 +196,9 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi - free(event); - event = wait_or_poll_for_event(dpy, wait_for_first_event); - } -- else if(req && req->waiters != -1) -+ else if(req && req->sequence == current_request) - { -- if(req->sequence == current_request) -- break; -- if(!current_request && !wait_for_first_event) -- break; -- dpy->xcb->next_event = event; -- req->waiters++; -- assert(req->waiters > 0); -- condition_wait(dpy, &req->condition); -- --req->waiters; -- event = dpy->xcb->next_event; -+ break; - } - else if(req && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &reply, &error)) - { -@@ -192,7 +227,7 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi - if(xcb_connection_has_error(c)) - _XIOError(dpy); - -- assert_sequence_less(dpy->last_request_read, dpy->request); -+ assert(XLIB_SEQUENCE_COMPARE(dpy->last_request_read, <=, dpy->request)); - assert(!wait_for_first_event); - } - -@@ -234,32 +269,61 @@ void _XReadEvents(Display *dpy) - */ - void _XSend(Display *dpy, const char *data, long size) - { -+ static const xReq dummy_request; -+ static char const pad[3]; -+ struct iovec vec[3]; -+ uint64_t requests; -+ _XExtension *ext; - xcb_connection_t *c = dpy->xcb->connection; - if(dpy->flags & XlibDisplayIOError) - return; - -- assert(!dpy->xcb->request_extra); -- dpy->xcb->request_extra = data; -- dpy->xcb->request_extra_size = size; -+ if(dpy->bufptr == dpy->buffer && !size) -+ return; -+ -+ /* iff we asked XCB to set aside errors, we must pick those up -+ * eventually. iff there are async handlers, we may have just -+ * issued requests that will generate replies. in either case, -+ * we need to remember to check later. */ -+ if(dpy->xcb->event_owner != XlibOwnsEventQueue || dpy->async_handlers) -+ { -+ unsigned int sequence; -+ for(sequence = dpy->xcb->last_flushed; sequence < dpy->request; ++sequence) -+ { -+ PendingRequest *req = malloc(sizeof(PendingRequest)); -+ assert(req); -+ req->next = 0; -+ req->sequence = sequence; -+ *dpy->xcb->pending_requests_tail = req; -+ dpy->xcb->pending_requests_tail = &req->next; -+ } -+ } -+ requests = dpy->request - dpy->xcb->last_flushed; -+ dpy->xcb->last_flushed = dpy->request; - -- /* give dpy->buffer to XCB */ -- _XPutXCBBuffer(dpy); -+ vec[0].iov_base = dpy->buffer; -+ vec[0].iov_len = dpy->bufptr - dpy->buffer; -+ vec[1].iov_base = (caddr_t) data; -+ vec[1].iov_len = size; -+ vec[2].iov_base = (caddr_t) pad; -+ vec[2].iov_len = -size & 3; - -- if(xcb_flush(c) <= 0) -- _XIOError(dpy); -+ for(ext = dpy->flushes; ext; ext = ext->next_flush) -+ { -+ int i; -+ for(i = 0; i < 3; ++i) -+ if(vec[i].iov_len) -+ ext->before_flush(dpy, &ext->codes, vec[i].iov_base, vec[i].iov_len); -+ } - -- /* get a new dpy->buffer */ -- _XGetXCBBuffer(dpy); -+ if(xcb_writev(c, vec, 3, requests) < 0) -+ _XIOError(dpy); -+ dpy->bufptr = dpy->buffer; -+ dpy->last_req = (char *) &dummy_request; - - check_internal_connections(dpy); - -- /* A straight port of XlibInt.c would call _XSetSeqSyncFunction -- * here. However that does no good: unlike traditional Xlib, -- * Xlib/XCB almost never calls _XFlush because _XPutXCBBuffer -- * automatically pushes requests down into XCB, so Xlib's buffer -- * is empty most of the time. Since setting a synchandler has no -- * effect until after UnlockDisplay returns, we may as well do -- * the check in _XUnlockDisplay. */ -+ _XSetSeqSyncFunction(dpy); - } - - /* -@@ -268,6 +332,7 @@ void _XSend(Display *dpy, const char *data, long size) - */ - void _XFlush(Display *dpy) - { -+ require_socket(dpy); - _XSend(dpy, 0, 0); - - _XEventsQueued(dpy, QueuedAfterReading); -@@ -308,10 +373,18 @@ XID _XAllocID(Display *dpy) - void _XAllocIDs(Display *dpy, XID *ids, int count) - { - int i; -- _XPutXCBBuffer(dpy); -+#ifdef XTHREADS -+ if (dpy->lock) -+ (*dpy->lock->user_lock_display)(dpy); -+ UnlockDisplay(dpy); -+#endif - for (i = 0; i < count; i++) - ids[i] = xcb_generate_id(dpy->xcb->connection); -- _XGetXCBBuffer(dpy); -+#ifdef XTHREADS -+ LockDisplay(dpy); -+ if (dpy->lock) -+ (*dpy->lock->user_unlock_display)(dpy); -+#endif - } - - static void _XFreeReplyData(Display *dpy, Bool force) -@@ -325,16 +398,9 @@ static void _XFreeReplyData(Display *dpy, Bool force) - static PendingRequest * insert_pending_request(Display *dpy) - { - PendingRequest **cur = &dpy->xcb->pending_requests; -- while(*cur && XCB_SEQUENCE_COMPARE((*cur)->sequence, <, dpy->request)) -+ while(*cur && XLIB_SEQUENCE_COMPARE((*cur)->sequence, <, dpy->request)) - cur = &((*cur)->next); -- if(*cur && (*cur)->sequence == dpy->request) -- { -- /* Replacing an existing PendingRequest should only happen once, -- when calling _XReply, and the replaced PendingRequest must -- not have a condition set. */ -- assert((*cur)->waiters == -1); -- } -- else -+ if(!*cur || (*cur)->sequence != dpy->request) - { - PendingRequest *node = malloc(sizeof(PendingRequest)); - assert(node); -@@ -344,8 +410,6 @@ static PendingRequest * insert_pending_request(Display *dpy) - dpy->xcb->pending_requests_tail = &(node->next); - *cur = node; - } -- (*cur)->waiters = 0; -- xcondition_init(&((*cur)->condition)); - return *cur; - } - -@@ -367,27 +431,15 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) - if(dpy->flags & XlibDisplayIOError) - return 0; - -- /* Internals of UnlockDisplay done by hand here, so that we can -- insert_pending_request *after* we _XPutXCBBuffer, but before we -- unlock the display. */ -- _XPutXCBBuffer(dpy); -+ _XSend(dpy, 0, 0); - current = insert_pending_request(dpy); -- if(!dpy->lock || dpy->lock->locking_level == 0) -- xcb_xlib_unlock(dpy->xcb->connection); -- if(dpy->xcb->lock_fns.unlock_display) -- dpy->xcb->lock_fns.unlock_display(dpy); -+ /* FIXME: drop the Display lock while waiting? -+ * Complicates process_responses. */ - reply = xcb_wait_for_reply(c, current->sequence, &error); -- LockDisplay(dpy); - - check_internal_connections(dpy); - process_responses(dpy, 0, &error, current->sequence); - -- if(current->waiters) -- { /* The ConditionBroadcast macro contains an if; braces needed here. */ -- ConditionBroadcast(dpy, ¤t->condition); -- } -- --current->waiters; -- - if(error) - { - _XExtension *ext; -diff --git a/src/xcb_lock.c b/src/xcb_lock.c -deleted file mode 100644 -index 71b2383..0000000 ---- a/src/xcb_lock.c -+++ /dev/null -@@ -1,235 +0,0 @@ --/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett -- * This file is licensed under the MIT license. See the file COPYING. */ -- --#ifdef HAVE_CONFIG_H --#include <config.h> --#endif -- --#include "Xlibint.h" --#include "locking.h" --#include "Xxcbint.h" --#include <xcb/xcbext.h> --#include <xcb/xcbxlib.h> -- --#include <pthread.h> -- --static void _XCBLockDisplay(Display *dpy) --{ -- if(dpy->xcb->lock_fns.lock_display) -- dpy->xcb->lock_fns.lock_display(dpy); -- if(!dpy->lock || dpy->lock->locking_level == 0) -- xcb_xlib_lock(dpy->xcb->connection); -- if(!(dpy->flags & XlibDisplayIOError)) -- _XGetXCBBuffer(dpy); --} -- --/* XXX: If you change this function, update _XReply's copy of its guts! */ --static void _XCBUnlockDisplay(Display *dpy) --{ -- if(!(dpy->flags & XlibDisplayIOError)) -- { -- _XPutXCBBuffer(dpy); -- assert(dpy->xcb->partial_request == 0); -- assert(xcb_get_request_sent(dpy->xcb->connection) == dpy->request); -- -- /* Traditional Xlib does this in _XSend; see the Xlib/XCB version -- * of that function for why we do it here instead. */ -- _XSetSeqSyncFunction(dpy); -- } -- -- if(!dpy->lock || dpy->lock->locking_level == 0) -- xcb_xlib_unlock(dpy->xcb->connection); -- if(dpy->xcb->lock_fns.unlock_display) -- dpy->xcb->lock_fns.unlock_display(dpy); --} -- --int _XCBInitDisplayLock(Display *dpy) --{ -- if(!dpy->lock_fns && !(dpy->lock_fns = Xcalloc(1, sizeof(*dpy->lock_fns)))) -- return 0; -- dpy->xcb->lock_fns.lock_display = dpy->lock_fns->lock_display; -- dpy->lock_fns->lock_display = _XCBLockDisplay; -- dpy->xcb->lock_fns.unlock_display = dpy->lock_fns->unlock_display; -- dpy->lock_fns->unlock_display = _XCBUnlockDisplay; -- return 1; --} -- --void _XCBShutdownDisplayLock(Display *dpy) --{ -- if(dpy->lock_fns) { -- Xfree((char *)dpy->lock_fns); -- dpy->lock_fns = NULL; -- } --} -- --void _XGetXCBBuffer(Display *dpy) --{ -- static const xReq dummy_request; -- unsigned int xcb_req = xcb_get_request_sent(dpy->xcb->connection); -- if(xcb_connection_has_error(dpy->xcb->connection)) -- _XIOError(dpy); -- -- /* if Xlib has a partial request pending then XCB doesn't know about -- * the current request yet */ -- if(dpy->xcb->partial_request) -- ++xcb_req; -- -- assert(XCB_SEQUENCE_COMPARE(xcb_req, >=, dpy->request)); -- dpy->request = xcb_req; -- -- dpy->last_req = (char *) &dummy_request; --} -- --static size_t request_length(struct iovec *vec) --{ -- /* we have at least part of a request. dig out the length field. -- * note that length fields are always in vec[0]: Xlib doesn't split -- * fixed-length request parts. */ -- size_t len; -- assert(vec[0].iov_len >= 4); -- len = ((uint16_t *) vec[0].iov_base)[1]; -- if(len == 0) -- { -- /* it's a bigrequest. dig out the *real* length field. */ -- assert(vec[0].iov_len >= 8); -- len = ((uint32_t *) vec[0].iov_base)[1]; -- } -- return len << 2; --} -- --static inline int issue_complete_request(Display *dpy, int veclen, struct iovec *vec) --{ -- xcb_protocol_request_t xcb_req = { 0 }; -- unsigned int sequence; -- int flags = XCB_REQUEST_RAW; -- int i; -- size_t len; -- -- /* skip empty iovecs. if no iovecs remain, we're done. */ -- assert(veclen >= 0); -- while(veclen > 0 && vec[0].iov_len == 0) -- --veclen, ++vec; -- if(!veclen) -- return 0; -- -- len = request_length(vec); -- -- /* do we have enough data for a complete request? how many iovec -- * elements does it span? */ -- for(i = 0; i < veclen; ++i) -- { -- size_t oldlen = len; -- len -= vec[i].iov_len; -- /* if len is now 0 or has wrapped, we have enough data. */ -- if((len - 1) > oldlen) -- break; -- } -- if(i == veclen) -- return 0; -- -- /* we have enough data to issue one complete request. the remaining -- * code can't fail. */ -- -- /* len says how far we overshot our data needs. (it's "negative" if -- * we actually overshot, or 0 if we're right on.) */ -- vec[i].iov_len += len; -- xcb_req.count = i + 1; -- xcb_req.opcode = ((uint8_t *) vec[0].iov_base)[0]; -- -- /* if we don't own the event queue, we have to ask XCB to set our -- * errors aside for us. */ -- if(dpy->xcb->event_owner != XlibOwnsEventQueue) -- flags |= XCB_REQUEST_CHECKED; -- -- /* XCB will always skip request 0; account for that in the Xlib count */ -- if (xcb_get_request_sent(dpy->xcb->connection) == 0xffffffff) -- dpy->request++; -- /* send the accumulated request. */ -- sequence = xcb_send_request(dpy->xcb->connection, flags, vec, &xcb_req); -- if(!sequence) -- _XIOError(dpy); -- -- /* update the iovecs to refer only to data not yet sent. */ -- vec[i].iov_len = -len; -- -- /* iff we asked XCB to set aside errors, we must pick those up -- * eventually. iff there are async handlers, we may have just -- * issued requests that will generate replies. in either case, -- * we need to remember to check later. */ -- if(flags & XCB_REQUEST_CHECKED || dpy->async_handlers) -- { -- PendingRequest *req = malloc(sizeof(PendingRequest)); -- assert(req); -- req->next = 0; -- req->waiters = -1; -- req->sequence = sequence; -- *dpy->xcb->pending_requests_tail = req; -- dpy->xcb->pending_requests_tail = &req->next; -- } -- return 1; --} -- --void _XPutXCBBuffer(Display *dpy) --{ -- static char const pad[3]; -- const int padsize = -dpy->xcb->request_extra_size & 3; -- xcb_connection_t *c = dpy->xcb->connection; -- _XExtension *ext; -- struct iovec iov[6]; -- -- assert_sequence_less(dpy->last_request_read, dpy->request); -- assert_sequence_less(xcb_get_request_sent(c), dpy->request); -- -- for(ext = dpy->flushes; ext; ext = ext->next_flush) -- { -- ext->before_flush(dpy, &ext->codes, dpy->buffer, dpy->bufptr - dpy->buffer); -- if(dpy->xcb->request_extra) -- { -- ext->before_flush(dpy, &ext->codes, dpy->xcb->request_extra, dpy->xcb->request_extra_size); -- if(padsize) -- ext->before_flush(dpy, &ext->codes, pad, padsize); -- } -- } -- -- iov[2].iov_base = dpy->xcb->partial_request; -- iov[2].iov_len = dpy->xcb->partial_request_offset; -- iov[3].iov_base = dpy->buffer; -- iov[3].iov_len = dpy->bufptr - dpy->buffer; -- iov[4].iov_base = (caddr_t) dpy->xcb->request_extra; -- iov[4].iov_len = dpy->xcb->request_extra_size; -- iov[5].iov_base = (caddr_t) pad; -- iov[5].iov_len = padsize; -- -- while(issue_complete_request(dpy, 4, iov + 2)) -- /* empty */; -- -- /* first discard any completed partial_request. */ -- if(iov[2].iov_len == 0 && dpy->xcb->partial_request) -- { -- free(dpy->xcb->partial_request); -- dpy->xcb->partial_request = 0; -- dpy->xcb->partial_request_offset = 0; -- } -- -- /* is there anything to copy into partial_request? */ -- if(iov[3].iov_len != 0 || iov[4].iov_len != 0 || iov[5].iov_len != 0) -- { -- int i; -- if(!dpy->xcb->partial_request) -- { -- size_t len = request_length(iov + 3); -- assert(!dpy->xcb->partial_request_offset); -- dpy->xcb->partial_request = malloc(len); -- assert(dpy->xcb->partial_request); -- } -- for(i = 3; i < sizeof(iov) / sizeof(*iov); ++i) -- { -- memcpy(dpy->xcb->partial_request + dpy->xcb->partial_request_offset, iov[i].iov_base, iov[i].iov_len); -- dpy->xcb->partial_request_offset += iov[i].iov_len; -- } -- } -- -- dpy->xcb->request_extra = 0; -- dpy->xcb->request_extra_size = 0; -- dpy->bufptr = dpy->buffer; --} --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libX11/files/xlib-0002-Fix-XAllocID-race-hold-the-user-display-lock-until.patch b/x11-libs/libX11/files/xlib-0002-Fix-XAllocID-race-hold-the-user-display-lock-until.patch deleted file mode 100644 index 8d094d3..0000000 --- a/x11-libs/libX11/files/xlib-0002-Fix-XAllocID-race-hold-the-user-display-lock-until.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d4e77ee5023cda7cb04afdce9be81eaf72785c2a Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Sun, 23 Mar 2008 16:33:27 -0700 -Subject: [PATCH 2/4] Fix XAllocID race: hold the user display lock until we have a new XID. - -Xlib built --without-xcb is also vulnerable to this race, and a similar -fix might work there too. - -Also, use an XID that's truly invalid while waiting for the next XID to be -requested. ---- - src/xcb_io.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/src/xcb_io.c b/src/xcb_io.c -index 830ddb9..d0abf4c 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -343,6 +343,10 @@ _XIDHandler(Display *dpy) - { - XID next = xcb_generate_id(dpy->xcb->connection); - LockDisplay(dpy); -+#ifdef XTHREADS -+ if (dpy->lock) -+ (*dpy->lock->user_unlock_display)(dpy); -+#endif - dpy->xcb->next_xid = next; - if(dpy->flags & XlibDisplayPrivSync) - { -@@ -357,8 +361,13 @@ _XIDHandler(Display *dpy) - /* _XAllocID - resource ID allocation routine. */ - XID _XAllocID(Display *dpy) - { -+ const XID inval = ~0UL; - XID ret = dpy->xcb->next_xid; -- dpy->xcb->next_xid = 0; -+#ifdef XTHREADS -+ if (ret != inval && dpy->lock) -+ (*dpy->lock->user_lock_display)(dpy); -+#endif -+ dpy->xcb->next_xid = inval; - - if(!(dpy->flags & XlibDisplayPrivSync)) - { --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libX11/files/xlib-0003-Permit-only-one-Xlib-thread-to-block-waiting-for-eve.patch b/x11-libs/libX11/files/xlib-0003-Permit-only-one-Xlib-thread-to-block-waiting-for-eve.patch deleted file mode 100644 index 5762f30..0000000 --- a/x11-libs/libX11/files/xlib-0003-Permit-only-one-Xlib-thread-to-block-waiting-for-eve.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 1cfce69bf65d9631a72f8b20d637bf158c0afd20 Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Sat, 11 Oct 2008 21:10:00 -0700 -Subject: [PATCH 3/4] Permit only one Xlib thread to block waiting for events - -As Xlib queues events internally, we must prevent multiple Xlib threads from -entering XCB to wait for an event in case the queued event is to be -delivered to the thread which didn't manage to read it. In other words, let -only one Xlib thread into xcb_wait_for_event at a time. - -Jamey Sharp looked over my shoulder while making this fix and, while hating -my whitespace conventions, appears happy enough with the actual code. - -Signed-off-by: Keith Packard <keithp@keithp.com> ---- - src/Xxcbint.h | 7 +++++++ - src/xcb_disp.c | 2 ++ - src/xcb_io.c | 18 ++++++++++++++---- - 3 files changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/Xxcbint.h b/src/Xxcbint.h -index 1b3137b..f4af324 100644 ---- a/src/Xxcbint.h -+++ b/src/Xxcbint.h -@@ -8,6 +8,7 @@ - #include <stdint.h> - #include <X11/Xlibint.h> - #include <X11/Xlib-xcb.h> -+#include "locking.h" - - #define XLIB_SEQUENCE_COMPARE(a,op,b) (((long) (a) - (long) (b)) op 0) - -@@ -29,6 +30,12 @@ typedef struct _X11XCBPrivate { - uint64_t last_flushed; - enum XEventQueueOwner event_owner; - XID next_xid; -+ -+ /* handle simultaneous threads waiting for events, -+ * used in wait_or_poll_for_event -+ */ -+ xcondition_t event_notify; -+ int event_waiter; - } _X11XCBPrivate; - - /* xcb_disp.c */ -diff --git a/src/xcb_disp.c b/src/xcb_disp.c -index dfd6803..628c654 100644 ---- a/src/xcb_disp.c -+++ b/src/xcb_disp.c -@@ -93,6 +93,7 @@ int _XConnectXCB(Display *dpy, _Xconst char *display, char **fullnamep, int *scr - dpy->xcb->pending_requests_tail = &dpy->xcb->pending_requests; - dpy->xcb->next_xid = xcb_generate_id(dpy->xcb->connection); - -+ dpy->xcb->event_notify = xcondition_malloc(); - return !xcb_connection_has_error(c); - } - -@@ -106,5 +107,6 @@ void _XFreeX11XCBStructure(Display *dpy) - dpy->xcb->pending_requests = tmp->next; - free(tmp); - } -+ xcondition_free(dpy->xcb->event_notify); - Xfree(dpy->xcb); - } -diff --git a/src/xcb_io.c b/src/xcb_io.c -index d0abf4c..fc8e53f 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -125,9 +125,20 @@ static xcb_generic_event_t * wait_or_poll_for_event(Display *dpy, int wait) - xcb_generic_event_t *event; - if(wait) - { -- UnlockDisplay(dpy); -- event = xcb_wait_for_event(c); -- LockDisplay(dpy); -+ if(dpy->xcb->event_waiter) -+ { -+ ConditionWait(dpy, dpy->xcb->event_notify); -+ event = xcb_poll_for_event(c); -+ } -+ else -+ { -+ dpy->xcb->event_waiter = 1; -+ UnlockDisplay(dpy); -+ event = xcb_wait_for_event(c); -+ LockDisplay(dpy); -+ dpy->xcb->event_waiter = 0; -+ ConditionBroadcast(dpy, dpy->xcb->event_notify); -+ } - } - else - event = xcb_poll_for_event(c); -@@ -228,7 +239,6 @@ static void process_responses(Display *dpy, int wait_for_first_event, xcb_generi - _XIOError(dpy); - - assert(XLIB_SEQUENCE_COMPARE(dpy->last_request_read, <=, dpy->request)); -- assert(!wait_for_first_event); - } - - int _XEventsQueued(Display *dpy, int mode) --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libX11/files/xlib-0004-Ensure-that-_XReadEvents-always-leaves-an-event-in-t.patch b/x11-libs/libX11/files/xlib-0004-Ensure-that-_XReadEvents-always-leaves-an-event-in-t.patch deleted file mode 100644 index 3087efc..0000000 --- a/x11-libs/libX11/files/xlib-0004-Ensure-that-_XReadEvents-always-leaves-an-event-in-t.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bbeafc850181cc0bf9724c71f1aa0015acdb7480 Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Sat, 11 Oct 2008 21:43:58 -0700 -Subject: [PATCH 4/4] Ensure that _XReadEvents always leaves an event in the queue on return - -XNextEvent assumes that the event queue will be non-empty on return from -_XReadEvents, but with multiple event readers running, the previous change -could leave the queue empty on return from process_responses. Re-invoke -process_responses until the queue is non-empty. - -Signed-off-by: Keith Packard <keithp@keithp.com> ---- - src/xcb_io.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/xcb_io.c b/src/xcb_io.c -index fc8e53f..2256a3f 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -267,7 +267,9 @@ void _XReadEvents(Display *dpy) - if(dpy->xcb->event_owner != XlibOwnsEventQueue) - return; - check_internal_connections(dpy); -- process_responses(dpy, 1, 0, 0); -+ do { -+ process_responses(dpy, 1, 0, 0); -+ } while (dpy->qlen == 0); - } - - /* --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libX11/libX11-9999.ebuild b/x11-libs/libX11/libX11-9999.ebuild deleted file mode 100644 index dd2d36b..0000000 --- a/x11-libs/libX11/libX11-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org X11 library" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6 xcb" -RDEPEND=">=x11-libs/xtrans-1.0.1 - x11-libs/libXau - x11-libs/libXdmcp - x11-proto/kbproto - >=x11-proto/xproto-9999 - xcb? ( >=x11-libs/libxcb-9999 )" -DEPEND="${RDEPEND} - x11-proto/xf86bigfontproto - x11-proto/bigreqsproto - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xcmiscproto - >=x11-misc/util-macros-0.99.0_p20051007" - -PATCHES="${FILESDIR}/xlib-*.patch" - -CONFIGURE_OPTIONS="$(use_enable ipv6) - $(use_with xcb)" -# xorg really doesn't like xlocale disabled. -# $(use_enable nls xlocale) - -src_unpack() { - x-modular_specs_check - x-modular_dri_check - git_src_unpack - cd ${S} - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest deleted file mode 100644 index 9ffff75..0000000 --- a/x11-libs/libXScrnSaver/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXScrnSaver-9999.ebuild 356 RMD160 25a1f762436135e848692dc90f2cd7d58fb1943b SHA1 677518ce47311aa5ee735888fbf9e6d6837ea904 SHA256 def6289dc22806b4276e9301da4fec75228630816d23234c03601a33b4d22959 diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild deleted file mode 100644 index c4cc181..0000000 --- a/x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XScrnSaver library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - >=x11-proto/scrnsaverproto-1.1" diff --git a/x11-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest deleted file mode 100644 index b48672c..0000000 --- a/x11-libs/libXTrap/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXTrap-9999.ebuild 356 RMD160 40077d9f05cdb35fdeb9bb5ca1c73ac95ebad5b4 SHA1 cfbf178b059c3902ae596f991b7419fdad2bb908 SHA256 44dc13f7a7812dafb7bc5cf16900c25c07d212ae25b0b384fd3131255d83517b diff --git a/x11-libs/libXTrap/libXTrap-9999.ebuild b/x11-libs/libXTrap/libXTrap-9999.ebuild deleted file mode 100644 index 5896fc5..0000000 --- a/x11-libs/libXTrap/libXTrap-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XTrap library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/trapproto" diff --git a/x11-libs/libXamine/Manifest b/x11-libs/libXamine/Manifest deleted file mode 100644 index 4190c10..0000000 --- a/x11-libs/libXamine/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXamine-9999.ebuild 448 RMD160 698fd28657747939f303e7c3d770dff8c500178e SHA1 5437441459b27672c1330dd378d634b3edc72e54 SHA256 d8d53af3056f8f5c68eb717996586d9eeccde4ba98f551329b78ad2eef77848a diff --git a/x11-libs/libXamine/libXamine-9999.ebuild b/x11-libs/libXamine/libXamine-9999.ebuild deleted file mode 100644 index d35ba21..0000000 --- a/x11-libs/libXamine/libXamine-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libXamine" - -DESCRIPTION="X C-language Bindings library" -HOMEPAGE="http://xcb.freedesktop.org/" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libxcb" -DEPEND="${RDEPEND} - >=x11-proto/xcb-proto-9999" - diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest deleted file mode 100644 index 41db5e4..0000000 --- a/x11-libs/libXau/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXau-9999.ebuild 328 RMD160 594a384314748391deb9e27130e9c9e3ae85260b SHA1 53d3abcbb40104acf7660e811b0afc09567e5f32 SHA256 453bd83889097cbdd28ba76a456b54aba0013b143993a840ce550352e64c1ac3 diff --git a/x11-libs/libXau/libXau-9999.ebuild b/x11-libs/libXau/libXau-9999.ebuild deleted file mode 100644 index ba9b1ab..0000000 --- a/x11-libs/libXau/libXau-9999.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xau library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-proto/xproto" -DEPEND="${RDEPEND} - >=x11-misc/util-macros-1.1" diff --git a/x11-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest deleted file mode 100644 index 3d722a0..0000000 --- a/x11-libs/libXaw/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX libXaw-9999-configure.patch 360 RMD160 a84a6f45fac425ce7fe6e2aa9058b7a0464ad22a SHA1 bc66799a869b04d9dd7dd4490d3a954d21f66135 SHA256 37697d620a1fb209ac0abb9f06d2624f5859d2d841f0a23c160667e435896a7f -EBUILD libXaw-9999.ebuild 618 RMD160 0a4faaf521fb294af3e23704cc99cf8287c8f2d1 SHA1 42306c62c1d6123038aad4dca8f8ea86c359575d SHA256 bd1956159654439d439fb7078c1c4669b03aed83df748d6eaac2f6502404a37c diff --git a/x11-libs/libXaw/files/libXaw-9999-configure.patch b/x11-libs/libXaw/files/libXaw-9999-configure.patch deleted file mode 100644 index c6f97b9..0000000 --- a/x11-libs/libXaw/files/libXaw-9999-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1e93691..1104d99 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,7 @@ AM_CONFIG_HEADER(config.h) - # Check for progs - AC_PROG_CC - AC_PROG_LIBTOOL -+LT_OUTPUT - - # Need to call this explicitly since the first call to PKG_CHECK_MODULES - # is in an if statement, and later calls would break if it's skipped. diff --git a/x11-libs/libXaw/libXaw-9999.ebuild b/x11-libs/libXaw/libXaw-9999.ebuild deleted file mode 100644 index d6a95d0..0000000 --- a/x11-libs/libXaw/libXaw-9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EGIT_PATCHES="*.patch" -inherit x-modular - -DESCRIPTION="X.Org Xaw library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXpm - x11-proto/xproto - xprint? ( x11-libs/libXp )" -DEPEND="${RDEPEND} - sys-apps/ed" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest deleted file mode 100644 index 4820960..0000000 --- a/x11-libs/libXcomposite/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXcomposite-9999.ebuild 409 RMD160 7827f66c9ac6bbdb7ce2918534d717f31201a985 SHA1 99b0088dd3607890178413fd12875c8fa26e02ac SHA256 7dbe4ae77795315f45e16eef0ff0213185aa0b381c913132a7837e00d84623c5 diff --git a/x11-libs/libXcomposite/libXcomposite-9999.ebuild b/x11-libs/libXcomposite/libXcomposite-9999.ebuild deleted file mode 100644 index f205e8f..0000000 --- a/x11-libs/libXcomposite/libXcomposite-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xcomposite library" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXext - >=x11-proto/compositeproto-0.4 - x11-proto/xproto" -DEPEND="${RDEPEND} - app-text/xmlto" diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest deleted file mode 100644 index 42ff2dd..0000000 --- a/x11-libs/libXcursor/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXcursor-9999.ebuild 683 RMD160 671ee92c782a82b127e378cf03b79d2c75db578c SHA1 4384e62199db21b232452d99402000bac88df073 SHA256 df0d7261b590ca94e183ac945f3b1bcbf6fabfac6227c231e41cede57c8afc42 diff --git a/x11-libs/libXcursor/libXcursor-9999.ebuild b/x11-libs/libXcursor/libXcursor-9999.ebuild deleted file mode 100644 index 57decb7..0000000 --- a/x11-libs/libXcursor/libXcursor-9999.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xcursor library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libXrender - x11-libs/libXfixes - x11-libs/libX11 - x11-proto/xproto" -DEPEND="${RDEPEND}" - -CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11 - --with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps" diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest deleted file mode 100644 index ab5501f..0000000 --- a/x11-libs/libXdamage/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXdamage-9999.ebuild 508 RMD160 8d990e1f2e006155e436c6eff07a30d7517a3c04 SHA1 21f218c91aea57754640ca4dc2840e06dd8ee87d SHA256 e6f585e319cacac45b715cc0edc9a7a6efa075bcc3b5deca384498bf04b6c82b diff --git a/x11-libs/libXdamage/libXdamage-9999.ebuild b/x11-libs/libXdamage/libXdamage-9999.ebuild deleted file mode 100644 index 6d699af..0000000 --- a/x11-libs/libXdamage/libXdamage-9999.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xdamage library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXfixes - >=x11-proto/damageproto-1.1 - x11-proto/xproto" -DEPEND="${RDEPEND}" - -pkg_postinst() { - x-modular_pkg_postinst - - ewarn "Compositing managers may stop working." - ewarn "To fix them, recompile xorg-server." -} diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest deleted file mode 100644 index 41b6054..0000000 --- a/x11-libs/libXdmcp/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXdmcp-9999.ebuild 330 RMD160 f8b733bf9f50a80ab1f80dfe67a629dce7b47600 SHA1 854b91fb22e46d8e4e7dd9a74f8153bc1ec9f851 SHA256 90f82b694abb9b9dc603175659359163b2976fb7ce5e2109ce5f3f326073224b diff --git a/x11-libs/libXdmcp/libXdmcp-9999.ebuild b/x11-libs/libXdmcp/libXdmcp-9999.ebuild deleted file mode 100644 index b8e8112..0000000 --- a/x11-libs/libXdmcp/libXdmcp-9999.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xdmcp library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-proto/xproto" -DEPEND="${RDEPEND} - >=x11-misc/util-macros-1.1" diff --git a/x11-libs/libXevie/Manifest b/x11-libs/libXevie/Manifest deleted file mode 100644 index 84daa41..0000000 --- a/x11-libs/libXevie/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXevie-9999.ebuild 356 RMD160 a576fd4e15a1278821703639c1e93eeadcae4e36 SHA1 415fbbe8873f8f3fd7f537c92222c7a698e86421 SHA256 b80c2a1f37798dff1933fb2a1a5ba94caeaf097ab70e9e93756140e5360ff459 diff --git a/x11-libs/libXevie/libXevie-9999.ebuild b/x11-libs/libXevie/libXevie-9999.ebuild deleted file mode 100644 index cfb4e05..0000000 --- a/x11-libs/libXevie/libXevie-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xevie library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-proto/xproto - x11-proto/evieext" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest deleted file mode 100644 index dcf573c..0000000 --- a/x11-libs/libXext/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXext-9999.ebuild 360 RMD160 2c986083084597d24398a373f5a74aa34a3e0a0e SHA1 3b22b6e71b1c16652290df427fd1dfa3642f051d SHA256 b1c3e3531772a4b01d59f8792d814746320cb6f11b850b1b4cd65aa3ec61d48e diff --git a/x11-libs/libXext/libXext-9999.ebuild b/x11-libs/libXext/libXext-9999.ebuild deleted file mode 100644 index 9b4fbb3..0000000 --- a/x11-libs/libXext/libXext-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xext library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND=">=x11-libs/libX11-9999 - >=x11-proto/xextproto-9999" -DEPEND="${RDEPEND} - >=x11-proto/xproto-9999" diff --git a/x11-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest deleted file mode 100644 index ff7707a..0000000 --- a/x11-libs/libXfixes/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXfixes-9999.ebuild 367 RMD160 5d773f7a0bbd313d55f33644251f3e7d8a378efe SHA1 651c2e353de7c3c86b5b9a6e6ebb49a7c8ab2f25 SHA256 0cb2e113aa80df8091a1908fffb3341f4d0c3b2aaddf06ed12dd42f76c026857 diff --git a/x11-libs/libXfixes/libXfixes-9999.ebuild b/x11-libs/libXfixes/libXfixes-9999.ebuild deleted file mode 100644 index b5fec62..0000000 --- a/x11-libs/libXfixes/libXfixes-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xfixes library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - >=x11-proto/fixesproto-4 - x11-proto/xproto" -DEPEND="${RDEPEND} - x11-proto/xextproto" diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest deleted file mode 100644 index cbe4329..0000000 --- a/x11-libs/libXfont/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXfont-9999.ebuild 713 RMD160 c90a12a57e29711e783107f17b1b4f6bacd9d753 SHA1 0805d6c1567339c23c0f7e367157a57959a85a40 SHA256 8d66d8f27cb81e0c38b65e117a6c8447c4880bfd626bf9f9893e01e325c9fe0f diff --git a/x11-libs/libXfont/libXfont-9999.ebuild b/x11-libs/libXfont/libXfont-9999.ebuild deleted file mode 100644 index d0f54fa..0000000 --- a/x11-libs/libXfont/libXfont-9999.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular flag-o-matic - -DESCRIPTION="X.Org Xfont library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="x11-libs/xtrans - x11-libs/libfontenc - x11-proto/xproto - x11-proto/fontsproto - >=media-libs/freetype-2" -DEPEND="${RDEPEND} - x11-proto/fontcacheproto" - -CONFIGURE_OPTIONS="$(use_enable ipv6) - --with-encodingsdir=/usr/share/fonts/encodings" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest deleted file mode 100644 index d3fe6c1..0000000 --- a/x11-libs/libXfontcache/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXfontcache-9999.ebuild 350 RMD160 24931d3407c4ce7d90f1414a4610cae3e728d90f SHA1 683dc41fc39dc0c3de43de78a682fd8baa278174 SHA256 11592076d801a6b7c7c103be7d4e4f5d494456e197f44fd7042db94058755aa0 diff --git a/x11-libs/libXfontcache/libXfontcache-9999.ebuild b/x11-libs/libXfontcache/libXfontcache-9999.ebuild deleted file mode 100644 index 7653f54..0000000 --- a/x11-libs/libXfontcache/libXfontcache-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xfontcache library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/fontcacheproto" diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest deleted file mode 100644 index 2df9302..0000000 --- a/x11-libs/libXft/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX lcd.patch 22614 RMD160 a7bc974cabf98808a665cc76df0b58464d39d09d SHA1 59b10db254031b59fc8bbefe5b5b32553b2ce6f6 SHA256 fab5387b35e6b3b2f16301732c34fc66975bba565a97f6f9cb041811cac0c913 -EBUILD libXft-9999.ebuild 827 RMD160 9a639eaff1069404e44142aabd041dabe81a7ea1 SHA1 ad71818e0c1c7f217bc93d06e0a81cee9fbbfb64 SHA256 7c0f091a3b219e56bc7b8b1c5ee4e21d20ade2a229c0867729280dedcb18eb60 diff --git a/x11-libs/libXft/files/lcd.patch b/x11-libs/libXft/files/lcd.patch deleted file mode 100644 index 1588a31..0000000 --- a/x11-libs/libXft/files/lcd.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff --git a/src/xftglyphs.c b/src/xftglyphs.c -index fc11da4..1e6b0da 100644 ---- a/src/xftglyphs.c -+++ b/src/xftglyphs.c -@@ -21,23 +21,14 @@ - */ - - #include "xftint.h" --#include <freetype/ftoutln.h> -- --static const int filters[3][3] = { -- /* red */ --#if 0 --{ 65538*4/7,65538*2/7,65538*1/7 }, -- /* green */ --{ 65536*1/4, 65536*2/4, 65537*1/4 }, -- /* blue */ --{ 65538*1/7,65538*2/7,65538*4/7 }, -+ -+#if FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH < 20202 -+# error "FreeType 2.2.2 or later required to compile this version of libXft" - #endif --{ 65538*9/13,65538*3/13,65538*1/13 }, -- /* green */ --{ 65538*1/6, 65538*4/6, 65538*1/6 }, -- /* blue */ --{ 65538*1/13,65538*3/13,65538*9/13 }, --}; -+ -+#include FT_OUTLINE_H -+#include FT_LCD_FILTER_H -+#include FT_SYNTHESIS_H - - /* - * Validate the memory info for a font -@@ -65,6 +56,293 @@ _XftFontValidateMemory (Display *dpy, XftFont *public) - font->glyph_memory, glyph_memory); - } - -+/* we sometimes need to convert the glyph bitmap in a FT_GlyphSlot -+ * into a different format. For example, we want to convert a -+ * FT_PIXEL_MODE_LCD or FT_PIXEL_MODE_LCD_V bitmap into a 32-bit -+ * ARGB or ABGR bitmap. -+ * -+ * this function prepares a target descriptor for this operation. -+ * -+ * input :: target bitmap descriptor. The function will set its -+ * 'width', 'rows' and 'pitch' fields, and only these -+ * -+ * slot :: the glyph slot containing the source bitmap. this -+ * function assumes that slot->format == FT_GLYPH_FORMAT_BITMAP -+ * -+ * mode :: the requested final rendering mode. supported values are -+ * MONO, NORMAL (i.e. gray), LCD and LCD_V -+ * -+ * the function returns the size in bytes of the corresponding buffer, -+ * it's up to the caller to allocate the corresponding memory block -+ * before calling _fill_xrender_bitmap -+ * -+ * it also returns -1 in case of error (e.g. incompatible arguments, -+ * like trying to convert a gray bitmap into a monochrome one) -+ */ -+static int -+_compute_xrender_bitmap_size( FT_Bitmap* target, -+ FT_GlyphSlot slot, -+ FT_Render_Mode mode ) -+{ -+ FT_Bitmap* ftbit; -+ int width, height, pitch; -+ -+ if ( slot->format != FT_GLYPH_FORMAT_BITMAP ) -+ return -1; -+ -+ // compute the size of the final bitmap -+ ftbit = &slot->bitmap; -+ -+ width = ftbit->width; -+ height = ftbit->rows; -+ pitch = (width+3) & ~3; -+ -+ switch ( ftbit->pixel_mode ) -+ { -+ case FT_PIXEL_MODE_MONO: -+ if ( mode == FT_RENDER_MODE_MONO ) -+ { -+ pitch = (((width+31) & ~31) >> 3); -+ break; -+ } -+ /* fall-through */ -+ -+ case FT_PIXEL_MODE_GRAY: -+ if ( mode == FT_RENDER_MODE_LCD || -+ mode == FT_RENDER_MODE_LCD_V ) -+ { -+ /* each pixel is replicated into a 32-bit ARGB value */ -+ pitch = width*4; -+ } -+ break; -+ -+ case FT_PIXEL_MODE_LCD: -+ if ( mode != FT_RENDER_MODE_LCD ) -+ return -1; -+ -+ /* horz pixel triplets are packed into 32-bit ARGB values */ -+ width /= 3; -+ pitch = width*4; -+ break; -+ -+ case FT_PIXEL_MODE_LCD_V: -+ if ( mode != FT_RENDER_MODE_LCD_V ) -+ return -1; -+ -+ /* vert pixel triplets are packed into 32-bit ARGB values */ -+ height /= 3; -+ pitch = width*4; -+ break; -+ -+ default: /* unsupported source format */ -+ return -1; -+ } -+ -+ target->width = width; -+ target->rows = height; -+ target->pitch = pitch; -+ target->buffer = NULL; -+ -+ return pitch * height; -+} -+ -+/* this functions converts the glyph bitmap found in a FT_GlyphSlot -+ * into a different format (see _compute_xrender_bitmap_size) -+ * -+ * you should call this function after _compute_xrender_bitmap_size -+ * -+ * target :: target bitmap descriptor. Note that its 'buffer' pointer -+ * must point to memory allocated by the caller -+ * -+ * slot :: the glyph slot containing the source bitmap -+ * -+ * mode :: the requested final rendering mode -+ * -+ * bgr :: boolean, set if BGR or VBGR pixel ordering is needed -+ */ -+static void -+_fill_xrender_bitmap( FT_Bitmap* target, -+ FT_GlyphSlot slot, -+ FT_Render_Mode mode, -+ int bgr ) -+{ -+ FT_Bitmap* ftbit = &slot->bitmap; -+ -+ { -+ unsigned char* srcLine = ftbit->buffer; -+ unsigned char* dstLine = target->buffer; -+ int src_pitch = ftbit->pitch; -+ int width = target->width; -+ int height = target->rows; -+ int pitch = target->pitch; -+ int subpixel; -+ int h; -+ -+ subpixel = ( mode == FT_RENDER_MODE_LCD || -+ mode == FT_RENDER_MODE_LCD_V ); -+ -+ if ( src_pitch < 0 ) -+ srcLine -= src_pitch*(ftbit->rows-1); -+ -+ switch ( ftbit->pixel_mode ) -+ { -+ case FT_PIXEL_MODE_MONO: -+ if ( subpixel ) /* convert mono to ARGB32 values */ -+ { -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ { -+ int x; -+ -+ for ( x = 0; x < width; x++ ) -+ { -+ if ( srcLine[(x >> 3)] & (0x80 >> (x & 7)) ) -+ ((unsigned int*)dstLine)[x] = 0xffffffffU; -+ } -+ } -+ } -+ else if ( mode == FT_RENDER_MODE_NORMAL ) /* convert mono to 8-bit gray */ -+ { -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ { -+ int x; -+ -+ for ( x = 0; x < width; x++ ) -+ { -+ if ( srcLine[(x >> 3)] & (0x80 >> (x & 7)) ) -+ dstLine[x] = 0xff; -+ } -+ } -+ } -+ else /* copy mono to mono */ -+ { -+ int bytes = (width+7) >> 3; -+ -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ memcpy( dstLine, srcLine, bytes ); -+ } -+ break; -+ -+ case FT_PIXEL_MODE_GRAY: -+ if ( subpixel ) /* convert gray to ARGB32 values */ -+ { -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ { -+ int x; -+ unsigned int* dst = (unsigned int*)dstLine; -+ -+ for ( x = 0; x < width; x++ ) -+ { -+ unsigned int pix = srcLine[x]; -+ -+ pix |= (pix << 8); -+ pix |= (pix << 16); -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ else /* copy gray into gray */ -+ { -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ memcpy( dstLine, srcLine, width ); -+ } -+ break; -+ -+ case FT_PIXEL_MODE_LCD: -+ if ( !bgr ) -+ { -+ /* convert horizontal RGB into ARGB32 */ -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ { -+ int x; -+ unsigned char* src = srcLine; -+ unsigned int* dst = (unsigned int*)dstLine; -+ -+ for ( x = 0; x < width; x++, src += 3 ) -+ { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[0] << 16) | -+ ((unsigned int)src[1] << 8) | -+ ((unsigned int)src[2] ) | -+ ((unsigned int)src[1] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ else -+ { -+ /* convert horizontal BGR into ARGB32 */ -+ for ( h = height; h > 0; h--, srcLine += src_pitch, dstLine += pitch ) -+ { -+ int x; -+ unsigned char* src = srcLine; -+ unsigned int* dst = (unsigned int*)dstLine; -+ -+ for ( x = 0; x < width; x++, src += 3 ) -+ { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[2] << 16) | -+ ((unsigned int)src[1] << 8) | -+ ((unsigned int)src[0] ) | -+ ((unsigned int)src[1] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ break; -+ -+ default: /* FT_PIXEL_MODE_LCD_V */ -+ /* convert vertical RGB into ARGB32 */ -+ if ( !bgr ) -+ { -+ for ( h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch ) -+ { -+ int x; -+ unsigned char* src = srcLine; -+ unsigned int* dst = (unsigned int*)dstLine; -+ -+ for ( x = 0; x < width; x++, src += 1 ) -+ { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[0] << 16) | -+ ((unsigned int)src[src_pitch] << 8) | -+ ((unsigned int)src[src_pitch*2] ) | -+ ((unsigned int)src[src_pitch] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ else -+ { -+ for ( h = height; h > 0; h--, srcLine += 3*src_pitch, dstLine += pitch ) -+ { -+ int x; -+ unsigned char* src = srcLine; -+ unsigned int* dst = (unsigned int*)dstLine; -+ -+ for ( x = 0; x < width; x++, src += 1 ) -+ { -+ unsigned int pix; -+ -+ pix = ((unsigned int)src[src_pitch*2] << 16) | -+ ((unsigned int)src[src_pitch] << 8) | -+ ((unsigned int)src[0] ) | -+ ((unsigned int)src[src_pitch] << 24) ; -+ -+ dst[x] = pix; -+ } -+ } -+ } -+ } -+ } -+} -+ - _X_EXPORT void - XftFontLoadGlyphs (Display *dpy, - XftFont *pub, -@@ -83,20 +361,14 @@ XftFontLoadGlyphs (Display *dpy, - unsigned char *bufBitmap = bufLocal; - int bufSize = sizeof (bufLocal); - int size, pitch; -- unsigned char bufLocalRgba[4096]; -- unsigned char *bufBitmapRgba = bufLocalRgba; -- int bufSizeRgba = sizeof (bufLocalRgba); -- int sizergba, pitchrgba, widthrgba; - int width; - int height; - int left, right, top, bottom; -- int hmul = 1; -- int vmul = 1; -- FT_Bitmap ftbit; -- FT_Matrix matrix; -+ FT_Bitmap* ftbit; -+ FT_Bitmap local; - FT_Vector vector; -- Bool subpixel = False; - FT_Face face; -+ FT_Render_Mode mode = FT_RENDER_MODE_MONO; - - if (!info) - return; -@@ -106,24 +378,19 @@ XftFontLoadGlyphs (Display *dpy, - if (!face) - return; - -- matrix.xx = matrix.yy = 0x10000L; -- matrix.xy = matrix.yx = 0; -- - if (font->info.antialias) - { - switch (font->info.rgba) { - case FC_RGBA_RGB: - case FC_RGBA_BGR: -- matrix.xx *= 3; -- subpixel = True; -- hmul = 3; -+ mode = FT_RENDER_MODE_LCD; - break; - case FC_RGBA_VRGB: - case FC_RGBA_VBGR: -- matrix.yy *= 3; -- vmul = 3; -- subpixel = True; -+ mode = FT_RENDER_MODE_LCD_V; - break; -+ default: -+ mode = FT_RENDER_MODE_NORMAL; - } - } - -@@ -144,7 +411,10 @@ XftFontLoadGlyphs (Display *dpy, - if (xftg->glyph_memory) - continue; - -+ FT_Library_SetLcdFilter( _XftFTlibrary, FT_LCD_FILTER_DEFAULT ); -+ - error = FT_Load_Glyph (face, glyphindex, font->info.load_flags); -+ - if (error) - { - /* -@@ -177,7 +447,7 @@ XftFontLoadGlyphs (Display *dpy, - /* - * Compute glyph metrics from FreeType information - */ -- if(font->info.transform && glyphslot->format != ft_glyph_format_bitmap) -+ if(font->info.transform && glyphslot->format != FT_GLYPH_FORMAT_BITMAP) - { - /* - * calculate the true width by transforming all four corners. -@@ -256,17 +526,14 @@ XftFontLoadGlyphs (Display *dpy, - } - } - -- if (font->info.antialias) -- pitch = (width * hmul + 3) & ~3; -- else -- pitch = ((width + 31) & ~31) >> 3; -- -- size = pitch * height * vmul; -+ if ( glyphslot->format != FT_GLYPH_FORMAT_BITMAP ) -+ { -+ error = FT_Render_Glyph( face->glyph, mode ); -+ if (error) -+ continue; -+ } - -- xftg->metrics.width = width; -- xftg->metrics.height = height; -- xftg->metrics.x = -TRUNC(left); -- xftg->metrics.y = TRUNC(top); -+ FT_Library_SetLcdFilter( _XftFTlibrary, FT_LCD_FILTER_NONE ); - - if (font->info.spacing >= FC_MONO) - { -@@ -306,103 +573,13 @@ XftFontLoadGlyphs (Display *dpy, - xftg->metrics.yOff = -TRUNC(ROUND(glyphslot->advance.y)); - } - -- /* -- * If the glyph is relatively large (> 1% of server memory), -- * don't send it until necessary -- */ -- if (!need_bitmaps && size > info->max_glyph_memory / 100) -- continue; - -- /* -- * Make sure there's enough buffer space for the glyph -- */ -- if (size > bufSize) -- { -- if (bufBitmap != bufLocal) -- free (bufBitmap); -- bufBitmap = (unsigned char *) malloc (size); -- if (!bufBitmap) -- continue; -- bufSize = size; -- } -- memset (bufBitmap, 0, size); -+ // compute the size of the final bitmap -+ ftbit = &glyphslot->bitmap; - -- /* -- * Rasterize into the local buffer -- */ -- switch (glyphslot->format) { -- case ft_glyph_format_outline: -- ftbit.width = width * hmul; -- ftbit.rows = height * vmul; -- ftbit.pitch = pitch; -- if (font->info.antialias) -- ftbit.pixel_mode = ft_pixel_mode_grays; -- else -- ftbit.pixel_mode = ft_pixel_mode_mono; -- -- ftbit.buffer = bufBitmap; -- -- if (subpixel) -- FT_Outline_Transform (&glyphslot->outline, &matrix); -- -- FT_Outline_Translate ( &glyphslot->outline, -left*hmul, -bottom*vmul ); -- -- FT_Outline_Get_Bitmap( _XftFTlibrary, &glyphslot->outline, &ftbit ); -- break; -- case ft_glyph_format_bitmap: -- if (font->info.antialias) -- { -- unsigned char *srcLine, *dstLine; -- int height; -- int x; -- int h, v; -- -- srcLine = glyphslot->bitmap.buffer; -- dstLine = bufBitmap; -- height = glyphslot->bitmap.rows; -- while (height--) -- { -- for (x = 0; x < glyphslot->bitmap.width; x++) -- { -- /* always MSB bitmaps */ -- unsigned char a = ((srcLine[x >> 3] & (0x80 >> (x & 7))) ? -- 0xff : 0x00); -- if (subpixel) -- { -- for (v = 0; v < vmul; v++) -- for (h = 0; h < hmul; h++) -- dstLine[v * pitch + x*hmul + h] = a; -- } -- else -- dstLine[x] = a; -- } -- dstLine += pitch * vmul; -- srcLine += glyphslot->bitmap.pitch; -- } -- } -- else -- { -- unsigned char *srcLine, *dstLine; -- int h, bytes; -- -- srcLine = glyphslot->bitmap.buffer; -- dstLine = bufBitmap; -- h = glyphslot->bitmap.rows; -- bytes = (glyphslot->bitmap.width + 7) >> 3; -- while (h--) -- { -- memcpy (dstLine, srcLine, bytes); -- dstLine += pitch; -- srcLine += glyphslot->bitmap.pitch; -- } -- } -- break; -- default: -- if (XftDebug() & XFT_DBG_GLYPH) -- printf ("glyph %d is not in a usable format\n", -- (int) glyphindex); -- continue; -- } -+ width = ftbit->width; -+ height = ftbit->rows; -+ pitch = (width+3) & ~3; - - if (XftDebug() & XFT_DBG_GLYPH) - { -@@ -419,29 +596,72 @@ XftFontLoadGlyphs (Display *dpy, - int x, y; - unsigned char *line; - -- line = bufBitmap; -- for (y = 0; y < height * vmul; y++) -+ line = ftbit->buffer; -+ -+ if (ftbit->pitch < 0) -+ line -= ftbit->pitch*(height-1); -+ -+ for (y = 0; y < height; y++) - { - if (font->info.antialias) - { -- static char den[] = { " .:;=+*#" }; -- for (x = 0; x < pitch; x++) -+ static const char den[] = { " .:;=+*#" }; -+ for (x = 0; x < width; x++) - printf ("%c", den[line[x] >> 5]); - } - else - { -- for (x = 0; x < pitch * 8; x++) -+ for (x = 0; x < width * 8; x++) - { - printf ("%c", line[x>>3] & (1 << (x & 7)) ? '#' : ' '); - } - } - printf ("|\n"); -- line += pitch; -+ line += ftbit->pitch; - } - printf ("\n"); - } - } - -+ size = _compute_xrender_bitmap_size( &local, glyphslot, mode ); -+ if ( size < 0 ) -+ continue; -+ -+ xftg->metrics.width = local.width; -+ xftg->metrics.height = local.rows; -+ xftg->metrics.x = - glyphslot->bitmap_left; -+ xftg->metrics.y = glyphslot->bitmap_top; -+ -+ /* -+ * If the glyph is relatively large (> 1% of server memory), -+ * don't send it until necessary -+ */ -+ if (!need_bitmaps && size > info->max_glyph_memory / 100) -+ continue; -+ -+ /* -+ * Make sure there's enough buffer space for the glyph -+ */ -+ if (size > bufSize) -+ { -+ if (bufBitmap != bufLocal) -+ free (bufBitmap); -+ bufBitmap = (unsigned char *) malloc (size); -+ if (!bufBitmap) -+ continue; -+ bufSize = size; -+ } -+ memset (bufBitmap, 0, size); -+ -+ local.buffer = bufBitmap; -+ -+ _fill_xrender_bitmap( &local, glyphslot, mode, -+ (font->info.rgba == FC_RGBA_BGR || -+ font->info.rgba == FC_RGBA_VBGR ) ); -+ /* -+ * Copy or convert into local buffer -+ */ -+ - /* - * Use the glyph index as the wire encoding; it - * might be more efficient for some locales to map -@@ -451,121 +671,24 @@ XftFontLoadGlyphs (Display *dpy, - */ - glyph = (Glyph) glyphindex; - -- if (subpixel) -- { -- int x, y; -- unsigned char *in_line, *out_line, *in; -- unsigned int *out; -- unsigned int red, green, blue; -- int rf, gf, bf; -- int s; -- int o, os; -- -- /* -- * Filter the glyph to soften the color fringes -- */ -- widthrgba = width; -- pitchrgba = (widthrgba * 4 + 3) & ~3; -- sizergba = pitchrgba * height; -- -- os = 1; -- switch (font->info.rgba) { -- case FC_RGBA_VRGB: -- os = pitch; -- case FC_RGBA_RGB: -- default: -- rf = 0; -- gf = 1; -- bf = 2; -- break; -- case FC_RGBA_VBGR: -- os = pitch; -- case FC_RGBA_BGR: -- bf = 0; -- gf = 1; -- rf = 2; -- break; -- } -- if (sizergba > bufSizeRgba) -- { -- if (bufBitmapRgba != bufLocalRgba) -- free (bufBitmapRgba); -- bufBitmapRgba = (unsigned char *) malloc (sizergba); -- if (!bufBitmapRgba) -- continue; -- bufSizeRgba = sizergba; -- } -- memset (bufBitmapRgba, 0, sizergba); -- in_line = bufBitmap; -- out_line = bufBitmapRgba; -- for (y = 0; y < height; y++) -- { -- in = in_line; -- out = (unsigned int *) out_line; -- in_line += pitch * vmul; -- out_line += pitchrgba; -- for (x = 0; x < width * hmul; x += hmul) -- { -- red = green = blue = 0; -- o = 0; -- for (s = 0; s < 3; s++) -- { -- red += filters[rf][s]*in[x+o]; -- green += filters[gf][s]*in[x+o]; -- blue += filters[bf][s]*in[x+o]; -- o += os; -- } -- red = red / 65536; -- green = green / 65536; -- blue = blue / 65536; -- *out++ = (green << 24) | (red << 16) | (green << 8) | blue; -- } -- } -- -- xftg->glyph_memory = sizergba + sizeof (XftGlyph); -+ xftg->glyph_memory = size + sizeof (XftGlyph); - if (font->format) - { - if (!font->glyphset) - font->glyphset = XRenderCreateGlyphSet (dpy, font->format); -- if (ImageByteOrder (dpy) != XftNativeByteOrder ()) -- XftSwapCARD32 ((CARD32 *) bufBitmapRgba, sizergba >> 2); -- XRenderAddGlyphs (dpy, font->glyphset, &glyph, -- &xftg->metrics, 1, -- (char *) bufBitmapRgba, sizergba); -- } -- else -- { -- if (sizergba) -- { -- xftg->bitmap = malloc (sizergba); -- if (xftg->bitmap) -- memcpy (xftg->bitmap, bufBitmapRgba, sizergba); -- } -- else -- xftg->bitmap = 0; -- } -- } -- else -- { -- xftg->glyph_memory = size + sizeof (XftGlyph); -- if (font->format) -- { -- /* -- * swap bit order around; FreeType is always MSBFirst -- */ -- if (!font->info.antialias) -+ -+ if ( mode == FT_RENDER_MODE_MONO ) - { -+ /* swap bits in each byte */ - if (BitmapBitOrder (dpy) != MSBFirst) - { -- unsigned char *line; -- unsigned char c; -- int i; -+ unsigned char *line = (unsigned char*)bufBitmap; -+ int i = size; - -- line = (unsigned char *) bufBitmap; -- i = size; - while (i--) - { -- c = *line; -+ int c = *line; -+ - c = ((c << 1) & 0xaa) | ((c >> 1) & 0x55); - c = ((c << 2) & 0xcc) | ((c >> 2) & 0x33); - c = ((c << 4) & 0xf0) | ((c >> 4) & 0x0f); -@@ -573,8 +696,12 @@ XftFontLoadGlyphs (Display *dpy, - } - } - } -- if (!font->glyphset) -- font->glyphset = XRenderCreateGlyphSet (dpy, font->format); -+ else if ( mode != FT_RENDER_MODE_NORMAL ) -+ { -+ /* invert ARGB <=> BGRA */ -+ if (ImageByteOrder (dpy) != XftNativeByteOrder ()) -+ XftSwapCARD32 ((CARD32 *) bufBitmap, size >> 2); -+ } - XRenderAddGlyphs (dpy, font->glyphset, &glyph, - &xftg->metrics, 1, - (char *) bufBitmap, size); -@@ -590,7 +717,7 @@ XftFontLoadGlyphs (Display *dpy, - else - xftg->bitmap = 0; - } -- } -+ - font->glyph_memory += xftg->glyph_memory; - info->glyph_memory += xftg->glyph_memory; - if (XftDebug() & XFT_DBG_CACHE) -@@ -601,8 +728,6 @@ XftFontLoadGlyphs (Display *dpy, - } - if (bufBitmap != bufLocal) - free (bufBitmap); -- if (bufBitmapRgba != bufLocalRgba) -- free (bufBitmapRgba); - XftUnlockFace (&font->public); - } - diff --git a/x11-libs/libXft/libXft-9999.ebuild b/x11-libs/libXft/libXft-9999.ebuild deleted file mode 100644 index 6799129..0000000 --- a/x11-libs/libXft/libXft-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit autotools x-modular flag-o-matic git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXft" -#EGIT_PATCHES="${FILESDIR}/lcd.patch" -EGIT_BOOTSTRAP="eautoreconf" -SRC_URI="" - -DESCRIPTION="X.Org Xft library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXext - x11-proto/xproto - media-libs/freetype - >=media-libs/fontconfig-2.2" -DEPEND="${RDEPEND}" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest deleted file mode 100644 index ce13de4..0000000 --- a/x11-libs/libXi/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXi-9999.ebuild 540 RMD160 c452ad45a0dfb8096a8b1edd814920128f67d860 SHA1 01b36e5866f3a6d934590260fb830d248c8a9d2f SHA256 0bc4c18df43c4e4c4e2e5e51a973fd7c7e4b866965e8adc2d693a2024e884467 diff --git a/x11-libs/libXi/libXi-9999.ebuild b/x11-libs/libXi/libXi-9999.ebuild deleted file mode 100644 index cdd7038..0000000 --- a/x11-libs/libXi/libXi-9999.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xi library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND=">=x11-libs/libX11-9999 - >=x11-libs/libXext-9999" -DEPEND="${RDEPEND} - >=x11-proto/xproto-9999 - >=x11-proto/inputproto-9999" - -pkg_postinst() { - x-modular_pkg_postinst - - ewarn "Some special keys and keyboard layouts may stop working." - ewarn "To fix them, recompile xorg-server." -} diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest deleted file mode 100644 index b408b12..0000000 --- a/x11-libs/libXinerama/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXinerama-9999.ebuild 347 RMD160 ff800f0268b8bea7dc67318891d8ee809fdeb2c1 SHA1 0dc844425a5cfd3f95567ed1e79e8e4cabeaeb67 SHA256 f412abad5164d373ed89517afb92826e5c875a51fea6bb714ae942091b684215 diff --git a/x11-libs/libXinerama/libXinerama-9999.ebuild b/x11-libs/libXinerama/libXinerama-9999.ebuild deleted file mode 100644 index ce3737c..0000000 --- a/x11-libs/libXinerama/libXinerama-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xinerama library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xineramaproto" diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest deleted file mode 100644 index 37aa03d..0000000 --- a/x11-libs/libXmu/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXmu-9999.ebuild 403 RMD160 03cd4a35a2b8f7bc3973e9890dd7160692a8272d SHA1 ad1b8067a380808b5c950196f6cbae713d5f9881 SHA256 f29526400cbee3585e03bab0d87137c2ffcd3694136125890af6586b5a081655 diff --git a/x11-libs/libXmu/libXmu-9999.ebuild b/x11-libs/libXmu/libXmu-9999.ebuild deleted file mode 100644 index a01d856..0000000 --- a/x11-libs/libXmu/libXmu-9999.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xmu library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ipv6" - -RDEPEND="x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - x11-proto/xproto" -DEPEND="${RDEPEND}" - -CONFIGURE_OPTIONS="$(use_enable ipv6)" diff --git a/x11-libs/libXp/Manifest b/x11-libs/libXp/Manifest deleted file mode 100644 index f65b406..0000000 --- a/x11-libs/libXp/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXp-9999.ebuild 355 RMD160 f095e3d0066bd67f8749cd3381cf4483a65f7e85 SHA1 08edd9b811eef227f25c4e167ec7fa77e4dcc653 SHA256 e0d03a718c01dbaa9566284a8667b6e8e50efc34a274e38bd915112cf384be2c diff --git a/x11-libs/libXp/libXp-9999.ebuild b/x11-libs/libXp/libXp-9999.ebuild deleted file mode 100644 index 9786a57..0000000 --- a/x11-libs/libXp/libXp-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xp library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - x11-proto/printproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest deleted file mode 100644 index 6421a92..0000000 --- a/x11-libs/libXpm/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXpm-9999.ebuild 351 RMD160 25c2687abecb6367d1fe40c44881afe5c7a8d1a1 SHA1 1fcc89a9fe12e7a5359b92e08a51b7c89f098837 SHA256 7995a7642d3b3e0367318bf675e2d6d47592d624a2b3b8850a225c5cac2e3455 diff --git a/x11-libs/libXpm/libXpm-9999.ebuild b/x11-libs/libXpm/libXpm-9999.ebuild deleted file mode 100644 index c7d5336..0000000 --- a/x11-libs/libXpm/libXpm-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xpm library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xproto" diff --git a/x11-libs/libXprintAppUtil/Manifest b/x11-libs/libXprintAppUtil/Manifest deleted file mode 100644 index 73216e1..0000000 --- a/x11-libs/libXprintAppUtil/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXprintAppUtil-9999.ebuild 349 RMD160 4136b536ba8edeb6c78207da73998fa2c54596e5 SHA1 6ec58094aeb357718333f54d4430d60e5f6d2dfc SHA256 87e8fe7f3fe1b59303e6054bd7e0e805bd788562682f0ec12966978a120086d9 diff --git a/x11-libs/libXprintAppUtil/libXprintAppUtil-9999.ebuild b/x11-libs/libXprintAppUtil/libXprintAppUtil-9999.ebuild deleted file mode 100644 index 8cc392c..0000000 --- a/x11-libs/libXprintAppUtil/libXprintAppUtil-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XprintAppUtil library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXp - x11-libs/libXprintUtil" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXprintUtil/Manifest b/x11-libs/libXprintUtil/Manifest deleted file mode 100644 index ad23756..0000000 --- a/x11-libs/libXprintUtil/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXprintUtil-9999.ebuild 360 RMD160 b24d0c59f20c347b6c068522b45acd893ffeeb7f SHA1 604dd3a12bca3f90bc3b8e0e8b60e26f9d11cd24 SHA256 0c6c0b18741802e87c664caddbc9f584cb0ad8efbdce54ba9328d87650a34edb diff --git a/x11-libs/libXprintUtil/libXprintUtil-9999.ebuild b/x11-libs/libXprintUtil/libXprintUtil-9999.ebuild deleted file mode 100644 index f2bb856..0000000 --- a/x11-libs/libXprintUtil/libXprintUtil-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XprintUtil library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXp" -DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/printproto" diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest deleted file mode 100644 index d017f22..0000000 --- a/x11-libs/libXrandr/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXrandr-9999.ebuild 410 RMD160 b8205732239a9d7baf72473e1dfd97c4f6cb3247 SHA1 aac10ec224322899e2374c6c35f0e5d4e770d4da SHA256 26c4b8ee65beac42254443c1102de7eed9f7eb17fab3e05490f0ea120c6854d7 diff --git a/x11-libs/libXrandr/libXrandr-9999.ebuild b/x11-libs/libXrandr/libXrandr-9999.ebuild deleted file mode 100644 index fa7a5e0..0000000 --- a/x11-libs/libXrandr/libXrandr-9999.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xrandr library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - >=x11-proto/randrproto-1.2 - x11-proto/xproto" -DEPEND="${RDEPEND} - x11-proto/renderproto" diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest deleted file mode 100644 index 1eeaec6..0000000 --- a/x11-libs/libXrender/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXrender-9999.ebuild 354 RMD160 f70f5f86e34929dfc8e67d563a2dbb26f4dbfeca SHA1 c3cb4201e808ae155901e19b3f876dab5b939d73 SHA256 cdca377ffaa17532018a679260f8c4dc029e56b32598f620e0e6fdfd2ae2bd71 diff --git a/x11-libs/libXrender/libXrender-9999.ebuild b/x11-libs/libXrender/libXrender-9999.ebuild deleted file mode 100644 index 13d57a0..0000000 --- a/x11-libs/libXrender/libXrender-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xrender library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - >=x11-proto/renderproto-0.9.3 - x11-proto/xproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest deleted file mode 100644 index 21d5a8f..0000000 --- a/x11-libs/libXres/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXres-9999.ebuild 428 RMD160 868b8d76c4876b98b218f2f9b6f31f3c898dc1ac SHA1 7ade99303a89f07d54b955096fcf00a55947bf53 SHA256 6140bd6db0d17787e4ee2ce793e28277fe44721b455537118430ed0992a57112 diff --git a/x11-libs/libXres/libXres-9999.ebuild b/x11-libs/libXres/libXres-9999.ebuild deleted file mode 100644 index d99d485..0000000 --- a/x11-libs/libXres/libXres-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes" -DESCRIPTION="X.Org XRes library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-proto/xproto" -DEPEND="${RDEPEND} - x11-proto/resourceproto" diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest deleted file mode 100644 index 8181a99..0000000 --- a/x11-libs/libXt/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXt-9999.ebuild 551 RMD160 6872bec3ac6733324c6713f6f36e5a225b3e845d SHA1 7a4b4b487971cd04f5444e9aab5ab527d94e5a48 SHA256 76d737ce1acab80c47843141b5a6545368018c437683001a288ff0ad29d90fc6 diff --git a/x11-libs/libXt/libXt-9999.ebuild b/x11-libs/libXt/libXt-9999.ebuild deleted file mode 100644 index 331f8df..0000000 --- a/x11-libs/libXt/libXt-9999.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular flag-o-matic - -DESCRIPTION="X.Org Xt library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - x11-proto/xproto - x11-proto/kbproto" -DEPEND="${RDEPEND}" - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} diff --git a/x11-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest deleted file mode 100644 index b9377ed..0000000 --- a/x11-libs/libXtst/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXtst-9999.ebuild 379 RMD160 63c0260b60b40e64261ccb94a84ba38dc073f79f SHA1 22ef72d5c5550f25b07c36700a5cbd2bb427dfd8 SHA256 ffece4bac7716600bbdfc983190172f63b93c80575e81298eb2ad0d96d6a43e4 diff --git a/x11-libs/libXtst/libXtst-9999.ebuild b/x11-libs/libXtst/libXtst-9999.ebuild deleted file mode 100644 index f0fcda6..0000000 --- a/x11-libs/libXtst/libXtst-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xtst library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-proto/recordproto - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/inputproto - app-text/xmlto" diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest deleted file mode 100644 index 15378d1..0000000 --- a/x11-libs/libXv/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXv-9999.ebuild 356 RMD160 1b7025b47e33d8aa38a57986414eae19142431ad SHA1 9fce088f29fd7dfb512ca118fb4864293a8d75b5 SHA256 8e7013cfdfbcb49163a139df4b2d13c209f4271966e5c5db20898bf9adb680b5 diff --git a/x11-libs/libXv/libXv-9999.ebuild b/x11-libs/libXv/libXv-9999.ebuild deleted file mode 100644 index ab05468..0000000 --- a/x11-libs/libXv/libXv-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xv library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-proto/videoproto - x11-proto/xproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest deleted file mode 100644 index 27d8958..0000000 --- a/x11-libs/libXvMC/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXvMC-9999.ebuild 374 RMD160 34e49cb28f848a442e43edbbce407ad1745bd86e SHA1 8b5fb97647a4eda9ce68d6d7ffb0ed1ea0b12973 SHA256 94acf4ab70abe57fc2781274e0c0e4e614601f275a42b8cde4c931f4601e1d21 diff --git a/x11-libs/libXvMC/libXvMC-9999.ebuild b/x11-libs/libXvMC/libXvMC-9999.ebuild deleted file mode 100644 index 1f47925..0000000 --- a/x11-libs/libXvMC/libXvMC-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XvMC library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXv - x11-proto/videoproto - x11-proto/xproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest deleted file mode 100644 index 8f2aa25..0000000 --- a/x11-libs/libXxf86dga/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXxf86dga-9999.ebuild 372 RMD160 19da623e5218184ecce8cf996e645d400ded05c6 SHA1 fc8c1e86adaf7ccad6e83a94349792eb48d54746 SHA256 f973d60155301a11257bdd614d653d51bae7827ce39fca2b1b1f976a1dcd82bf diff --git a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild b/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild deleted file mode 100644 index aa1cfe9..0000000 --- a/x11-libs/libXxf86dga/libXxf86dga-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xxf86dga library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xproto - >=x11-proto/xf86dgaproto-2.0.3" diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest deleted file mode 100644 index 645d5f6..0000000 --- a/x11-libs/libXxf86misc/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXxf86misc-9999.ebuild 366 RMD160 7de8c2f9054e9081d7c59aa32885ddb53292b28d SHA1 50669fb0edf3d897a4888d009a535ef4ba1ab037 SHA256 c6660e354f6352b0f47ef7c45e247e9f6f4da5ebc05b26e64e0b28717e732c5b diff --git a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild b/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild deleted file mode 100644 index d52bffa..0000000 --- a/x11-libs/libXxf86misc/libXxf86misc-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xxf86misc library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xf86miscproto" diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest deleted file mode 100644 index 06559cc..0000000 --- a/x11-libs/libXxf86vm/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libXxf86vm-9999.ebuild 367 RMD160 2e590453f51f7cd84f93eefbf02ee57f4d7b47f3 SHA1 0d9acc8ac3cc3b360cf0476d1833dcb0535a84b0 SHA256 88677f01e8781945ce2852d0d8b38578a702ed0686a307c03479b95476fc9b8b diff --git a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild b/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild deleted file mode 100644 index 3f2489c..0000000 --- a/x11-libs/libXxf86vm/libXxf86vm-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xxf86vm library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/xproto - x11-proto/xf86vidmodeproto" diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest deleted file mode 100644 index 9fdb8cc..0000000 --- a/x11-libs/libdmx/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libdmx-9999.ebuild 337 RMD160 5f89b3fec16a1523c6bf0e3f2abeee5221cf0328 SHA1 63e68b5318cf2ef068127f9aa44b53f2df67430e SHA256 75e348e205056a8ddf30c72c41dd1d7ed3d5937000465cfd9e57e73594ffc585 diff --git a/x11-libs/libdmx/libdmx-9999.ebuild b/x11-libs/libdmx/libdmx-9999.ebuild deleted file mode 100644 index 1131ea1..0000000 --- a/x11-libs/libdmx/libdmx-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org dmx library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-libs/libXext" -DEPEND="${RDEPEND} - x11-proto/dmxproto" diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest deleted file mode 100644 index 5fd8f4e..0000000 --- a/x11-libs/libdrm/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -EBUILD libdrm-9999.ebuild 1200 RMD160 a2b7c6d4c21b7c0452fcc64630ca36d69bd84d07 SHA1 1c6d0105598446cb8d6ffb5bfb0c491b2167afec SHA256 07a22f876cc48890d59411d782359e5508866a34f54439512cde9c8cad8c9d1d -MD5 c1c83d816299a7d5ed50dc17d78e3412 libdrm-9999.ebuild 1200 -RMD160 a2b7c6d4c21b7c0452fcc64630ca36d69bd84d07 libdrm-9999.ebuild 1200 -SHA256 07a22f876cc48890d59411d782359e5508866a34f54439512cde9c8cad8c9d1d libdrm-9999.ebuild 1200 diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild deleted file mode 100644 index 0a325eb..0000000 --- a/x11-libs/libdrm/libdrm-9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.3.0.ebuild,v 1.8 2007/05/20 20:47:52 jer Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit autotools x-modular git - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" -EGIT_BOOTSTRAP="eautoreconf" - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -SRC_URI="" - -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" - -pkg_preinst() { - x-modular_pkg_preinst - - if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then - cp -pPR "${ROOT}"/usr/$(get_libdir)/libdrm.so.{1,1.0.0} "${D}"/usr/$(get_libdir)/ - fi -} - -pkg_postinst() { - x-modular_pkg_postinst - - if [[ -e ${ROOT}/usr/$(get_libdir)/libdrm.so.1 ]] ; then - elog "You must re-compile all packages that are linked against" - elog "libdrm 1 by using revdep-rebuild from gentoolkit:" - elog "# revdep-rebuild --library libdrm.so.1" - elog "After this, you can delete /usr/$(get_libdir)/libdrm.so.1" - elog "and /usr/$(get_libdir)/libdrm.so.1.0.0 ." - epause - fi -} diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest deleted file mode 100644 index 8ed6980..0000000 --- a/x11-libs/libfontenc/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libfontenc-9999.ebuild 374 RMD160 a3526ef87d272a3cf06d7fbe0ae7efa8f89048e2 SHA1 459fc5d88204699e8e3ee899caf13e98286592d7 SHA256 6edfa7d43f61714cbaaddcc067e555971938f560ed6e049dc7837f0a2e02e571 diff --git a/x11-libs/libfontenc/libfontenc-9999.ebuild b/x11-libs/libfontenc/libfontenc-9999.ebuild deleted file mode 100644 index 854d1f8..0000000 --- a/x11-libs/libfontenc/libfontenc-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org fontenc library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND} - x11-proto/xproto" - -CONFIGURE_OPTIONS="--with-encodingsdir=/usr/share/fonts/encodings" diff --git a/x11-libs/liblbxutil/Manifest b/x11-libs/liblbxutil/Manifest deleted file mode 100644 index 103addf..0000000 --- a/x11-libs/liblbxutil/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD liblbxutil-9999.ebuild 309 RMD160 f625bee7a18e401899483af6822bdc7db9e4eb9f SHA1 7152db2ee29496c37aef88b8b05a6115c88815a5 SHA256 70a403e7ff2c3f4dcf255d0a7773748556e4515fbe3726102fda916ec54e2e19 diff --git a/x11-libs/liblbxutil/liblbxutil-9999.ebuild b/x11-libs/liblbxutil/liblbxutil-9999.ebuild deleted file mode 100644 index f3b5143..0000000 --- a/x11-libs/liblbxutil/liblbxutil-9999.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org lbxutil library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND} - x11-proto/xextproto" diff --git a/x11-libs/liboldX/Manifest b/x11-libs/liboldX/Manifest deleted file mode 100644 index af138c4..0000000 --- a/x11-libs/liboldX/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD liboldX-9999.ebuild 300 RMD160 fe16130e19c9a630888673747eabae6f9eb9b0b7 SHA1 519fb8edb321e107f01374412fd0f2eb1a2bd068 SHA256 76bc7d49dd718a942de3c18239ec319e3e357794cb1e87da822f93ca2491ad4d diff --git a/x11-libs/liboldX/liboldX-9999.ebuild b/x11-libs/liboldX/liboldX-9999.ebuild deleted file mode 100644 index 79f7506..0000000 --- a/x11-libs/liboldX/liboldX-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org oldX library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest deleted file mode 100644 index 2bec179..0000000 --- a/x11-libs/libpciaccess/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libpciaccess-9999.ebuild 345 RMD160 2ab7a76dee5730d3b4504ff770b5ac03c1bc7991 SHA1 fd94f18038681d9634afef42df2955b16ca6a1f0 SHA256 0cffe9be8d56c83b292289f199b0d650d6fe5fb4c1a06a6856e3a99e39817a55 diff --git a/x11-libs/libpciaccess/libpciaccess-9999.ebuild b/x11-libs/libpciaccess/libpciaccess-9999.ebuild deleted file mode 100644 index 83ae014..0000000 --- a/x11-libs/libpciaccess/libpciaccess-9999.ebuild +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="Library providing generic access to the PCI bus and devices" -LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -CONFIGURE_OPTIONS="--with-pciids-path=/usr/share/misc" diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest deleted file mode 100644 index cddce81..0000000 --- a/x11-libs/libxcb/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX xcb-0001-Receive-selected-replies-in-event-queue.patch 1656 RMD160 3e277074b725be7f7df358427b43a795b81803cf SHA1 f7e026aeb67d429184700facc10a161fe10d60fc SHA256 54b82f190833f57bd6980a84e0d6bd99f1bc351261b22ee595e5c05447fb5db2 -AUX xcb-0002-Remove-libxcb-xlib-and-xcbxlib.h.patch 11458 RMD160 109250bb704724cab974fdad5c87aa91ac77795c SHA1 be3d5c5b846db98f05d0b900278bb392fec274e8 SHA256 a551e66852b063963453d1110f4bbb09fee65623fb3128571d15596dcd479dbf -AUX xcb-0003-Inline-_xcb_lock_io-_xcb_unlock_io-and-_xcb_wait_i.patch 6531 RMD160 5747911d8076a81ebc4081f2c49ee0dc214f44ee SHA1 d57928b18c4f951e33461b499679f4a4fa7d9a19 SHA256 9f13be703b74ee6690a021d69a33936fc140fb10b5f13b6b64e63d1044c45b6b -AUX xcb-0004-Use-sequence-number-ranges-in-pending-replies.patch 2086 RMD160 cf911baf61c57de69de1d4b2f58077b51e6feb94 SHA1 929a34f47b179ef90c8e57ab3458e070103b6f4f SHA256 d03cc99aa85d110eb7f4d96e86d2bafe88790831899973ff1f198a9ca2b2eab1 -AUX xcb-0005-Track-64-bit-sequence-numbers-internally.patch 8893 RMD160 bcb865a1ea13b1df994de9cf072bd818b74528c7 SHA1 54ca1ef1c0559822d1af18e6ab6aa676e68a3f5c SHA256 07b9465c6f756c36a3a21d0b410867ed7a196186900d3b7aa88684dc65f756ad -AUX xcb-0006-Support-handing-off-socket-write-permission-to-exter.patch 9558 RMD160 46d52da6f3d62f6d118b0e8c8a3293b5e17017be SHA1 b28bbb73c414067a8b8c7af5ebb33983e444f703 SHA256 4c445a3ceb74fe6fd526d1cf1b6fe6f142f255b98fbb407dd1b84fbf3c89449c -AUX xcb-0007-Bump-version-number-to-1.2.patch 610 RMD160 79d60b28c9f746b6b3e5420d3abb85e431f566b5 SHA1 649b8ea99d5b4f3f64d76bc0c83abaee3c6a7472 SHA256 2839419e70158c4dbfe6d8498a10ee318ad84e6e363f5fc25346c5f4d80e6120 -AUX xcb-0008-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch 651 RMD160 5d89c5f538329a337a7276542d31b497935c98a9 SHA1 11cbc0184504f37a607d6d2d97fc9528afda5078 SHA256 678560113fa3229f7e83ca64a0d6a20c897a735fe1aa0df80e871a1f10d70c11 -AUX xcb-0009-mv-closure-block.patch 644 RMD160 29fef31e7432f0600aefa2fbc9021d27ffd6d14c SHA1 58001458d872fa39737cd38087b57d3c0cd1ffd5 SHA256 757d30144cfa28202823551394c2b7704c7801d03882f5f8c2e6a56fa5b4f98b -EBUILD libxcb-9999.ebuild 526 RMD160 b6277a1922870068e403fca71c2fb73b6a17eb18 SHA1 b9ba4ad87d79ab71b357145075ab7d50ca9d7a8d SHA256 ec3cc0b7984bf6612b78222e8c3d19dbcfd3f894cd011b6859d7886b390a4199 diff --git a/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch b/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch deleted file mode 100644 index 5d6c034..0000000 --- a/x11-libs/libxcb/files/xcb-0001-Receive-selected-replies-in-event-queue.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5e9cdc3321f6f273ae1844e7bee2e6ba6072243f Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Thu, 18 Sep 2008 16:47:04 -0700 -Subject: [PATCH] Receive selected replies in event queue. - -Commit by Josh Triplett and Jamey Sharp. ---- - src/xcb_in.c | 5 +++-- - src/xcbext.h | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/xcb_in.c b/src/xcb_in.c -index f613772..2e32719 100644 ---- a/src/xcb_in.c -+++ b/src/xcb_in.c -@@ -183,8 +183,9 @@ static int read_packet(xcb_connection_t *c) - ((xcb_generic_event_t *) buf)->full_sequence = c->in.request_read; - - /* reply, or checked error */ -- if( genrep.response_type == XCB_REPLY || -- (genrep.response_type == XCB_ERROR && pend && (pend->flags & XCB_REQUEST_CHECKED))) -+ if(!(pend && (pend->flags & XCB_REQUEST_QUEUE_RESPONSE)) && -+ ((pend && (pend->flags & XCB_REQUEST_CHECKED) && genrep.response_type == XCB_ERROR) || -+ genrep.response_type == XCB_REPLY)) - { - reader_list *reader; - struct reply_list *cur = malloc(sizeof(struct reply_list)); -diff --git a/src/xcbext.h b/src/xcbext.h -index 01dd590..856ad3d 100644 ---- a/src/xcbext.h -+++ b/src/xcbext.h -@@ -54,7 +54,8 @@ typedef struct { - enum xcb_send_request_flags_t { - XCB_REQUEST_CHECKED = 1 << 0, - XCB_REQUEST_RAW = 1 << 1, -- XCB_REQUEST_DISCARD_REPLY = 1 << 2 -+ XCB_REQUEST_DISCARD_REPLY = 1 << 2, -+ XCB_REQUEST_QUEUE_RESPONSE = 1 << 3 /* Put the response in the event queue */ - }; - - unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *request); --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0002-Remove-libxcb-xlib-and-xcbxlib.h.patch b/x11-libs/libxcb/files/xcb-0002-Remove-libxcb-xlib-and-xcbxlib.h.patch deleted file mode 100644 index f271a67..0000000 --- a/x11-libs/libxcb/files/xcb-0002-Remove-libxcb-xlib-and-xcbxlib.h.patch +++ /dev/null @@ -1,396 +0,0 @@ -From c8282883b7d7360e554412357e4b20a00f6fe2eb Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Fri, 14 Mar 2008 12:08:09 -0700 -Subject: [PATCH] Remove libxcb-xlib and xcbxlib.h. - ---- - Makefile.am | 4 +-- - configure.ac | 1 - - src/Makefile.am | 9 +---- - src/xcb_conn.c | 49 +------------------------------ - src/xcb_xlib.c | 87 ------------------------------------------------------- - src/xcbint.h | 19 +----------- - src/xcbxlib.h | 44 ---------------------------- - xcb-xlib.pc.in | 11 ------- - 8 files changed, 6 insertions(+), 218 deletions(-) - delete mode 100644 src/xcb_xlib.c - delete mode 100644 src/xcbxlib.h - delete mode 100644 xcb-xlib.pc.in - -diff --git a/Makefile.am b/Makefile.am -index ee97180..3a2f6f5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,7 @@ SUBDIRS=src tests doc - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = \ --xcb.pc \ --xcb-xlib.pc -+pkgconfig_DATA = xcb.pc - - if BUILD_COMPOSITE - pkgconfig_DATA += xcb-composite.pc -diff --git a/configure.ac b/configure.ac -index c3d3595..e9d9412 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,7 +142,6 @@ tests/Makefile - - AC_CONFIG_FILES([ - xcb.pc --xcb-xlib.pc - xcb-composite.pc - xcb-damage.pc - xcb-dpms.pc -diff --git a/src/Makefile.am b/src/Makefile.am -index aa8b755..bf6e991 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,4 @@ --lib_LTLIBRARIES = libxcb.la \ -- libxcb-xlib.la -+lib_LTLIBRARIES = libxcb.la - - EXTHEADERS = xproto.h \ - bigreq.h \ -@@ -29,10 +28,6 @@ libxcb_la_LDFLAGS = -version-info 1:0:0 - - XCB_LIBS = libxcb.la - --libxcb_xlib_la_LDFLAGS = -version-info 0:0:0 --libxcb_xlib_la_LIBADD = $(XCB_LIBS) --libxcb_xlib_la_SOURCES = xcb_xlib.c -- - # FIXME: find a way to autogenerate this from the XML files. - - EXTHEADERS += composite.h -@@ -257,7 +252,7 @@ endif - - - --xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS) -+xcbinclude_HEADERS = xcb.h xcbext.h $(EXTHEADERS) - noinst_HEADERS = xcbint.h - - BUILT_SOURCES = $(EXTSOURCES) $(EXTHEADERS) -diff --git a/src/xcb_conn.c b/src/xcb_conn.c -index 02f60bd..2bb8661 100644 ---- a/src/xcb_conn.c -+++ b/src/xcb_conn.c -@@ -59,21 +59,6 @@ static int set_fd_flags(const int fd) - return 1; - } - --static int _xcb_xlib_init(_xcb_xlib *xlib) --{ -- xlib->lock = 0; --#ifndef NDEBUG -- xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); --#endif -- pthread_cond_init(&xlib->cond, 0); -- return 1; --} -- --static void _xcb_xlib_destroy(_xcb_xlib *xlib) --{ -- pthread_cond_destroy(&xlib->cond); --} -- - static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info) - { - static const char pad[3]; -@@ -230,7 +215,6 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info) - if(!( - set_fd_flags(fd) && - pthread_mutex_init(&c->iolock, 0) == 0 && -- _xcb_xlib_init(&c->xlib) && - _xcb_in_init(&c->in) && - _xcb_out_init(&c->out) && - write_setup(c, auth_info) && -@@ -255,7 +239,6 @@ void xcb_disconnect(xcb_connection_t *c) - close(c->fd); - - pthread_mutex_destroy(&c->iolock); -- _xcb_xlib_destroy(&c->xlib); - _xcb_in_destroy(&c->in); - _xcb_out_destroy(&c->out); - -@@ -275,12 +258,6 @@ void _xcb_conn_shutdown(xcb_connection_t *c) - void _xcb_lock_io(xcb_connection_t *c) - { - pthread_mutex_lock(&c->iolock); -- while(c->xlib.lock) -- { -- if(pthread_equal(c->xlib.thread, pthread_self())) -- break; -- pthread_cond_wait(&c->xlib.cond, &c->iolock); -- } - } - - void _xcb_unlock_io(xcb_connection_t *c) -@@ -290,25 +267,12 @@ void _xcb_unlock_io(xcb_connection_t *c) - - void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond) - { -- int xlib_locked = c->xlib.lock; -- if(xlib_locked) -- { -- c->xlib.lock = 0; -- pthread_cond_broadcast(&c->xlib.cond); -- } - pthread_cond_wait(cond, &c->iolock); -- if(xlib_locked) -- { -- while(c->xlib.lock) -- pthread_cond_wait(&c->xlib.cond, &c->iolock); -- c->xlib.lock = 1; -- c->xlib.thread = pthread_self(); -- } - } - - int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count) - { -- int ret, xlib_locked; -+ int ret; - fd_set rfds, wfds; - - /* If the thing I should be doing is already being done, wait for it. */ -@@ -329,12 +293,6 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec - ++c->out.writing; - } - -- xlib_locked = c->xlib.lock; -- if(xlib_locked) -- { -- c->xlib.lock = 0; -- pthread_cond_broadcast(&c->xlib.cond); -- } - _xcb_unlock_io(c); - do { - ret = select(c->fd + 1, &rfds, &wfds, 0, 0); -@@ -345,11 +303,6 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec - ret = 0; - } - _xcb_lock_io(c); -- if(xlib_locked) -- { -- c->xlib.lock = 1; -- c->xlib.thread = pthread_self(); -- } - - if(ret) - { -diff --git a/src/xcb_xlib.c b/src/xcb_xlib.c -deleted file mode 100644 -index 1b573e8..0000000 ---- a/src/xcb_xlib.c -+++ /dev/null -@@ -1,87 +0,0 @@ --/* Copyright (C) 2005 Bart Massey and Jamey Sharp. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice shall be included in -- * all copies or substantial portions of the Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- * -- * Except as contained in this notice, the names of the authors or their -- * institutions shall not be used in advertising or otherwise to promote the -- * sale, use or other dealings in this Software without prior written -- * authorization from the authors. -- */ -- --#include "xcbxlib.h" --#include "xcbint.h" -- --#include <assert.h> -- --#ifdef HAVE_BACKTRACE --#include <execinfo.h> --#include <stdio.h> --#include <stdlib.h> --#endif -- --static void xcb_xlib_printbt(void) --{ --#ifdef HAVE_BACKTRACE -- void *array[20]; -- int size; -- char **strings; -- int i; -- -- size = backtrace(array, 20); -- strings = backtrace_symbols(array, size); -- -- fprintf(stderr, "Locking assertion failure. Backtrace:\n"); -- -- for (i = 0; i < size; ++i) -- fprintf(stderr, "#%i %s\n", i, strings[i]); -- -- free(strings); --#endif --} -- --#ifndef NDEBUG --#define xcb_assert(c,x) do { if (!(x)) { xcb_xlib_printbt(); if (!(c)->xlib.sloppy_lock) assert(x); } } while(0) --#else --#define xcb_assert(c,x) --#endif -- --unsigned int xcb_get_request_sent(xcb_connection_t *c) --{ -- if(c->has_error) -- return 0; -- return c->out.request; --} -- --void xcb_xlib_lock(xcb_connection_t *c) --{ -- _xcb_lock_io(c); -- xcb_assert(c, !c->xlib.lock); -- c->xlib.lock = 1; -- c->xlib.thread = pthread_self(); -- _xcb_unlock_io(c); --} -- --void xcb_xlib_unlock(xcb_connection_t *c) --{ -- _xcb_lock_io(c); -- xcb_assert(c, c->xlib.lock); -- xcb_assert(c, pthread_equal(c->xlib.thread, pthread_self())); -- c->xlib.lock = 0; -- pthread_cond_broadcast(&c->xlib.cond); -- _xcb_unlock_io(c); --} -diff --git a/src/xcbint.h b/src/xcbint.h -index ab0264f..86e00a4 100644 ---- a/src/xcbint.h -+++ b/src/xcbint.h -@@ -126,16 +126,6 @@ int _xcb_in_read(xcb_connection_t *c); - int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); - - --/* xcb_xlib.c */ -- --typedef struct _xcb_xlib { -- int lock; -- int sloppy_lock; -- pthread_t thread; -- pthread_cond_t cond; --} _xcb_xlib; -- -- - /* xcb_xid.c */ - - typedef struct _xcb_xid { -@@ -173,7 +163,6 @@ struct xcb_connection_t { - - /* I/O data */ - pthread_mutex_t iolock; -- _xcb_xlib xlib; - _xcb_in in; - _xcb_out out; - -@@ -183,6 +172,8 @@ struct xcb_connection_t { - }; - - void _xcb_conn_shutdown(xcb_connection_t *c); -+void _xcb_lock_io(xcb_connection_t *c); -+void _xcb_unlock_io(xcb_connection_t *c); - void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond); - int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count); - -@@ -195,10 +186,4 @@ int _xcb_get_auth_info(int fd, xcb_auth_info_t *info, int display); - #pragma GCC visibility pop - #endif - -- --/* xcb_conn.c symbols visible to xcb-xlib */ -- --void _xcb_lock_io(xcb_connection_t *c); --void _xcb_unlock_io(xcb_connection_t *c); -- - #endif -diff --git a/src/xcbxlib.h b/src/xcbxlib.h -deleted file mode 100644 -index 4cb5cd4..0000000 ---- a/src/xcbxlib.h -+++ /dev/null -@@ -1,44 +0,0 @@ --/* -- * Copyright (C) 2005 Bart Massey and Jamey Sharp. -- * All Rights Reserved. -- * -- * Permission is hereby granted, free of charge, to any person obtaining a -- * copy of this software and associated documentation files (the "Software"), -- * to deal in the Software without restriction, including without limitation -- * the rights to use, copy, modify, merge, publish, distribute, sublicense, -- * and/or sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following conditions: -- * -- * The above copyright notice and this permission notice shall be included in -- * all copies or substantial portions of the Software. -- * -- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -- * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -- * -- * Except as contained in this notice, the names of the authors or their -- * institutions shall not be used in advertising or otherwise to promote the -- * sale, use or other dealings in this Software without prior written -- * authorization from the authors. -- */ -- --/* This include file declares functions used by Xlib/XCB, but nothing else -- * should ever use these functions or link to libxcb-xlib. */ -- --#ifndef __XCBXLIB_H --#define __XCBXLIB_H -- --#include <pthread.h> --#include "xcb.h" -- --/* The caller of this function must hold the xlib lock, using the lock -- * functions below. */ --unsigned int xcb_get_request_sent(xcb_connection_t *c); -- --void xcb_xlib_lock(xcb_connection_t *c); --void xcb_xlib_unlock(xcb_connection_t *c); -- --#endif -diff --git a/xcb-xlib.pc.in b/xcb-xlib.pc.in -deleted file mode 100644 -index f28b529..0000000 ---- a/xcb-xlib.pc.in -+++ /dev/null -@@ -1,11 +0,0 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: XCB Xlib --Description: XCB Xlib support functions --Version: @PACKAGE_VERSION@ --Requires: xcb --Libs: -L${libdir} -lxcb-xlib --Cflags: -I${includedir} --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0003-Inline-_xcb_lock_io-_xcb_unlock_io-and-_xcb_wait_i.patch b/x11-libs/libxcb/files/xcb-0003-Inline-_xcb_lock_io-_xcb_unlock_io-and-_xcb_wait_i.patch deleted file mode 100644 index 9cd3266..0000000 --- a/x11-libs/libxcb/files/xcb-0003-Inline-_xcb_lock_io-_xcb_unlock_io-and-_xcb_wait_i.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 19cf1afecb67abfa9834fc1428f0b7cf8763f3a5 Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Fri, 14 Mar 2008 12:08:35 -0700 -Subject: [PATCH] Inline _xcb_lock_io, _xcb_unlock_io, and _xcb_wait_io. - -These functions are once again a single pthread call, so just make that -call directly. ---- - src/xcb_conn.c | 25 +++++-------------------- - src/xcb_in.c | 16 ++++++++-------- - src/xcb_out.c | 12 ++++++------ - src/xcbint.h | 3 --- - 4 files changed, 19 insertions(+), 37 deletions(-) - -diff --git a/src/xcb_conn.c b/src/xcb_conn.c -index 2bb8661..5b097f7 100644 ---- a/src/xcb_conn.c -+++ b/src/xcb_conn.c -@@ -97,12 +97,12 @@ static int write_setup(xcb_connection_t *c, xcb_auth_info_t *auth_info) - } - assert(count <= (int) (sizeof(parts) / sizeof(*parts))); - -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - { - struct iovec *parts_ptr = parts; - ret = _xcb_out_send(c, &parts_ptr, &count); - } -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return ret; - } - -@@ -255,21 +255,6 @@ void _xcb_conn_shutdown(xcb_connection_t *c) - c->has_error = 1; - } - --void _xcb_lock_io(xcb_connection_t *c) --{ -- pthread_mutex_lock(&c->iolock); --} -- --void _xcb_unlock_io(xcb_connection_t *c) --{ -- pthread_mutex_unlock(&c->iolock); --} -- --void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond) --{ -- pthread_cond_wait(cond, &c->iolock); --} -- - int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count) - { - int ret; -@@ -278,7 +263,7 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec - /* If the thing I should be doing is already being done, wait for it. */ - if(count ? c->out.writing : c->in.reading) - { -- _xcb_wait_io(c, cond); -+ pthread_cond_wait(cond, &c->iolock); - return 1; - } - -@@ -293,7 +278,7 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec - ++c->out.writing; - } - -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - do { - ret = select(c->fd + 1, &rfds, &wfds, 0, 0); - } while (ret == -1 && errno == EINTR); -@@ -302,7 +287,7 @@ int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vec - _xcb_conn_shutdown(c); - ret = 0; - } -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - - if(ret) - { -diff --git a/src/xcb_in.c b/src/xcb_in.c -index 2e32719..0c04621 100644 ---- a/src/xcb_in.c -+++ b/src/xcb_in.c -@@ -342,7 +342,7 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - if(c->has_error) - return 0; - -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - - /* If this request has not been written yet, write it. */ - if(_xcb_out_flush_to(c, request)) -@@ -382,7 +382,7 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - } - - wake_up_next_reader(c); -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return ret; - } - -@@ -397,9 +397,9 @@ int xcb_poll_for_reply(xcb_connection_t *c, unsigned int request, void **reply, - return 1; /* would not block */ - } - assert(reply != 0); -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - ret = poll_for_reply(c, request, reply, error); -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return ret; - } - -@@ -408,14 +408,14 @@ xcb_generic_event_t *xcb_wait_for_event(xcb_connection_t *c) - xcb_generic_event_t *ret; - if(c->has_error) - return 0; -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - /* get_event returns 0 on empty list. */ - while(!(ret = get_event(c))) - if(!_xcb_conn_wait(c, &c->in.event_cond, 0, 0)) - break; - - wake_up_next_reader(c); -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return ret; - } - -@@ -424,12 +424,12 @@ xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t *c) - xcb_generic_event_t *ret = 0; - if(!c->has_error) - { -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - /* FIXME: follow X meets Z architecture changes. */ - ret = get_event(c); - if(!ret && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */ - ret = get_event(c); -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - } - return ret; - } -diff --git a/src/xcb_out.c b/src/xcb_out.c -index 000b121..ad4240a 100644 ---- a/src/xcb_out.c -+++ b/src/xcb_out.c -@@ -187,10 +187,10 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - workaround = WORKAROUND_GLX_GET_FB_CONFIGS_BUG; - - /* get a sequence number and arrange for delivery. */ -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - /* wait for other writing threads to get out of my way. */ - while(c->out.writing) -- _xcb_wait_io(c, &c->out.cond); -+ pthread_cond_wait(&c->out.cond, &c->iolock); - - request = ++c->out.request; - /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without -@@ -231,7 +231,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - _xcb_conn_shutdown(c); - request = 0; - } -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return request; - } - -@@ -240,9 +240,9 @@ int xcb_flush(xcb_connection_t *c) - int ret; - if(c->has_error) - return 0; -- _xcb_lock_io(c); -+ pthread_mutex_lock(&c->iolock); - ret = _xcb_out_flush_to(c, c->out.request); -- _xcb_unlock_io(c); -+ pthread_mutex_unlock(&c->iolock); - return ret; - } - -@@ -297,7 +297,7 @@ int _xcb_out_flush_to(xcb_connection_t *c, unsigned int request) - return _xcb_out_send(c, &vec_ptr, &count); - } - while(c->out.writing) -- _xcb_wait_io(c, &c->out.cond); -+ pthread_cond_wait(&c->out.cond, &c->iolock); - assert(XCB_SEQUENCE_COMPARE(c->out.request_written, >=, request)); - return 1; - } -diff --git a/src/xcbint.h b/src/xcbint.h -index 86e00a4..d610a10 100644 ---- a/src/xcbint.h -+++ b/src/xcbint.h -@@ -172,9 +172,6 @@ struct xcb_connection_t { - }; - - void _xcb_conn_shutdown(xcb_connection_t *c); --void _xcb_lock_io(xcb_connection_t *c); --void _xcb_unlock_io(xcb_connection_t *c); --void _xcb_wait_io(xcb_connection_t *c, pthread_cond_t *cond); - int _xcb_conn_wait(xcb_connection_t *c, pthread_cond_t *cond, struct iovec **vector, int *count); - - --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0004-Use-sequence-number-ranges-in-pending-replies.patch b/x11-libs/libxcb/files/xcb-0004-Use-sequence-number-ranges-in-pending-replies.patch deleted file mode 100644 index caffc51..0000000 --- a/x11-libs/libxcb/files/xcb-0004-Use-sequence-number-ranges-in-pending-replies.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 040cf8ca8bda9687e77141c71e559acb020eeeb5 Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Fri, 14 Mar 2008 20:18:29 -0700 -Subject: [PATCH] Use sequence number ranges in pending replies - -This allows optimizing adjacent pending replies with the same flags, and -will help support default flags for a range of future requests. - -Commit by Josh Triplett and Jamey Sharp. ---- - src/xcb_in.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/xcb_in.c b/src/xcb_in.c -index 0c04621..61027b7 100644 ---- a/src/xcb_in.c -+++ b/src/xcb_in.c -@@ -52,7 +52,8 @@ struct reply_list { - }; - - typedef struct pending_reply { -- unsigned int request; -+ unsigned int first_request; -+ unsigned int last_request; - enum workarounds workaround; - int flags; - struct pending_reply *next; -@@ -112,7 +113,7 @@ static int read_packet(xcb_connection_t *c) - } - - while(c->in.pending_replies && -- XCB_SEQUENCE_COMPARE (c->in.pending_replies->request, <=, c->in.request_completed)) -+ XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed)) - { - pending_reply *oldpend = c->in.pending_replies; - c->in.pending_replies = oldpend->next; -@@ -128,7 +129,9 @@ static int read_packet(xcb_connection_t *c) - if(genrep.response_type == XCB_ERROR || genrep.response_type == XCB_REPLY) - { - pend = c->in.pending_replies; -- if(pend && pend->request != c->in.request_read) -+ if(pend && -+ (XCB_SEQUENCE_COMPARE(c->in.request_read, <, pend->first_request) || -+ XCB_SEQUENCE_COMPARE(c->in.request_read, >, pend->last_request))) - pend = 0; - } - -@@ -507,7 +510,7 @@ int _xcb_in_expect_reply(xcb_connection_t *c, unsigned int request, enum workaro - _xcb_conn_shutdown(c); - return 0; - } -- pend->request = request; -+ pend->first_request = pend->last_request = request; - pend->workaround = workaround; - pend->flags = flags; - pend->next = 0; --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0005-Track-64-bit-sequence-numbers-internally.patch b/x11-libs/libxcb/files/xcb-0005-Track-64-bit-sequence-numbers-internally.patch deleted file mode 100644 index d3e852b..0000000 --- a/x11-libs/libxcb/files/xcb-0005-Track-64-bit-sequence-numbers-internally.patch +++ /dev/null @@ -1,221 +0,0 @@ -From cdaaa63e7cc2729164da1326c54ad100eade0aac Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Wed, 21 May 2008 14:43:53 -0700 -Subject: [PATCH] Track 64-bit sequence numbers internally. - -External APIs that used 32-bit sequence numbers continue to do so. - -Commit by Josh Triplett and Jamey Sharp. ---- - src/xcb_in.c | 35 ++++++++++++++++++++--------------- - src/xcb_out.c | 4 ++-- - src/xcbint.h | 17 +++++++++-------- - 3 files changed, 31 insertions(+), 25 deletions(-) - -diff --git a/src/xcb_in.c b/src/xcb_in.c -index 61027b7..ff59894 100644 ---- a/src/xcb_in.c -+++ b/src/xcb_in.c -@@ -52,8 +52,8 @@ struct reply_list { - }; - - typedef struct pending_reply { -- unsigned int first_request; -- unsigned int last_request; -+ uint64_t first_request; -+ uint64_t last_request; - enum workarounds workaround; - int flags; - struct pending_reply *next; -@@ -94,8 +94,8 @@ static int read_packet(xcb_connection_t *c) - /* Compute 32-bit sequence number of this packet. */ - if((genrep.response_type & 0x7f) != XCB_KEYMAP_NOTIFY) - { -- unsigned int lastread = c->in.request_read; -- c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; -+ uint64_t lastread = c->in.request_read; -+ c->in.request_read = (lastread & UINT64_C(0xffffffffffff0000)) | genrep.sequence; - if(XCB_SEQUENCE_COMPARE(c->in.request_read, <, lastread)) - c->in.request_read += 0x10000; - if(XCB_SEQUENCE_COMPARE(c->in.request_read, >, c->in.request_expected)) -@@ -204,10 +204,10 @@ static int read_packet(xcb_connection_t *c) - c->in.current_reply_tail = &cur->next; - for(reader = c->in.readers; - reader && -- XCB_SEQUENCE_COMPARE(reader->request, <=, c->in.request_read); -+ XCB_SEQUENCE_COMPARE_32(reader->request, <=, c->in.request_read); - reader = reader->next) - { -- if(reader->request == c->in.request_read) -+ if(XCB_SEQUENCE_COMPARE_32(reader->request, ==, c->in.request_read)) - { - pthread_cond_signal(reader->data); - break; -@@ -289,7 +289,7 @@ static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **repl - head = 0; - /* We've read requests past the one we want, so if it has replies we have - * them all and they're in the replies map. */ -- else if(XCB_SEQUENCE_COMPARE(request, <, c->in.request_read)) -+ else if(XCB_SEQUENCE_COMPARE_32(request, <, c->in.request_read)) - { - head = _xcb_map_remove(c->in.replies, request); - if(head && head->next) -@@ -297,7 +297,7 @@ static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **repl - } - /* We're currently processing the responses to the request we want, and we - * have a reply ready to return. So just return it without blocking. */ -- else if(request == c->in.request_read && c->in.current_reply) -+ else if(XCB_SEQUENCE_COMPARE_32(request, ==, c->in.request_read) && c->in.current_reply) - { - head = c->in.current_reply; - c->in.current_reply = head->next; -@@ -306,7 +306,7 @@ static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **repl - } - /* We know this request can't have any more replies, and we've already - * established it doesn't have a reply now. Don't bother blocking. */ -- else if(request == c->in.request_completed) -+ else if(XCB_SEQUENCE_COMPARE_32(request, ==, c->in.request_completed)) - head = 0; - /* We may have more replies on the way for this request: block until we're - * sure. */ -@@ -339,6 +339,7 @@ static int poll_for_reply(xcb_connection_t *c, unsigned int request, void **repl - - void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_error_t **e) - { -+ uint64_t widened_request; - void *ret = 0; - if(e) - *e = 0; -@@ -347,8 +348,12 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - - pthread_mutex_lock(&c->iolock); - -+ widened_request = (c->out.request & UINT64_C(0xffffffff00000000)) | request; -+ if(widened_request > c->out.request) -+ widened_request -= UINT64_C(1) << 32; -+ - /* If this request has not been written yet, write it. */ -- if(_xcb_out_flush_to(c, request)) -+ if(_xcb_out_flush_to(c, widened_request)) - { - pthread_cond_t cond = PTHREAD_COND_INITIALIZER; - reader_list reader; -@@ -356,7 +361,7 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - - for(prev_reader = &c->in.readers; - *prev_reader && -- XCB_SEQUENCE_COMPARE ((*prev_reader)->request, <=, request); -+ XCB_SEQUENCE_COMPARE_32((*prev_reader)->request, <=, request); - prev_reader = &(*prev_reader)->next) - { - /* empty */; -@@ -372,7 +377,7 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - - for(prev_reader = &c->in.readers; - *prev_reader && -- XCB_SEQUENCE_COMPARE((*prev_reader)->request, <=, request); -+ XCB_SEQUENCE_COMPARE_32((*prev_reader)->request, <=, request); - prev_reader = &(*prev_reader)->next) - { - if(*prev_reader == &reader) -@@ -446,8 +451,8 @@ xcb_generic_error_t *xcb_request_check(xcb_connection_t *c, xcb_void_cookie_t co - void *reply; - if(c->has_error) - return 0; -- if(XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_expected) -- && XCB_SEQUENCE_COMPARE(cookie.sequence,>,c->in.request_completed)) -+ if(XCB_SEQUENCE_COMPARE_32(cookie.sequence,>,c->in.request_expected) -+ && XCB_SEQUENCE_COMPARE_32(cookie.sequence,>,c->in.request_completed)) - { - free(xcb_get_input_focus_reply(c, xcb_get_input_focus(c), &ret)); - assert(!ret); -@@ -501,7 +506,7 @@ void _xcb_in_destroy(_xcb_in *in) - } - } - --int _xcb_in_expect_reply(xcb_connection_t *c, unsigned int request, enum workarounds workaround, int flags) -+int _xcb_in_expect_reply(xcb_connection_t *c, uint64_t request, enum workarounds workaround, int flags) - { - pending_reply *pend = malloc(sizeof(pending_reply)); - assert(workaround != WORKAROUND_NONE || flags != 0); -diff --git a/src/xcb_out.c b/src/xcb_out.c -index ad4240a..1094ceb 100644 ---- a/src/xcb_out.c -+++ b/src/xcb_out.c -@@ -112,7 +112,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - } fields; - uint32_t packet; - } sync_req = { { /* GetInputFocus */ 43, 0, 1 } }; -- unsigned int request; -+ uint64_t request; - uint32_t prefix[3] = { 0 }; - int veclen = req->count; - enum workarounds workaround = WORKAROUND_NONE; -@@ -282,7 +282,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec **vector, int *count) - return ret; - } - --int _xcb_out_flush_to(xcb_connection_t *c, unsigned int request) -+int _xcb_out_flush_to(xcb_connection_t *c, uint64_t request) - { - assert(XCB_SEQUENCE_COMPARE(request, <=, c->out.request)); - if(XCB_SEQUENCE_COMPARE(c->out.request_written, >=, request)) -diff --git a/src/xcbint.h b/src/xcbint.h -index d610a10..cd351de 100644 ---- a/src/xcbint.h -+++ b/src/xcbint.h -@@ -52,7 +52,8 @@ enum lazy_reply_tag - - #define XCB_PAD(i) (-(i) & 3) - --#define XCB_SEQUENCE_COMPARE(a,op,b) ((int) ((a) - (b)) op 0) -+#define XCB_SEQUENCE_COMPARE(a,op,b) ((int64_t) ((a) - (b)) op 0) -+#define XCB_SEQUENCE_COMPARE_32(a,op,b) (((int) (a) - (int) (b)) op 0) - - /* xcb_list.c */ - -@@ -75,8 +76,8 @@ typedef struct _xcb_out { - char queue[4096]; - int queue_len; - -- unsigned int request; -- unsigned int request_written; -+ uint64_t request; -+ uint64_t request_written; - - pthread_mutex_t reqlenlock; - enum lazy_reply_tag maximum_request_length_tag; -@@ -90,7 +91,7 @@ int _xcb_out_init(_xcb_out *out); - void _xcb_out_destroy(_xcb_out *out); - - int _xcb_out_send(xcb_connection_t *c, struct iovec **vector, int *count); --int _xcb_out_flush_to(xcb_connection_t *c, unsigned int request); -+int _xcb_out_flush_to(xcb_connection_t *c, uint64_t request); - - - /* xcb_in.c */ -@@ -102,9 +103,9 @@ typedef struct _xcb_in { - char queue[4096]; - int queue_len; - -- unsigned int request_expected; -- unsigned int request_read; -- unsigned int request_completed; -+ uint64_t request_expected; -+ uint64_t request_read; -+ uint64_t request_completed; - struct reply_list *current_reply; - struct reply_list **current_reply_tail; - -@@ -120,7 +121,7 @@ typedef struct _xcb_in { - int _xcb_in_init(_xcb_in *in); - void _xcb_in_destroy(_xcb_in *in); - --int _xcb_in_expect_reply(xcb_connection_t *c, unsigned int request, enum workarounds workaround, int flags); -+int _xcb_in_expect_reply(xcb_connection_t *c, uint64_t request, enum workarounds workaround, int flags); - - int _xcb_in_read(xcb_connection_t *c); - int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0006-Support-handing-off-socket-write-permission-to-exter.patch b/x11-libs/libxcb/files/xcb-0006-Support-handing-off-socket-write-permission-to-exter.patch deleted file mode 100644 index 6533850..0000000 --- a/x11-libs/libxcb/files/xcb-0006-Support-handing-off-socket-write-permission-to-exter.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 3ee2dac8e00be4666bd74d5b5263ff52c2f9f199 Mon Sep 17 00:00:00 2001 -From: Josh Triplett <josh@freedesktop.org> -Date: Sun, 16 Mar 2008 23:16:08 -0700 -Subject: [PATCH] Support handing off socket write permission to external code. - -Libraries like Xlib, some XCB language bindings, and potentially others -have a common problem: they want to share the X connection with XCB. This -requires coordination of request sequence numbers. Previously, XCB had an -Xlib-specific lock, and allowed Xlib to block XCB from making requests. -Now we've replaced that lock with a handoff mechanism, xcb_take_socket, -allowing external code to ask XCB for permission to take over the write -side of the socket and send raw data with xcb_writev. The caller of -xcb_take_socket must supply a callback which XCB can call when it wants -the write side of the socket back to make a request. This callback -synchronizes with the external socket owner, flushes any output queues if -appropriate, and then returns the sequence number of the last request sent -over the socket. - -Commit by Josh Triplett and Jamey Sharp. -Handoff mechanism inspired by Keith Packard. ---- - src/Makefile.am | 2 +- - src/xcb_in.c | 22 +++++++++++++++++-- - src/xcb_out.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xcbext.h | 17 +++++++++++++++ - src/xcbint.h | 15 +++++++++++++- - 5 files changed, 110 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index bf6e991..756337a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,7 +24,7 @@ libxcb_la_SOURCES = \ - # * If you add an interface, increment current and age and set revision to 0. - # * If you change or remove an interface, increment current and set revision - # and age to 0. --libxcb_la_LDFLAGS = -version-info 1:0:0 -+libxcb_la_LDFLAGS = -version-info 2:0:1 - - XCB_LIBS = libxcb.la - -diff --git a/src/xcb_in.c b/src/xcb_in.c -index ff59894..36ec26b 100644 ---- a/src/xcb_in.c -+++ b/src/xcb_in.c -@@ -113,6 +113,7 @@ static int read_packet(xcb_connection_t *c) - } - - while(c->in.pending_replies && -+ c->in.pending_replies->workaround != WORKAROUND_EXTERNAL_SOCKET_OWNER && - XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed)) - { - pending_reply *oldpend = c->in.pending_replies; -@@ -130,8 +131,9 @@ static int read_packet(xcb_connection_t *c) - { - pend = c->in.pending_replies; - if(pend && -- (XCB_SEQUENCE_COMPARE(c->in.request_read, <, pend->first_request) || -- XCB_SEQUENCE_COMPARE(c->in.request_read, >, pend->last_request))) -+ !(XCB_SEQUENCE_COMPARE(pend->first_request, <=, c->in.request_read) && -+ (pend->workaround == WORKAROUND_EXTERNAL_SOCKET_OWNER || -+ XCB_SEQUENCE_COMPARE(c->in.request_read, <=, pend->last_request)))) - pend = 0; - } - -@@ -353,7 +355,7 @@ void *xcb_wait_for_reply(xcb_connection_t *c, unsigned int request, xcb_generic_ - widened_request -= UINT64_C(1) << 32; - - /* If this request has not been written yet, write it. */ -- if(_xcb_out_flush_to(c, widened_request)) -+ if(c->out.return_socket || _xcb_out_flush_to(c, widened_request)) - { - pthread_cond_t cond = PTHREAD_COND_INITIALIZER; - reader_list reader; -@@ -524,6 +526,20 @@ int _xcb_in_expect_reply(xcb_connection_t *c, uint64_t request, enum workarounds - return 1; - } - -+void _xcb_in_replies_done(xcb_connection_t *c) -+{ -+ struct pending_reply *pend; -+ if (c->in.pending_replies_tail != &c->in.pending_replies) -+ { -+ pend = container_of(c->in.pending_replies_tail, struct pending_reply, next); -+ if(pend->workaround == WORKAROUND_EXTERNAL_SOCKET_OWNER) -+ { -+ pend->last_request = c->out.request; -+ pend->workaround = WORKAROUND_NONE; -+ } -+ } -+} -+ - int _xcb_in_read(xcb_connection_t *c) - { - int n = read(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len); -diff --git a/src/xcb_out.c b/src/xcb_out.c -index 1094ceb..4c6ab13 100644 ---- a/src/xcb_out.c -+++ b/src/xcb_out.c -@@ -55,6 +55,25 @@ static int write_block(xcb_connection_t *c, struct iovec *vector, int count) - return _xcb_out_send(c, &vector, &count); - } - -+static void get_socket_back(xcb_connection_t *c) -+{ -+ while(c->out.return_socket && c->out.socket_moving) -+ pthread_cond_wait(&c->out.socket_cond, &c->iolock); -+ if(!c->out.return_socket) -+ return; -+ -+ c->out.socket_moving = 1; -+ pthread_mutex_unlock(&c->iolock); -+ c->out.return_socket(c->out.socket_closure); -+ pthread_mutex_lock(&c->iolock); -+ c->out.socket_moving = 0; -+ -+ pthread_cond_broadcast(&c->out.socket_cond); -+ c->out.return_socket = 0; -+ c->out.socket_closure = 0; -+ _xcb_in_replies_done(c); -+} -+ - /* Public interface */ - - void xcb_prefetch_maximum_request_length(xcb_connection_t *c) -@@ -191,6 +210,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - /* wait for other writing threads to get out of my way. */ - while(c->out.writing) - pthread_cond_wait(&c->out.cond, &c->iolock); -+ get_socket_back(c); - - request = ++c->out.request; - /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without -@@ -235,6 +255,39 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - return request; - } - -+int xcb_take_socket(xcb_connection_t *c, void (*return_socket)(void *closure), void *closure, int flags, uint64_t *sent) -+{ -+ int ret; -+ if(c->has_error) -+ return 0; -+ pthread_mutex_lock(&c->iolock); -+ get_socket_back(c); -+ ret = _xcb_out_flush_to(c, c->out.request); -+ if(ret) -+ { -+ c->out.return_socket = return_socket; -+ c->out.socket_closure = closure; -+ if(flags) -+ _xcb_in_expect_reply(c, c->out.request, WORKAROUND_EXTERNAL_SOCKET_OWNER, flags); -+ assert(c->out.request == c->out.request_written); -+ *sent = c->out.request; -+ } -+ pthread_mutex_unlock(&c->iolock); -+ return ret; -+} -+ -+int xcb_writev(xcb_connection_t *c, struct iovec *vector, int count, uint64_t requests) -+{ -+ int ret; -+ if(c->has_error) -+ return 0; -+ pthread_mutex_lock(&c->iolock); -+ c->out.request += requests; -+ ret = _xcb_out_send(c, &vector, &count); -+ pthread_mutex_unlock(&c->iolock); -+ return ret; -+} -+ - int xcb_flush(xcb_connection_t *c) - { - int ret; -@@ -250,6 +303,12 @@ int xcb_flush(xcb_connection_t *c) - - int _xcb_out_init(_xcb_out *out) - { -+ if(pthread_cond_init(&out->socket_cond, 0)) -+ return 0; -+ out->return_socket = 0; -+ out->socket_closure = 0; -+ out->socket_moving = 0; -+ - if(pthread_cond_init(&out->cond, 0)) - return 0; - out->writing = 0; -diff --git a/src/xcbext.h b/src/xcbext.h -index 856ad3d..bd26039 100644 ---- a/src/xcbext.h -+++ b/src/xcbext.h -@@ -60,6 +60,23 @@ enum xcb_send_request_flags_t { - - unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vector, const xcb_protocol_request_t *request); - -+/* xcb_take_socket allows external code to ask XCB for permission to -+ * take over the write side of the socket and send raw data with -+ * xcb_writev. xcb_take_socket provides the sequence number of the last -+ * request XCB sent. The caller of xcb_take_socket must supply a -+ * callback which XCB can call when it wants the write side of the -+ * socket back to make a request. This callback synchronizes with the -+ * external socket owner, flushes any output queues if appropriate, and -+ * then returns the sequence number of the last request sent over the -+ * socket. */ -+int xcb_take_socket(xcb_connection_t *c, void (*return_socket)(void *closure), void *closure, int flags, uint64_t *sent); -+ -+/* You must own the write-side of the socket (you've called -+ * xcb_take_socket, and haven't returned from return_socket yet) to call -+ * xcb_writev. Also, the iovec must have at least 1 byte of data in it. -+ * */ -+int xcb_writev(xcb_connection_t *c, struct iovec *vector, int count, uint64_t requests); -+ - - /* xcb_in.c */ - -diff --git a/src/xcbint.h b/src/xcbint.h -index cd351de..2c9f7cd 100644 ---- a/src/xcbint.h -+++ b/src/xcbint.h -@@ -40,7 +40,8 @@ - - enum workarounds { - WORKAROUND_NONE, -- WORKAROUND_GLX_GET_FB_CONFIGS_BUG -+ WORKAROUND_GLX_GET_FB_CONFIGS_BUG, -+ WORKAROUND_EXTERNAL_SOCKET_OWNER - }; - - enum lazy_reply_tag -@@ -55,6 +56,12 @@ enum lazy_reply_tag - #define XCB_SEQUENCE_COMPARE(a,op,b) ((int64_t) ((a) - (b)) op 0) - #define XCB_SEQUENCE_COMPARE_32(a,op,b) (((int) (a) - (int) (b)) op 0) - -+#ifndef offsetof -+#define offsetof(type,member) ((size_t) &((type *)0)->member) -+#endif -+ -+#define container_of(pointer,type,member) ((type *)(((char *)(pointer)) - offsetof(type, member))) -+ - /* xcb_list.c */ - - typedef void (*xcb_list_free_func_t)(void *); -@@ -73,6 +80,11 @@ typedef struct _xcb_out { - pthread_cond_t cond; - int writing; - -+ pthread_cond_t socket_cond; -+ void (*return_socket)(void *closure); -+ void *socket_closure; -+ int socket_moving; -+ - char queue[4096]; - int queue_len; - -@@ -122,6 +134,7 @@ int _xcb_in_init(_xcb_in *in); - void _xcb_in_destroy(_xcb_in *in); - - int _xcb_in_expect_reply(xcb_connection_t *c, uint64_t request, enum workarounds workaround, int flags); -+void _xcb_in_replies_done(xcb_connection_t *c); - - int _xcb_in_read(xcb_connection_t *c); - int _xcb_in_read_block(xcb_connection_t *c, void *buf, int nread); --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0007-Bump-version-number-to-1.2.patch b/x11-libs/libxcb/files/xcb-0007-Bump-version-number-to-1.2.patch deleted file mode 100644 index be26baa..0000000 --- a/x11-libs/libxcb/files/xcb-0007-Bump-version-number-to-1.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 958b1acbc99e99fc584c416bcbe77a94d8b049f4 Mon Sep 17 00:00:00 2001 -From: Josh Triplett <josh@freedesktop.org> -Date: Sat, 15 Mar 2008 18:17:18 -0700 -Subject: [PATCH] Bump version number to 1.2 - ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e9d9412..8685608 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ - - AC_PREREQ(2.57) - AC_INIT([libxcb], -- 1.1.90.1, -+ 1.2, - [xcb@lists.freedesktop.org]) - AC_CONFIG_SRCDIR([xcb.pc.in]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0008-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch b/x11-libs/libxcb/files/xcb-0008-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch deleted file mode 100644 index 3d9f3ab..0000000 --- a/x11-libs/libxcb/files/xcb-0008-Use-XCB_QUEUE_BUFFER_SIZE-for-added-queue-declaration.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dca6cedea507095525fa0e606a7dc80dc970f3a7 Mon Sep 17 00:00:00 2001 -From: James Cloos <cloos@jhcloos.com> -Date: Sat, 1 Nov 2008 12:01:45 -0400 -Subject: [PATCH] Use XCB_QUEUE_BUFFER_SIZE for added queue[] declaration - ---- - src/xcbint.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/xcbint.h b/src/xcbint.h -index dac0a61..6cac8e3 100644 ---- a/src/xcbint.h -+++ b/src/xcbint.h -@@ -112,7 +112,7 @@ typedef struct _xcb_in { - pthread_cond_t event_cond; - int reading; - -- char queue[4096]; -+ char queue[XCB_QUEUE_BUFFER_SIZE]; - int queue_len; - - uint64_t request_expected; --- -1.6.0.2.307.gc427.dirty - diff --git a/x11-libs/libxcb/files/xcb-0009-mv-closure-block.patch b/x11-libs/libxcb/files/xcb-0009-mv-closure-block.patch deleted file mode 100644 index 77c6413..0000000 --- a/x11-libs/libxcb/files/xcb-0009-mv-closure-block.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/libxcb/src/xcbint.h 2008-11-01 12:18:48.000000000 -0400 -+++ b/libxcb/src/xcbint.h 2008-11-01 12:02:02.241276875 -0400 -@@ -80,6 +80,11 @@ - pthread_cond_t cond; - int writing; - -+ pthread_cond_t socket_cond; -+ void (*return_socket)(void *closure); -+ void *socket_closure; -+ int socket_moving; -+ - char queue[XCB_QUEUE_BUFFER_SIZE]; - int queue_len; - -@@ -107,11 +112,6 @@ - pthread_cond_t event_cond; - int reading; - -- pthread_cond_t socket_cond; -- void (*return_socket)(void *closure); -- void *socket_closure; -- int socket_moving; -- - char queue[XCB_QUEUE_BUFFER_SIZE]; - int queue_len; - diff --git a/x11-libs/libxcb/libxcb-9999.ebuild b/x11-libs/libxcb/libxcb-9999.ebuild deleted file mode 100644 index a4a2d30..0000000 --- a/x11-libs/libxcb/libxcb-9999.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb" -PATCHES="${FILESDIR}/xcb-*.patch" - -DESCRIPTION="X C-language Bindings library" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libXau - x11-libs/libXdmcp - dev-libs/libpthread-stubs" -DEPEND="${RDEPEND} - dev-libs/libxslt - >=x11-proto/xcb-proto-9999 - >=dev-lang/python-2.5" diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest deleted file mode 100644 index b3846eb..0000000 --- a/x11-libs/libxkbfile/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libxkbfile-9999.ebuild 322 RMD160 5e96852f268ae03e7be8d7a160b4246f7e4ad349 SHA1 faffb02117fcba216eb26c9d05014a51557d3e6a SHA256 24eb96b7f2857a878978928dcd1a44f4b1238e44ed59a944c2ae31378b121b74 diff --git a/x11-libs/libxkbfile/libxkbfile-9999.ebuild b/x11-libs/libxkbfile/libxkbfile-9999.ebuild deleted file mode 100644 index 023de96..0000000 --- a/x11-libs/libxkbfile/libxkbfile-9999.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org xkbfile library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libX11 - x11-proto/kbproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest deleted file mode 100644 index 74ec574..0000000 --- a/x11-libs/libxkbui/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD libxkbui-9999.ebuild 348 RMD160 0d8d364024884b87321e7dfddce9574f7bf66dab SHA1 62d30c0b6f8e9ba1674d4a25ada3b74f6fa3b4de SHA256 5dd62aba5396d2958f04090502e96e16f9cbae51c15b9ba5d99ae6280537874d diff --git a/x11-libs/libxkbui/libxkbui-9999.ebuild b/x11-libs/libxkbui/libxkbui-9999.ebuild deleted file mode 100644 index 7c4d892..0000000 --- a/x11-libs/libxkbui/libxkbui-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org xkbui library" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="x11-libs/libXt - >=x11-libs/libxkbfile-1.0.3 - x11-proto/kbproto" -DEPEND="${RDEPEND}" diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest deleted file mode 100644 index 2742081..0000000 --- a/x11-libs/pixman/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD pixman-9999.ebuild 634 RMD160 385bc56ba2d5f440b28689b71e16e59733a09f8f SHA1 586497744e02945e6dee0b3a4031d8861723f5ab SHA256 2385182a5f287a0ab2440b1ae247d57e1cc465e618d1851fb4f1a8021058ae59 diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild deleted file mode 100644 index d19fa8d..0000000 --- a/x11-libs/pixman/pixman-9999.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.5.ebuild,v 1.1 2006/04/29 04:23:28 joshuabaergen Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit git x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman" - -DESCRIPTION="Pixel manipulation library" -SRC_URI="" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="" -DEPEND="${RDEPEND}" - -src_unpack() { - git_src_unpack - x-modular_patch_source - x-modular_reconf_source -} diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest deleted file mode 100644 index fd19907..0000000 --- a/x11-libs/xcb-util/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX 0.1-fix-xcb-util-dependencies.patch 5942 RMD160 c1466c25575c33ecbd8cb344b0f73e8d18c629a0 SHA1 e90e3a3637e35caff81e192ef8463c8fa20d80dd SHA256 80cb5e23f122c0d8dfa96fa896ce6c92ad63ec587432f480d877e12cfe869202 -AUX 0.1-fix-xcb-util-dependencies.patch.old 5695 RMD160 6470c84981e8cf40fab5fc1e8597a30262e46180 SHA1 1b5749a21bce4fb5ed9b5eb2e5065f4d7f6e9ce7 SHA256 c40582a9d74f026b885e575a7987e94f1671a14dcd9599a9a0dfbd23e05e38b1 -DIST xcb-util-0.1.tar.bz2 245279 RMD160 c4d63b57a3dbb00634423c6fc725b9c32d6a503d SHA1 93bf0f7be2655791ca5d19f618f7f9b62cbf14be SHA256 9086821a37d29ec4158f841c948b26637f4e262f22344d834eefafb7a313d266 -EBUILD xcb-util-0.1.ebuild 630 RMD160 534e6fd9ca151eb5c91a61e0410fc6a6cc03f4c4 SHA1 07c69a85fbd8823231aff10957823bf770398d8b SHA256 33e58ab8f2c24cc4ba9c6830785d1d3b62464841e34ae0d4d39ca7440cdf27da -EBUILD xcb-util-9999.ebuild 881 RMD160 c1b36e45bbf2af5ff9e897b2fa0009f363f6c9d9 SHA1 fa5900efcf9c2190556e7e27b9c5382759989c7d SHA256 f335daa3b03739a8a5559b8c85cfcf0f295b323f42177dc1afd2c0704b8efabf diff --git a/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch b/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch deleted file mode 100644 index f2336b7..0000000 --- a/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch +++ /dev/null @@ -1,183 +0,0 @@ -# -# Updated but not checked in: -# (will commit) -# -# modified: xcb-util/configure.ac -# modified: xcb-util/icccm/Makefile.am -# modified: xcb-util/image/Makefile.am -# modified: xcb-util/reply/Makefile.am -# modified: xcb-util/wm/Makefile.am -# -diff --git a/xcb-util/configure.ac b/xcb-util/configure.ac -index 75ff819..e29ba58 100644 ---- a/xcb-util/configure.ac -+++ b/xcb-util/configure.ac -@@ -20,6 +20,27 @@ AC_SUBST(pkgconfigdir) - PKG_CHECK_MODULES(XCB, xcb) - PKG_CHECK_MODULES(XCB_SHM, xcb-shm) - -+XCB_AUX_CFLAGS='-I$(top_builddir)/convenient' -+XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la' -+XCB_ATOM_CFLAGS='-I$(top_builddir)/atom' -+XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la' -+XCB_EVENT_CFLAGS='-I$(top_builddir)/event' -+XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la' -+XCB_PROPERTY_CFLAGS='-I$(top_builddir)/property' -+XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la' -+XCB_ICCCM_CFLAGS='-I$(top_builddir)/icccm' -+XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la' -+AC_SUBST(XCB_AUX_CFLAGS) -+AC_SUBST(XCB_AUX_LIBS) -+AC_SUBST(XCB_ATOM_CFLAGS) -+AC_SUBST(XCB_ATOM_LIBS) -+AC_SUBST(XCB_EVENT_CFLAGS) -+AC_SUBST(XCB_EVENT_LIBS) -+AC_SUBST(XCB_PROPERTY_CFLAGS) -+AC_SUBST(XCB_PROPERTY_LIBS) -+AC_SUBST(XCB_ICCCM_CFLAGS) -+AC_SUBST(XCB_ICCCM_LIBS) -+ - AC_OUTPUT([Makefile - convenient/Makefile convenient/xcb-aux.pc - reply/Makefile reply/xcb-reply.pc -diff --git a/xcb-util/icccm/Makefile.am b/xcb-util/icccm/Makefile.am -index 337e410..cf78df0 100644 ---- a/xcb-util/icccm/Makefile.am -+++ b/xcb-util/icccm/Makefile.am -@@ -8,10 +8,9 @@ xcbinclude_HEADERS = xcb_icccm.h - AM_CFLAGS = -Wall - - libXCBICCCM_la_SOURCES = icccm.c --libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) -I../atom -I../event -I../property --libXCBICCCM_la_LIBADD = $(XCB_LIBS) \ -- -L../atom -lXCBAtom \ -- -L../property -lXCBProperty -+libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) $(XCB_ATOM_CFLAGS) $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) -+libXCBICCCM_la_LIBADD = $(XCB_LIBS) $(XCB_ATOM_LIBS) $(XCB_PROPERTY_LIBS) - - pkgconfig_DATA = xcb-icccm.pc - -diff --git a/xcb-util/image/Makefile.am b/xcb-util/image/Makefile.am -index 8bae709..683964d 100644 ---- a/xcb-util/image/Makefile.am -+++ b/xcb-util/image/Makefile.am -@@ -7,9 +7,11 @@ xcbinclude_HEADERS = xcb_image.h - - AM_CFLAGS = -Wall - -+XCB_IMAGE_LIBS = libXCBImage.la -+ - libXCBImage_la_SOURCES = xcb_image.c --libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) -L../convenient -lXCBAux -+libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_AUX_LIBS) - - pkgconfig_DATA = xcb-image.pc - -@@ -18,14 +20,15 @@ EXTRA_DIST=xcb-image.pc.in - noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats - - test_xcb_image_SOURCES = test_xcb_image.c --test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage -+test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient $(XCB_AUX_LIBS) \ -+ $(XCB_IMAGE_LIBS) - - test_xcb_image_shm_SOURCES = test_xcb_image_shm.c --test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient -+test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) - test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \ -- -L../convenient -lXCBAux -lXCBImage -+ $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) - - test_formats_SOURCES = test_formats.c --test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --test_formats_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage -+test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) -diff --git a/xcb-util/reply/Makefile.am b/xcb-util/reply/Makefile.am -index 8fc5afb..504c68d 100644 ---- a/xcb-util/reply/Makefile.am -+++ b/xcb-util/reply/Makefile.am -@@ -7,6 +7,8 @@ xcbinclude_HEADERS = xcb_reply.h - - AM_CFLAGS = -Wall - -+XCB_REPLY_LIBS = libXCBReply.la -+ - libXCBReply_la_SOURCES = reply.c - libXCBReply_la_CFLAGS = $(XCB_CFLAGS) - libXCBReply_la_LIBADD = $(XCB_LIBS) -lpthread -@@ -18,5 +20,5 @@ EXTRA_DIST=xcb-reply.pc.in - noinst_PROGRAMS = test_reply - - test_reply_CFLAGS = $(XCB_CFLAGS) --test_reply_LDADD = $(XCB_LIBS) -lXCBReply -+test_reply_LDADD = $(XCB_LIBS) $(XCB_REPLY_LIBS) - test_reply_SOURCES = test_reply.c -diff --git a/xcb-util/wm/Makefile.am b/xcb-util/wm/Makefile.am -index 9b43a93..06d1034 100644 ---- a/xcb-util/wm/Makefile.am -+++ b/xcb-util/wm/Makefile.am -@@ -7,19 +7,21 @@ xcbinclude_HEADERS = xcb_wm.h - - AM_CFLAGS = -Wall - -+XCB_XCBWM_LIBS = libXCBWM.la -+ - libXCBWM_la_SOURCES = manage.c table.c - libXCBWM_la_CFLAGS = $(XCB_CFLAGS) \ -- -I../convenient \ -- -I../atom \ -- -I../event \ -- -I../property \ -- -I../icccm -+ $(XCB_AUX_CFLAGS) \ -+ $(XCB_ATOM_CFLAGS) \ -+ $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) \ -+ $(XCB_ICCCM_CFLAGS) - libXCBWM_la_LIBADD = $(XCB_LIBS) \ -- -L../convenient -lXCBAux \ -- -L../atom -lXCBAtom \ -- -L../event -lXCBEvent \ -- -L../property -lXCBProperty \ -- -L../icccm -lXCBICCCM -+ $(XCB_AUX_LIBS) \ -+ $(XCB_ATOM_LIBS) \ -+ $(XCB_EVENT_LIBS) \ -+ $(XCB_PROPERTY_LIBS) \ -+ $(XCB_ICCCM_LIBS) - - pkgconfig_DATA = xcb-wm.pc - -@@ -29,14 +31,16 @@ noinst_PROGRAMS = xcbwm-test - - xcbwm_test_SOURCES = xcbwm-test.c reply_formats.c reply_formats.h - xcbwm_test_CFLAGS = $(XCB_CFLAGS) \ -- -I../convenient \ -- -I../atom \ -- -I../event \ -- -I../property \ -- -I../icccm -+ $(XCB_AUX_CFLAGS) \ -+ $(XCB_ATOM_CFLAGS) \ -+ $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) \ -+ $(XCB_ICCCM_CFLAGS) - xcbwm_test_LDADD = $(XCB_LIBS) \ -- -L../convenient -lXCBAux \ -- -L../event -lXCBEvent \ -- -L../property -lXCBProperty \ -- -L../icccm -lXCBICCCM \ -- -lXCBWM -lpthread -+ $(XCB_AUX_LIBS) \ -+ $(XCB_ATOM_LIBS) \ -+ $(XCB_EVENT_LIBS) \ -+ $(XCB_PROPERTY_LIBS) \ -+ $(XCB_ICCCM_LIBS) \ -+ $(XCB_XCBWM_LIBS) \ -+ -lpthread diff --git a/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch.old b/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch.old deleted file mode 100644 index 7d2323c..0000000 --- a/x11-libs/xcb-util/files/0.1-fix-xcb-util-dependencies.patch.old +++ /dev/null @@ -1,170 +0,0 @@ -# -# Updated but not checked in: -# (will commit) -# -# modified: xcb-util/icccm/Makefile.am -# modified: xcb-util/image/Makefile.am -# modified: xcb-util/reply/Makefile.am -# modified: xcb-util/wm/Makefile.am -# -diff --git a/xcb-util/icccm/Makefile.am b/xcb-util/icccm/Makefile.am -index 337e410..fe57cef 100644 ---- a/xcb-util/icccm/Makefile.am -+++ b/xcb-util/icccm/Makefile.am -@@ -7,11 +7,17 @@ xcbinclude_HEADERS = xcb_icccm.h - - AM_CFLAGS = -Wall - -+XCB_ATOM_CFLAGS = -I$(top_builddir)/atom -+XCB_ATOM_LIBS = $(top_builddir)/atom/libXCBAtom.la -+XCB_EVENT_CFLAGS = -I$(top_builddir)/event -+XCB_EVENT_LIBS = $(top_builddir)/event/libXCBEvent.la -+XCB_PROPERTY_CFLAGS = -I$(top_builddir)/property -+XCB_PROPERTY_LIBS = $(top_builddir)/property/libXCBProperty.la -+ - libXCBICCCM_la_SOURCES = icccm.c --libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) -I../atom -I../event -I../property --libXCBICCCM_la_LIBADD = $(XCB_LIBS) \ -- -L../atom -lXCBAtom \ -- -L../property -lXCBProperty -+libXCBICCCM_la_CFLAGS = $(XCB_CFLAGS) $(XCB_ATOM_CFLAGS) $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) -+libXCBICCCM_la_LIBADD = $(XCB_LIBS) $(XCB_ATOM_LIBS) $(XCB_PROPERTY_LIBS) - - pkgconfig_DATA = xcb-icccm.pc - -diff --git a/xcb-util/image/Makefile.am b/xcb-util/image/Makefile.am -index 8bae709..6e34430 100644 ---- a/xcb-util/image/Makefile.am -+++ b/xcb-util/image/Makefile.am -@@ -7,9 +7,13 @@ xcbinclude_HEADERS = xcb_image.h - - AM_CFLAGS = -Wall - -+XCB_AUX_LIBS = $(top_builddir)/convenient/libXCBAux.la -+XCB_AUX_CFLAGS = -I$(top_builddir)/convenient -+XCB_IMAGE_LIBS = libXCBImage.la -+ - libXCBImage_la_SOURCES = xcb_image.c --libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) -L../convenient -lXCBAux -+libXCBImage_la_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+libXCBImage_la_LIBADD = $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_AUX_LIBS) - - pkgconfig_DATA = xcb-image.pc - -@@ -18,14 +22,15 @@ EXTRA_DIST=xcb-image.pc.in - noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats - - test_xcb_image_SOURCES = test_xcb_image.c --test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage -+test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient $(XCB_AUX_LIBS) \ -+ $(XCB_IMAGE_LIBS) - - test_xcb_image_shm_SOURCES = test_xcb_image_shm.c --test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient -+test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) - test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \ -- -L../convenient -lXCBAux -lXCBImage -+ $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) - - test_formats_SOURCES = test_formats.c --test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient --test_formats_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage -+test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) -+test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) -diff --git a/xcb-util/reply/Makefile.am b/xcb-util/reply/Makefile.am -index 8fc5afb..504c68d 100644 ---- a/xcb-util/reply/Makefile.am -+++ b/xcb-util/reply/Makefile.am -@@ -7,6 +7,8 @@ xcbinclude_HEADERS = xcb_reply.h - - AM_CFLAGS = -Wall - -+XCB_REPLY_LIBS = libXCBReply.la -+ - libXCBReply_la_SOURCES = reply.c - libXCBReply_la_CFLAGS = $(XCB_CFLAGS) - libXCBReply_la_LIBADD = $(XCB_LIBS) -lpthread -@@ -18,5 +20,5 @@ EXTRA_DIST=xcb-reply.pc.in - noinst_PROGRAMS = test_reply - - test_reply_CFLAGS = $(XCB_CFLAGS) --test_reply_LDADD = $(XCB_LIBS) -lXCBReply -+test_reply_LDADD = $(XCB_LIBS) $(XCB_REPLY_LIBS) - test_reply_SOURCES = test_reply.c -diff --git a/xcb-util/wm/Makefile.am b/xcb-util/wm/Makefile.am -index 9b43a93..4bbbf6a 100644 ---- a/xcb-util/wm/Makefile.am -+++ b/xcb-util/wm/Makefile.am -@@ -7,19 +7,31 @@ xcbinclude_HEADERS = xcb_wm.h - - AM_CFLAGS = -Wall - -+XCB_AUX_CFLAGS = -I$(top_builddir)/convenient -+XCB_AUX_LIBS = $(top_builddir)/convenient/libXCBAux.la -+XCB_ATOM_CFLAGS = -I$(top_builddir)/atom -+XCB_ATOM_LIBS = $(top_builddir)/atom/libXCBAtom.la -+XCB_EVENT_CFLAGS = -I$(top_builddir)/event -+XCB_EVENT_LIBS = $(top_builddir)/event/libXCBEvent.la -+XCB_PROPERTY_CFLAGS = -I$(top_builddir)/property -+XCB_PROPERTY_LIBS = $(top_builddir)/property/libXCBProperty.la -+XCB_ICCCM_CFLAGS = -I$(top_builddir)/icccm -+XCB_ICCCM_LIBS = $(top_builddir)/icccm/libXCBICCCM.la -+XCB_XCBWM_LIBS = libXCBWM.la -+ - libXCBWM_la_SOURCES = manage.c table.c - libXCBWM_la_CFLAGS = $(XCB_CFLAGS) \ -- -I../convenient \ -- -I../atom \ -- -I../event \ -- -I../property \ -- -I../icccm -+ $(XCB_AUX_CFLAGS) \ -+ $(XCB_ATOM_CFLAGS) \ -+ $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) \ -+ $(XCB_ICCCM_CFLAGS) - libXCBWM_la_LIBADD = $(XCB_LIBS) \ -- -L../convenient -lXCBAux \ -- -L../atom -lXCBAtom \ -- -L../event -lXCBEvent \ -- -L../property -lXCBProperty \ -- -L../icccm -lXCBICCCM -+ $(XCB_AUX_LIBS) \ -+ $(XCB_ATOM_LIBS) \ -+ $(XCB_EVENT_LIBS) \ -+ $(XCB_PROPERTY_LIBS) \ -+ $(XCB_ICCCM_LIBS) - - pkgconfig_DATA = xcb-wm.pc - -@@ -29,14 +41,16 @@ noinst_PROGRAMS = xcbwm-test - - xcbwm_test_SOURCES = xcbwm-test.c reply_formats.c reply_formats.h - xcbwm_test_CFLAGS = $(XCB_CFLAGS) \ -- -I../convenient \ -- -I../atom \ -- -I../event \ -- -I../property \ -- -I../icccm -+ $(XCB_AUX_CFLAGS) \ -+ $(XCB_ATOM_CFLAGS) \ -+ $(XCB_EVENT_CFLAGS) \ -+ $(XCB_PROPERTY_CFLAGS) \ -+ $(XCB_ICCCM_CFLAGS) - xcbwm_test_LDADD = $(XCB_LIBS) \ -- -L../convenient -lXCBAux \ -- -L../event -lXCBEvent \ -- -L../property -lXCBProperty \ -- -L../icccm -lXCBICCCM \ -- -lXCBWM -lpthread -+ $(XCB_AUX_LIBS) \ -+ $(XCB_ATOM_LIBS) \ -+ $(XCB_EVENT_LIBS) \ -+ $(XCB_PROPERTY_LIBS) \ -+ $(XCB_ICCCM_LIBS) \ -+ $(XCB_XCBWM_LIBS) \ -+ -lpthread diff --git a/x11-libs/xcb-util/xcb-util-0.1.ebuild b/x11-libs/xcb-util/xcb-util-0.1.ebuild deleted file mode 100644 index 8793a24..0000000 --- a/x11-libs/xcb-util/xcb-util-0.1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.5.ebuild,v 1.1 2006/04/29 04:23:28 joshuabaergen Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="X C-language Bindings utilities" -SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libxcb" -DEPEND="${RDEPEND} - dev-util/gperf" - -PATCHES="${FILESDIR}/${PV}-fix-xcb-util-dependencies.patch" diff --git a/x11-libs/xcb-util/xcb-util-9999.ebuild b/x11-libs/xcb-util/xcb-util-9999.ebuild deleted file mode 100644 index ff96d59..0000000 --- a/x11-libs/xcb-util/xcb-util-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.5.ebuild,v 1.1 2006/04/29 04:23:28 joshuabaergen Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit git x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util.git" - -DESCRIPTION="X C-language Bindings utilities" -SRC_URI="" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND=">=x11-libs/libxcb-9999" -DEPEND="${RDEPEND} - dev-util/gperf" - -# git.eclass uses $S so we need a different var -MY_S="${WORKDIR}/${P}/${PN}" - -src_unpack() { - git_src_unpack - cd ${MY_S} - x-modular_patch_source - x-modular_reconf_source -} - -src_compile() { - cd ${MY_S} - x-modular_src_compile -} - -src_install() { - cd ${MY_S} - x-modular_src_install -} diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest deleted file mode 100644 index 4661668..0000000 --- a/x11-libs/xtrans/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xtrans-9999.ebuild 360 RMD160 139845fbf3e329288615da710089ca9e9ea2d59b SHA1 fac99eaa7d5edbb183037fba094c8788e5469140 SHA256 99be272392f30f410ac3bada3b3c9f53c8b42651c9a8272fb71f03ae454d3fae diff --git a/x11-libs/xtrans/xtrans-9999.ebuild b/x11-libs/xtrans/xtrans-9999.ebuild deleted file mode 100644 index de2b808..0000000 --- a/x11-libs/xtrans/xtrans-9999.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org xtrans library" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/lib${PN}" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest deleted file mode 100644 index 594a485..0000000 --- a/x11-misc/util-macros/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST util-macros-1.2.0.tar.bz2 49393 RMD160 00c53b248affd737176144fb413708c1135e0f9a SHA1 19ffcf706a5eef700766b7d62f693ffa0b06bb2a SHA256 11cc475d18d2bdd81ed263bffdc10cbc9d8a4262cff9c27e40a6f9345446d3da -EBUILD util-macros-1.2.0.ebuild 371 RMD160 4f2920ae1e7af1337698a8c11dc891b6c6802095 SHA1 4286ff5ecbbb943dd8b2e3694eb5ad49f5ac2537 SHA256 95a6ddf790ce7be5feaaee7d80bfaccb0b6e6e73991f23a6575d6e75d3262955 -EBUILD util-macros-9999.ebuild 371 RMD160 4f2920ae1e7af1337698a8c11dc891b6c6802095 SHA1 4286ff5ecbbb943dd8b2e3694eb5ad49f5ac2537 SHA256 95a6ddf790ce7be5feaaee7d80bfaccb0b6e6e73991f23a6575d6e75d3262955 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/x11-misc/util-macros/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -</pkgmetadata> diff --git a/x11-misc/util-macros/util-macros-1.2.0.ebuild b/x11-misc/util-macros/util-macros-1.2.0.ebuild deleted file mode 100644 index f80c013..0000000 --- a/x11-misc/util-macros/util-macros-1.2.0.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros" - -DESCRIPTION="X.Org autotools utility macros" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-misc/util-macros/util-macros-9999.ebuild b/x11-misc/util-macros/util-macros-9999.ebuild deleted file mode 100644 index f80c013..0000000 --- a/x11-misc/util-macros/util-macros-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/util/macros" - -DESCRIPTION="X.Org autotools utility macros" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-misc/xcb-demo/Manifest b/x11-misc/xcb-demo/Manifest deleted file mode 100644 index d298397..0000000 --- a/x11-misc/xcb-demo/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xcb-demo-9999.ebuild 430 RMD160 23d04d1dd6ce228d735795d63f89198966eae518 SHA1 81879b6292f8f8dbb27700e56c44e8ae3f63c0f4 SHA256 cc4537ac74b5ca1be31acc098e4369080f7e53c410fe70d20799f01a4c4f6098 diff --git a/x11-misc/xcb-demo/xcb-demo-9999.ebuild b/x11-misc/xcb-demo/xcb-demo-9999.ebuild deleted file mode 100644 index 60a5028..0000000 --- a/x11-misc/xcb-demo/xcb-demo-9999.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/demo" - -DESCRIPTION="X C-language Bindings demos" -HOMEPAGE="http://xcb.freedesktop.org" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -RDEPEND="x11-libs/libxcb - x11-libs/xcb-util" -DEPEND="${RDEPEND}" diff --git a/x11-misc/xinput/Manifest b/x11-misc/xinput/Manifest deleted file mode 100644 index b633608..0000000 --- a/x11-misc/xinput/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xinput-9999.ebuild 571 RMD160 c3395aedc23d03f2300fbf0760bd1a5b93a4e727 SHA1 b1b9aded1af3e0c2bba4a59a3d1d61ad1e90292a SHA256 3ab856289487f0a6bd1d80cdbc9b8cc422b284d9a135b700c2d3bcb41105bb8e diff --git a/x11-misc/xinput/xinput-9999.ebuild b/x11-misc/xinput/xinput-9999.ebuild deleted file mode 100644 index 3eac017..0000000 --- a/x11-misc/xinput/xinput-9999.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xinput/xinput-1.3.0.ebuild,v 1.1 2008/01/10 08:01:04 dberkholz Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -MODULE="app" -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/app/xinput" - -DESCRIPTION="Utility to set XInput device parameters" -LICENSE="as-is" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -RDEPEND=">=x11-libs/libXi-9999" -DEPEND="${RDEPEND} - >=x11-proto/inputproto-9999" diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest deleted file mode 100644 index 71f680c..0000000 --- a/x11-proto/bigreqsproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD bigreqsproto-9999.ebuild 303 RMD160 df0966710466a20c81112fb0057d0dc66b24c096 SHA1 bd07c96011d5dd5e435ca39b3881818a1cccc31d SHA256 5c95d092594ca3ccaa59eb70898663ed0144bc909c94c0469b31eb61051e6e5b diff --git a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild b/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild deleted file mode 100644 index eac0ea9..0000000 --- a/x11-proto/bigreqsproto/bigreqsproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org BigReqs protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/calibrateproto/Manifest b/x11-proto/calibrateproto/Manifest deleted file mode 100644 index c9a02d5..0000000 --- a/x11-proto/calibrateproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD calibrateproto-9999.ebuild 273 RMD160 6d207f923ecf14379b288a6a73be0b7ee07d78ff SHA1 46017c890d02a3e28c8a54a4744055aefdf4625b SHA256 0d495b4e7b3974a586a769ea48642e205afe0ceaa9e082ec8f151eb1c9df9432 diff --git a/x11-proto/calibrateproto/calibrateproto-9999.ebuild b/x11-proto/calibrateproto/calibrateproto-9999.ebuild deleted file mode 100644 index caf736c..0000000 --- a/x11-proto/calibrateproto/calibrateproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest deleted file mode 100644 index a70b91c..0000000 --- a/x11-proto/compositeproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD compositeproto-9999.ebuild 305 RMD160 64ca7ed6743b07f47df7bcdec0a9c374f87d4eba SHA1 44734ceb9874e99a6d3c53d3363301577fa20035 SHA256 c399eef9c04138713b38ba1e9ee5118f62358375304c0217661977747cde30ac diff --git a/x11-proto/compositeproto/compositeproto-9999.ebuild b/x11-proto/compositeproto/compositeproto-9999.ebuild deleted file mode 100644 index 8888179..0000000 --- a/x11-proto/compositeproto/compositeproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Composite protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest deleted file mode 100644 index 8076b97..0000000 --- a/x11-proto/damageproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD damageproto-9999.ebuild 302 RMD160 2a9bff7987ec21d782d661feef31d3db597cd355 SHA1 1f058ae07db9fbc37d7c1001620f14b91439d0dd SHA256 84e22c6b606a1ddaf7a76d38bffe835f368c4a0609327881435ed940359c6174 diff --git a/x11-proto/damageproto/damageproto-9999.ebuild b/x11-proto/damageproto/damageproto-9999.ebuild deleted file mode 100644 index b861873..0000000 --- a/x11-proto/damageproto/damageproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Damage protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest deleted file mode 100644 index 9387b98..0000000 --- a/x11-proto/dmxproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD dmxproto-9999.ebuild 299 RMD160 425fa7af9edfab3975eb69e9a5f91c7d9ca82a66 SHA1 3de6d2a419b3017abe07f434aa339db9c5414a03 SHA256 93b13b3a4cb4a06679e1474546baa81ec97f3b6f56528a3501a7ae64aa254fda diff --git a/x11-proto/dmxproto/dmxproto-9999.ebuild b/x11-proto/dmxproto/dmxproto-9999.ebuild deleted file mode 100644 index bcd50aa..0000000 --- a/x11-proto/dmxproto/dmxproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org DMX protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/evieext/Manifest b/x11-proto/evieext/Manifest deleted file mode 100644 index 6e4262e..0000000 --- a/x11-proto/evieext/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD evieext-9999.ebuild 370 RMD160 7b13d5766ff1a58a5647ac9f28d4da4075f8c277 SHA1 0d109abb48cf35872116c3f1a04c6f3d9b7d791c SHA256 e539ab860f5d12e469627083601808f58e27b1cfec723b9ace0a5df085910bb0 diff --git a/x11-proto/evieext/evieext-9999.ebuild b/x11-proto/evieext/evieext-9999.ebuild deleted file mode 100644 index 9c18936..0000000 --- a/x11-proto/evieext/evieext-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org EvIE protocol headers" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/evieproto" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest deleted file mode 100644 index d1fbaa0..0000000 --- a/x11-proto/fixesproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD fixesproto-9999.ebuild 301 RMD160 2ddc5af11b05e25ea5e8ef9f08933167e255d273 SHA1 172210dbe2f943cedab968846540b759ae892da8 SHA256 05e308cf41d3f6f44e87d5c7c473276da01f743bcf51fb27ff4faea96e4f667b diff --git a/x11-proto/fixesproto/fixesproto-9999.ebuild b/x11-proto/fixesproto/fixesproto-9999.ebuild deleted file mode 100644 index a6aa85f..0000000 --- a/x11-proto/fixesproto/fixesproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Fixes protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/fontcacheproto/Manifest b/x11-proto/fontcacheproto/Manifest deleted file mode 100644 index 3825037..0000000 --- a/x11-proto/fontcacheproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD fontcacheproto-9999.ebuild 305 RMD160 f6de594aba5ec7c99f3c8dc33b847122033df5b7 SHA1 d376436fa439e978b61de20de05868f6a1bc7bf2 SHA256 3046c5a24f63aa309e27aec8bd723cda0a06468f7155d7ca38248f24c214c3ca diff --git a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild b/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild deleted file mode 100644 index 0e21095..0000000 --- a/x11-proto/fontcacheproto/fontcacheproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Fontcache protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest deleted file mode 100644 index 93fa492..0000000 --- a/x11-proto/fontsproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD fontsproto-9999.ebuild 301 RMD160 e03216c5611358c0cad7f4133c488c66978a5097 SHA1 ece6aec4bc58f5e88b8eb93b9262e2db5f622259 SHA256 feeb22f49901d581a3f09c7262f0aa93e448ab68c8e0d024e88065d4dd41dba7 diff --git a/x11-proto/fontsproto/fontsproto-9999.ebuild b/x11-proto/fontsproto/fontsproto-9999.ebuild deleted file mode 100644 index 753443e..0000000 --- a/x11-proto/fontsproto/fontsproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Fonts protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest deleted file mode 100644 index 4fa4a43..0000000 --- a/x11-proto/glproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD glproto-9999.ebuild 1091 RMD160 bb13414ce6d3062072f47f06b27e34205382ed6c SHA1 4f6d4bae6c90d664b2f69dd0034aa4dd73f1697c SHA256 8c46c066d3ef99d5330e8b6eb22f389a993e002e726c306725302ba1374df57e diff --git a/x11-proto/glproto/glproto-9999.ebuild b/x11-proto/glproto/glproto-9999.ebuild deleted file mode 100644 index a84e5f3..0000000 --- a/x11-proto/glproto/glproto-9999.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -OPENGL_DIR="xorg-x11" - -DESCRIPTION="X.Org GL protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="app-admin/eselect-opengl" -DEPEND="" - -src_install() { - x-modular_src_install - dynamic_libgl_install -} - -pkg_postinst() { - x-modular_pkg_postinst - switch_opengl_implem -} - -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}/include - local x="" - # glext.h added for #54984 - for x in "${D}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do - if [[ -f ${x} || -L ${x} ]]; then - mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - 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} -} diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest deleted file mode 100644 index 7d01658..0000000 --- a/x11-proto/inputproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD inputproto-9999.ebuild 301 RMD160 4aba292a01bebfe667a680273303bf4d2d0c5bcb SHA1 12a08a148ed2a62778c60fb12d5a0080cb5e02d1 SHA256 f8152335a90ab7ba233e3121cdcbcb90989757b4dc348b4f258abec1281e8d2a diff --git a/x11-proto/inputproto/inputproto-9999.ebuild b/x11-proto/inputproto/inputproto-9999.ebuild deleted file mode 100644 index 178b004..0000000 --- a/x11-proto/inputproto/inputproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Input protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest deleted file mode 100644 index 8f2a53d..0000000 --- a/x11-proto/kbproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD kbproto-9999.ebuild 298 RMD160 cfc0e6a766ead8da34fefdc58df3ce4fede25e03 SHA1 f9cb35241fc5ca7ca34b1b24b991ab7851be98a8 SHA256 11b1b6f27a30738a249a9667071752fb684cc8c41b23f07fc4ab7ab4d43a3bcb diff --git a/x11-proto/kbproto/kbproto-9999.ebuild b/x11-proto/kbproto/kbproto-9999.ebuild deleted file mode 100644 index eeecfa2..0000000 --- a/x11-proto/kbproto/kbproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org KB protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/lg3dproto/Manifest b/x11-proto/lg3dproto/Manifest deleted file mode 100644 index bbd2ed9..0000000 --- a/x11-proto/lg3dproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD lg3dproto-9999.ebuild 273 RMD160 6d207f923ecf14379b288a6a73be0b7ee07d78ff SHA1 46017c890d02a3e28c8a54a4744055aefdf4625b SHA256 0d495b4e7b3974a586a769ea48642e205afe0ceaa9e082ec8f151eb1c9df9432 diff --git a/x11-proto/lg3dproto/lg3dproto-9999.ebuild b/x11-proto/lg3dproto/lg3dproto-9999.ebuild deleted file mode 100644 index caf736c..0000000 --- a/x11-proto/lg3dproto/lg3dproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/printproto/Manifest b/x11-proto/printproto/Manifest deleted file mode 100644 index 6e9f947..0000000 --- a/x11-proto/printproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD printproto-9999.ebuild 301 RMD160 2d3c0e4c3133629dd91b8045b109c641e917afcf SHA1 5f00d96f574862c2208e9aad4d2acf843ccbee36 SHA256 6c60991c6ecdbf540d6a6b57010ff0cacb789fc593f9c04ec0485cc44a1d36a3 diff --git a/x11-proto/printproto/printproto-9999.ebuild b/x11-proto/printproto/printproto-9999.ebuild deleted file mode 100644 index f6ea71a..0000000 --- a/x11-proto/printproto/printproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Print protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest deleted file mode 100644 index 2fb1272..0000000 --- a/x11-proto/randrproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD randrproto-9999.ebuild 301 RMD160 d52be07cc5deb90a5e4a98d4ae668d96f02de923 SHA1 968a1a81037f1c0dffe1c1c014d3464ed6395b09 SHA256 d8f430c50ae03245618d5b4e0c253073b2a7da05979a435e233bf66c68d29acd diff --git a/x11-proto/randrproto/randrproto-9999.ebuild b/x11-proto/randrproto/randrproto-9999.ebuild deleted file mode 100644 index cd9d02b..0000000 --- a/x11-proto/randrproto/randrproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Randr protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest deleted file mode 100644 index 9fe6782..0000000 --- a/x11-proto/recordproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD recordproto-9999.ebuild 302 RMD160 03a0b92e531027e10b909b41f6ce1b4f8638a431 SHA1 2834329ed83868b451e56d800e089e84640e00a3 SHA256 32e364d11194d89d9021268f2753947c303c93ead1697d921d8d6d8424f7d4e2 diff --git a/x11-proto/recordproto/recordproto-9999.ebuild b/x11-proto/recordproto/recordproto-9999.ebuild deleted file mode 100644 index b8daa12..0000000 --- a/x11-proto/recordproto/recordproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Record protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest deleted file mode 100644 index d3d01c3..0000000 --- a/x11-proto/renderproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD renderproto-9999.ebuild 302 RMD160 6bf721b47bee21b61ad0519e25235036d2fb153c SHA1 54f454bcb622cd59182482f270717688e7c2ecac SHA256 eac3483ec6c061cc63e29fc3f72a2a57036893f8598c09ee74441b50964de79a diff --git a/x11-proto/renderproto/renderproto-9999.ebuild b/x11-proto/renderproto/renderproto-9999.ebuild deleted file mode 100644 index 845e8ea..0000000 --- a/x11-proto/renderproto/renderproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Render protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest deleted file mode 100644 index ae610bf..0000000 --- a/x11-proto/resourceproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD resourceproto-9999.ebuild 304 RMD160 d134faf0500e62229d825a84770901d0a9d11c8e SHA1 b22ca3d516262441064a99e4ab6465ebd8df565d SHA256 97da441cc0d1846b42501d3518e71242d30eba3865336d04bdaed31eb3fc484c diff --git a/x11-proto/resourceproto/resourceproto-9999.ebuild b/x11-proto/resourceproto/resourceproto-9999.ebuild deleted file mode 100644 index 6ee43b9..0000000 --- a/x11-proto/resourceproto/resourceproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Resource protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest deleted file mode 100644 index adc2593..0000000 --- a/x11-proto/scrnsaverproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD scrnsaverproto-9999.ebuild 305 RMD160 3b0bdf129a957370ebca071223fdb4450e046fbe SHA1 1bd1e374b698f10815a1edca0bccd1a6cc878261 SHA256 9374b12d858b28c25af6597585feaa8471b91b065ad0e5bf3c42d08cb77bd092 diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild deleted file mode 100644 index 1e0de7d..0000000 --- a/x11-proto/scrnsaverproto/scrnsaverproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org ScrnSaver protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest deleted file mode 100644 index 0c10702..0000000 --- a/x11-proto/trapproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD trapproto-9999.ebuild 300 RMD160 58dde3801be41bb931009e77263bcc19b1d4c785 SHA1 7d6f309908379af1af840ba0015badf16dd292a5 SHA256 cbf4ddc2981f31e73f5376774fc86d3498064ef8e2efff30f8553ffe57729de2 diff --git a/x11-proto/trapproto/trapproto-9999.ebuild b/x11-proto/trapproto/trapproto-9999.ebuild deleted file mode 100644 index 2c378c2..0000000 --- a/x11-proto/trapproto/trapproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Trap protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest deleted file mode 100644 index b76ded2..0000000 --- a/x11-proto/videoproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD videoproto-9999.ebuild 301 RMD160 b9275237eb346c05805ffb92eaee94f89d65a380 SHA1 b608d70ad40e175ea1b5752c9e3cc983508abab9 SHA256 136ca2739a4be6dafc8757b8455966131c845aa29608858d8bd7bd68ee858c9b diff --git a/x11-proto/videoproto/videoproto-9999.ebuild b/x11-proto/videoproto/videoproto-9999.ebuild deleted file mode 100644 index ce12cfd..0000000 --- a/x11-proto/videoproto/videoproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Video protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest deleted file mode 100644 index cd64720..0000000 --- a/x11-proto/xcb-proto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xcb-proto-9999.ebuild 451 RMD160 7447c3a57cead3ce77bb0d371cc7b8ed1df9874d SHA1 616160a66a1e32ed6e828ee306e17dd229948eab SHA256 24631d3764c93f5cea3f072e5d52d00d6a689e0fdf3a71be3219c88fcaeed6fd diff --git a/x11-proto/xcb-proto/xcb-proto-9999.ebuild b/x11-proto/xcb-proto/xcb-proto-9999.ebuild deleted file mode 100644 index 7063e9d..0000000 --- a/x11-proto/xcb-proto/xcb-proto-9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto" -DESCRIPTION="X C-language Bindings protocol headers" -HOMEPAGE="http://xcb.freedesktop.org/" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-libs/libxml2 - >=dev-lang/python-2.5" diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest deleted file mode 100644 index 8fc1cde..0000000 --- a/x11-proto/xcmiscproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xcmiscproto-9999.ebuild 302 RMD160 5f08f0dd8debde4563dbcd6a7f8c0c41656936c7 SHA1 a6b3251aaf3c9c89655710f9b69d54aa3c25bbd1 SHA256 e98dd21be931bc95fcb836a5a9ddd54fcafe861981cd1571d37f0ee7b4077d74 diff --git a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild b/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild deleted file mode 100644 index 315cf2c..0000000 --- a/x11-proto/xcmiscproto/xcmiscproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XCMisc protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest deleted file mode 100644 index 79342cc..0000000 --- a/x11-proto/xextproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xextproto-9999.ebuild 300 RMD160 cfb5ca96880d34b529c19068309f7d08a9808d95 SHA1 0f22a7af9d96dd5cb550df1f6884f7f5e2cc41a0 SHA256 7cc1af790b9e0bc4833079d40472fd2b94d03903d58502fff1766ff9ba481a7f diff --git a/x11-proto/xextproto/xextproto-9999.ebuild b/x11-proto/xextproto/xextproto-9999.ebuild deleted file mode 100644 index a3680f3..0000000 --- a/x11-proto/xextproto/xextproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XExt protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest deleted file mode 100644 index 9f4255f..0000000 --- a/x11-proto/xf86bigfontproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86bigfontproto-9999.ebuild 307 RMD160 c608fdd727d36c480f793de4671171e457748b82 SHA1 675ee0cb7124341cacc414c689cded777889ab0a SHA256 a2b48bf5c932f997bcec0eca1d4c82edd343a6a2c44081f91991009436865992 diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild deleted file mode 100644 index 78fe360..0000000 --- a/x11-proto/xf86bigfontproto/xf86bigfontproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86BigFont protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest deleted file mode 100644 index 3e59109..0000000 --- a/x11-proto/xf86dgaproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86dgaproto-9999.ebuild 303 RMD160 00ea66f1e4ae78f49bca41acb1d71b01e8ef3658 SHA1 348ce99892fc85d32961dec2b65c9ff64701eadf SHA256 de52708f2b2b098eda39157845489513b67344da05661d5bdd36026415b4335e diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild deleted file mode 100644 index b9f7a1e..0000000 --- a/x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86DGA protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest deleted file mode 100644 index 7c72d74..0000000 --- a/x11-proto/xf86driproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86driproto-9999.ebuild 303 RMD160 5dbf214b6a7134ea3d6a168f1eb61eed0e4a3a05 SHA1 06c38f798681aa5eb4befe005d835a39c392fba0 SHA256 f703260a51978dd561735eb6c78cdaab9d5917f1ce480a110158d107880ac8f3 diff --git a/x11-proto/xf86driproto/xf86driproto-9999.ebuild b/x11-proto/xf86driproto/xf86driproto-9999.ebuild deleted file mode 100644 index d00c13c..0000000 --- a/x11-proto/xf86driproto/xf86driproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86DRI protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest deleted file mode 100644 index 913f9e3..0000000 --- a/x11-proto/xf86miscproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86miscproto-9999.ebuild 304 RMD160 de176aa2a5f87a6d6e786335e060eb6226fa4d12 SHA1 23ac4389100ad7db40eecf0589e3ccabedf21a60 SHA256 b8a3e4f42b57191d8903d154c5fe00cf42ce80d6fe4c44e1aba0eec97fc18b17 diff --git a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild b/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild deleted file mode 100644 index 8a5ab87..0000000 --- a/x11-proto/xf86miscproto/xf86miscproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86Misc protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86rushproto/Manifest b/x11-proto/xf86rushproto/Manifest deleted file mode 100644 index 43a2354..0000000 --- a/x11-proto/xf86rushproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86rushproto-9999.ebuild 304 RMD160 38c56ea90545cffbb1a8a10bf0b061b887ae8a71 SHA1 305e21fcadf1feeefc40434f8799b55622e26c92 SHA256 84491efe9d8584268c5ca274374e20dcb03de3fd04976885114f2f8db0095019 diff --git a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild b/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild deleted file mode 100644 index 7de4e59..0000000 --- a/x11-proto/xf86rushproto/xf86rushproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86Rush protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest deleted file mode 100644 index f036764..0000000 --- a/x11-proto/xf86vidmodeproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xf86vidmodeproto-9999.ebuild 307 RMD160 07fe23eb40c82b73ef6d4fabf16362cba821a6a6 SHA1 7f8f556de274b41cd346a58fef29e3b393a15ab6 SHA256 9dce3828b7dfefd0b9c38bd1694786a43e6dd35b2241aa5ece6afaf48cb8eb3a diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild deleted file mode 100644 index a073962..0000000 --- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org XF86VidMode protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest deleted file mode 100644 index e98e2e0..0000000 --- a/x11-proto/xineramaproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xineramaproto-9999.ebuild 304 RMD160 99942bd2eb682df25dde4024032bd047b10b6c37 SHA1 ffea328d7be2281f50a952b60300926b6e9b1812 SHA256 5c3892640a1f5a824ab98befc38e9366cd20e7d9b42fdb8e9ccd12e7c62c7f82 diff --git a/x11-proto/xineramaproto/xineramaproto-9999.ebuild b/x11-proto/xineramaproto/xineramaproto-9999.ebuild deleted file mode 100644 index baadbd9..0000000 --- a/x11-proto/xineramaproto/xineramaproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org Xinerama protocol headers" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest deleted file mode 100644 index aa06841..0000000 --- a/x11-proto/xproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xproto-9999.ebuild 371 RMD160 7190f6a42906e9c977c5d1cf333980f0839754f8 SHA1 c78645648e3238664cf3dcaf764b9f1aba6ad33b SHA256 c574921d798193f7c2d42749b181d81f8278f0380ffc1df6006386111ac2274f diff --git a/x11-proto/xproto/xproto-9999.ebuild b/x11-proto/xproto/xproto-9999.ebuild deleted file mode 100644 index f5ee4e7..0000000 --- a/x11-proto/xproto/xproto-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org xproto protocol headers" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/x11proto" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-proto/xproxymanagementprotocol/Manifest b/x11-proto/xproxymanagementprotocol/Manifest deleted file mode 100644 index 5401225..0000000 --- a/x11-proto/xproxymanagementprotocol/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD xproxymanagementprotocol-9999.ebuild 366 RMD160 ebe66fdf3b7a8968ea61e94ba66d0345207decac SHA1 a4ca08828abbbbce2719e0abb31a858fe1e3f6ce SHA256 4d27a2add04c2b191802f4201c59a919797b91bbe3de6183cbcd42ae5381a96e diff --git a/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-9999.ebuild b/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-9999.ebuild deleted file mode 100644 index 987484a..0000000 --- a/x11-proto/xproxymanagementprotocol/xproxymanagementprotocol-9999.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit x-modular - -DESCRIPTION="X.Org PM protocol headers" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/proto/pmproto" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest deleted file mode 100644 index 7cde45d..0000000 --- a/x11-wm/compiz/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -EBUILD compiz-9999.ebuild 1205 RMD160 004a9ea1d18e8f06ea3c9fe56fdfc4f3b4aaa7b6 SHA1 30febd85cef5912074303f6394352c8f91b33b13 SHA256 319a7ea570aa8444de2a394fd5cba50df91ef6edd1cf9a2c18c250da52b68054 -MD5 dde1004cec9b670b1141757d2367b1f3 compiz-9999.ebuild 1205 -RMD160 004a9ea1d18e8f06ea3c9fe56fdfc4f3b4aaa7b6 compiz-9999.ebuild 1205 -SHA256 319a7ea570aa8444de2a394fd5cba50df91ef6edd1cf9a2c18c250da52b68054 compiz-9999.ebuild 1205 diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild deleted file mode 100644 index 79f2e8d..0000000 --- a/x11-wm/compiz/compiz-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit autotools eutils git flag-o-matic multilib - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/app/compiz" - -DESCRIPTION="compiz composite manager" -HOMEPAGE="http://xorg.freedesktop.org" -LICENSE="X11" -SLOT="0" -KEYWORDS="-*" -IUSE="gnome kde svg" - -DEPEND="media-libs/mesa - x11-libs/startup-notification - media-libs/libpng - x11-libs/libXdamage - x11-libs/libXrandr - x11-libs/libXcomposite - >=x11-libs/libwnck-2.14 - media-libs/glew - gnome? ( - x11-libs/libwnck - gnome-base/gnome-desktop - gnome-base/control-center - ) - kde? ( >=x11-libs/qt-4.1.0 ) - svg? ( >=gnome-base/librsvg-2.14 - >=x11-libs/cairo-1 )" - -RDEPEND="!x11-plugins/compiz-plugin-opacity" - -EGIT_BOOTSTRAP="eautoreconf" - -src_compile() { - use amd64 && replace-flags -O[1-9] -O0 - - # Some weird stuff from the ./autogen.sh - ln -s ../po config/po - intltoolize --force --copy --automake - rm config/po - - econf \ - `use_enable gnome` \ - `use_enable kde` \ - `use_enable svg librsvg` \ - || die "configure failed" - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" -} |