diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 19:30:40 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-23 19:30:40 +0000 |
commit | 9250f5203092f9bc7f170e2e48a451f7c1da506d (patch) | |
tree | 2333bae4e98af5d0b5f7c1e2c4b902e3e295123c /x11-base | |
parent | rm (diff) | |
download | historical-9250f5203092f9bc7f170e2e48a451f7c1da506d.tar.gz historical-9250f5203092f9bc7f170e2e48a451f7c1da506d.tar.bz2 historical-9250f5203092f9bc7f170e2e48a451f7c1da506d.zip |
rm
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild | 261 |
3 files changed, 6 insertions, 265 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index b710cc101f1c..b793ed9dd068 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.484 2010/01/18 19:26:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.485 2010/01/23 19:30:40 scarabeus Exp $ + + 23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> + -xorg-server-1.6.3.901-r2.ebuild: + rm 18 Jan 2010; Raúl Porcel <armin76@gentoo.org> xorg-server-1.6.5-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 802bd8b78ad4..c4b88da08eab 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -4,13 +4,11 @@ AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 33 AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a DIST xorg-server-1.5.3-gentoo-patches-08.tar.bz2 60521 RMD160 5b6572450dd8379a0a932c7eb4762fbd58874ab1 SHA1 e269009caeb536e35f58e4a2ab7963eb9b5070ec SHA256 3ac1f99e5c9e21ddbcdd08ecd9687ad64dda8916282f951b74fadabb68e4badc DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb -DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50 DIST xorg-server-1.6.5-gentoo-patches-01.tar.bz2 5482 RMD160 4e415d7aeb24172035f648ae14776aad33f7a441 SHA1 81d59f957f13c30cdcecc3bca0adb58befb26c0e SHA256 10a2184a63eafba51846b96833acd4b67c0524b1338bd4ef0218686d7f8e7414 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce DIST xorg-server-1.7.4.tar.bz2 4919597 RMD160 fe65b14831bda0dd8423df2ffbb3634e0f15bce6 SHA1 26de24d7ced735bd717a21c5110d22d662221a58 SHA256 b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8 EBUILD xorg-server-1.5.3-r6.ebuild 15605 RMD160 732f7b45d94b65ecc3458e4fb3dc4eea979f35d4 SHA1 92dc0563740107701664442e9273a65399b6f604 SHA256 d6250ae0808d1819ee15c6556a67dacf5c21dee751e35dd0405792fa89745603 -EBUILD xorg-server-1.6.3.901-r2.ebuild 7070 RMD160 40962a553d576ae3ac9532fc9a720332b4888fc7 SHA1 33b960b320284ac47d977239f8592749d109edef SHA256 18cf9beffe49b82375512a96a20626fd8a53144d8e3cdeb3d4145c1d64b704c2 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 ea73fe68637ed109806a567347e5dbbecc56b793 SHA1 2765155c3e03a7b1cf6a7509c78264147ef15552 SHA256 2da2a9575319fee5f1d95e1b9cb458be4da148470f72c4bca85659f466b4f813 EBUILD xorg-server-1.7.4.ebuild 7008 RMD160 a748b6c6bee7583655035e0ea0d66e10d3f62f4d SHA1 155565e628caf1bcbc2f2a3b6a23935cd60d1554 SHA256 84f68a4c1ca07e7f3c03265bdc448b94b95aa04d5ae82f8ee90f1e685f41ffd3 -MISC ChangeLog 109787 RMD160 5615d5ea8cef29d4dce690f474838d057e6531e3 SHA1 fc8bd165734af6aa8acad9a05147123c5de0e1b9 SHA256 75055d168439a7100939f6f53a5b139911b1c0d91d88d1a9d65bfd7602641dea +MISC ChangeLog 109886 RMD160 67e468f057af768a2767c5a601d32bd9748557d3 SHA1 1158371e98caf6635b42724d1df38987a7cd6c0b SHA256 226914a70956ee4dffc975e893c8355c17e0cc550e36b560e131189b5069e9e4 MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild deleted file mode 100644 index 0547404e572b..000000000000 --- a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2009 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.6.3.901-r2.ebuild,v 1.8 2009/12/15 16:34:09 armin76 Exp $ - -EAPI="2" - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular multilib versionator - -SRC_URI="${SRC_URI}" -# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2 - -OPENGL_DIR="xorg-x11" - -DESCRIPTION="X.Org X servers" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sh sparc x86 ~x86-fbsd" - -IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - dev-libs/openssl - >=x11-libs/libXfont-1.4.0 - >=x11-libs/xtrans-1.2.3 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXext-1.0.4 - >=x11-libs/libX11-1.1.5 - >=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-1.2.1 - >=x11-libs/pixman-0.14.0 - media-libs/freetype - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-1.4 - x11-apps/xkbcomp - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - >=x11-apps/xinit-1.0.8-r3 - >=app-admin/eselect-opengl-1.0.8 - >=x11-libs/libXaw-1.0.5 - >=x11-libs/libXpm-3.5.7 - >=x11-libs/libpciaccess-0.10.3 - 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 - >=media-libs/mesa-7.3_rc1[nptl=] - ) - >=x11-libs/libxkbui-1.0.2 - kdrive? ( sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # xkbcomp is launched at startup but not checked by ./configure -DEPEND="${RDEPEND} - !net-dialup/dtrace - sys-devel/flex - >=x11-proto/randrproto-1.2.99.4 - >=x11-proto/renderproto-0.9.3 - >=x11-proto/fixesproto-4 - >=x11-proto/damageproto-1.1 - >=x11-proto/xextproto-7.0.4 - >=x11-proto/xproto-7.0.14 - >=x11-proto/xf86dgaproto-2.0.3 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.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/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.5.0 - >=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 ) - !minimal? ( - >=x11-proto/xf86driproto-2.0.4 - >=x11-proto/dri2proto-2.1 - >=x11-libs/libdrm-2.3 - )" - -PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" -LICENSE="${LICENSE} MIT" - -EPATCH_FORCE="yes" -EPATCH_SUFFIX="patch" - -# Local customizations, unsuitable for upstream -GENTOO_PATCHES=( - "${FILESDIR}/1.4-fpic-libxf86config.patch" - "${FILESDIR}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch" - ) - -# These have been sent upstream -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -# ) - -PATCHES=( - "${GENTOO_PATCHES[@]}" - "${UPSTREAMED_PATCHES[@]}" - ) - -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 tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-hal) - --sysconfdir=/etc/X11 - --localstatedir=/var - --enable-install-setuid - --with-fontdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --without-dtrace - ${conf_opts}" - - # (#121394) Causes window corruption - filter-flags -fweb - - # Incompatible with GCC 3.x SSP on x86, bug #244352 - if use x86 ; then - if [[ $(gcc-major-version) -lt 4 ]]; then - filter-flags -fstack-protector - fi - fi - - OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set ${OPENGL_DIR} -} - -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 "You must rebuild all drivers if upgrading from xorg-server 1.5" - ewarn "or earlier, because the ABI changed. If you cannot start X because" - ewarn "of module version mismatch errors, 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/lib{glx,dri,dri2}*; 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 ${OLD_IMPLEM} -} - -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." -} |