]> git.draconx.ca Git - gentoo-draconx.git/commitdiff
xorg-server: Version bump to 1.8.1 + DontLie.
authorNick Bowler <nbowler@draconx.ca>
Sun, 16 May 2010 17:12:29 +0000 (13:12 -0400)
committerNick Bowler <nbowler@draconx.ca>
Sun, 16 May 2010 17:12:29 +0000 (13:12 -0400)
x11-base/xorg-server/Manifest
x11-base/xorg-server/xorg-server-1.8.1.ebuild [new file with mode: 0644]

index e28187fc3c24f37b3f66b544f592a694dfa16f3e..abeb2b2ca39491e4fea1425b873046d382cac23e 100644 (file)
@@ -9,5 +9,7 @@ AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 d3ce725e
 AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
+DIST xorg-server-1.8.1.tar.bz2 5200978 RMD160 27bd6d1e565e241412f1fb8e18b5b9b194b94356 SHA1 cba0d3b3d28696609a1f9b110d4d129cd066e133 SHA256 bddb974d8f21107ab8f79abf92cebb06ec13243f1ffd1ef56b48452c4994659d
 EBUILD xorg-server-1.7.6.ebuild 7139 RMD160 87d35013f3a3c5461ce558426e430e7225369f8a SHA1 5b5a5a60b1135166691b4cea40d02d2b7b58a0e5 SHA256 8f68f9b269d6053b28260e65c6779b07ec1d1faf332dbd27a07f3cc80fe452fa
 EBUILD xorg-server-1.8.0.ebuild 8221 RMD160 6aa53ec1042a8c12b9aa06c1aee767a50e1c2445 SHA1 d1e770f5108c161fb5d20207c612c568c32cfdc8 SHA256 5e21d8ab052b17774c40b67fb20981847a289ddbad39b8753501d21b50a6d450
+EBUILD xorg-server-1.8.1.ebuild 8038 RMD160 3b253838cd8f3bf455c8baab504b63ec8a1c2136 SHA1 987b78cca326fadac53f8336ed5de06c114414c4 SHA256 9f8b8fc1004d97642e78b77accb0c8197f3b156bea3ddec593a11ef150db570c
diff --git a/x11-base/xorg-server/xorg-server-1.8.1.ebuild b/x11-base/xorg-server/xorg-server-1.8.1.ebuild
new file mode 100644 (file)
index 0000000..674bfba
--- /dev/null
@@ -0,0 +1,287 @@
+# Copyright 1999-2010 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.8.1.ebuild,v 1.1 2010/05/15 20:59:56 remi Exp $
+
+EAPI=3
+XORG_EAUTORECONF="yes"
+inherit xorg-2 multilib versionator
+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_SERVERS="dmx kdrive xorg"
+IUSE="${IUSE_SERVERS} doc hal ipv6 minimal nptl tslib +udev"
+RDEPEND=">=app-admin/eselect-opengl-1.0.8
+       dev-libs/openssl
+       media-libs/freetype
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libpciaccess-0.10.3
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont-1.3.3
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/pixman-0.15.20
+       >=x11-libs/xtrans-1.2.2
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-1.4
+       dmx? (
+               x11-libs/libXt
+               >=x11-libs/libdmx-1.0.99.1
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXaw-1.0.4
+               >=x11-libs/libXext-1.0.5
+               >=x11-libs/libXfixes-4.0.3
+               >=x11-libs/libXi-1.2.99.1
+               >=x11-libs/libXmu-1.0.3
+               >=x11-libs/libXres-1.0.3
+               >=x11-libs/libXtst-1.0.3
+       )
+       !udev? ( hal? ( sys-apps/hal ) )
+       kdrive? (
+               >=x11-libs/libXext-1.0.5
+       )
+       !minimal? (
+               >=x11-libs/libX11-1.1.5
+               >=x11-libs/libXext-1.0.5
+               >=media-libs/mesa-7.8_rc[nptl=]
+       )
+       tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
+       udev? ( sys-fs/udev[extras] )"
+
+DEPEND="${RDEPEND}
+       !!net-dialup/dtrace
+       !<x11-apps/xinit-1.2.1-r1
+       sys-devel/flex
+       >=x11-proto/bigreqsproto-1.1.0
+       >=x11-proto/compositeproto-0.4
+       >=x11-proto/damageproto-1.1
+       >=x11-proto/fixesproto-4.1
+       >=x11-proto/fontsproto-2.0.2
+       >=x11-proto/glproto-1.4.11
+       >=x11-proto/inputproto-1.9.99.902
+       >=x11-proto/kbproto-1.0.3
+       >=x11-proto/randrproto-1.2.99.3
+       >=x11-proto/recordproto-1.13.99.1
+       >=x11-proto/renderproto-0.11
+       >=x11-proto/resourceproto-1.0.2
+       >=x11-proto/scrnsaverproto-1.1
+       >=x11-proto/trapproto-3.4.3
+       >=x11-proto/videoproto-2.2.2
+       >=x11-proto/xcmiscproto-1.2.0
+       >=x11-proto/xextproto-7.0.99.3
+       >=x11-proto/xf86dgaproto-2.0.99.1
+       >=x11-proto/xf86rushproto-1.1.2
+       >=x11-proto/xf86vidmodeproto-2.2.99.1
+       >=x11-proto/xineramaproto-1.1.3
+       >=x11-proto/xproto-7.0.13
+       dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+       doc? ( app-doc/doxygen )
+       !minimal? (
+               >=x11-proto/xf86driproto-2.1.0
+               >=x11-proto/dri2proto-2.1
+               >=x11-libs/libdrm-2.3.0
+       )"
+
+PDEPEND="
+       >=x11-apps/xinit-1.2.1-r1
+       xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+EPATCH_FORCE="yes"
+EPATCH_SUFFIX="patch"
+
+# These have been sent upstream
+#UPSTREAMED_PATCHES=(
+#      "${WORKDIR}/patches/"
+#      )
+
+PATCHES=(
+       "${UPSTREAMED_PATCHES[@]}"
+       "${FILESDIR}"/${PN}-disable-acpi.patch
+       "${FILESDIR}/0001-xfree86-Add-DontLie-server-flag.patch"
+       )
+
+pkg_setup() {
+       local myconf
+
+       xorg-2_pkg_setup
+
+       use minimal || ensure_a_server_is_building
+
+       # HAL shebang
+       if use hal; then
+               ewarn "Usage of hal is strongly discouraged. Please migrate to udev."
+               ewarn "From next major release on the hal support will be fully disabled."
+       fi
+       if use hal && use udev; then
+               ewarn "Both hal and udev flags are enabled."
+               ewarn "Enabling only udev!"
+               myconf="
+                       $(use_enable udev config-udev)
+                       --disable-config-hal
+               "
+       else
+               myconf="
+                       $(use_enable hal config-hal)
+                       $(use_enable udev config-udev)
+               "
+       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_with doc doxygen)
+               ${myconf}
+               --sysconfdir=/etc/X11
+               --localstatedir=/var
+               --enable-install-setuid
+               --with-fontrootdir=/usr/share/fonts
+               --with-xkb-output=/var/lib/xkb
+               --without-dtrace
+               --with-os-vendor=Gentoo
+               ${conf_opts}"
+
+       # Due to the limitations of CONFIGURE_OPTIONS, we have to export this.
+       mkdir -p "${T}/mesa-symlinks/GL"
+       pushd "${T}/mesa-symlinks/GL" &> /dev/null
+       for i in gl glx glxmd glxproto glxtokens; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" $i.h
+       done
+       for i in  glext glxext; do
+               ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" $i.h
+       done
+       popd &> /dev/null
+       export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS} }-I${T}/mesa-symlinks"
+
+       # (#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
+
+       # Incompatible with GCC 3.x CPP, bug #314615
+       if [[ $(gcc-major-version) -lt 4 ]]; then
+               ewarn "GCC 3.x C preprocessor may cause build failures. Use GCC 4.x"
+               ewarn "or set CPP=cpp-4.3.4 (replace with the actual installed version)"
+       fi
+
+       # detect if we should inform user about ebuild breakage
+       if ! has_version "x11-base/xorg-server" ||
+                       has_version "<x11-base/xorg-server-$(get_version_component_range 1-2)"; then
+               INFO="yes"
+       fi
+}
+
+src_install() {
+       xorg-2_src_install
+
+       dynamic_libgl_install
+
+       server_based_install
+
+       if ! use minimal &&     use xorg; then
+               # Install xorg.conf.example (see bugs #151421 and #151670)
+               insinto /etc/X11
+               doins hw/xfree86/xorg.conf.example \
+                       || die "couldn't install xorg.conf.example"
+       fi
+
+       # install the xdm.init
+       cp "${FILESDIR}"/xdm.initd "${T}"
+       if use hal && ! use udev; then
+               sed -i \
+                       -e "s/@HALD_DEPEND@/need hald/g" \
+                       "${T}"/xdm.initd \
+                       || die "sed failed"
+       else
+               sed -i \
+                       -e "/@HALD_DEPEND@/ d" \
+                       "${T}"/xdm.initd \
+                       || die "sed failed"
+       fi
+       newinitd "${T}"/xdm.initd xdm || die "initd file install failed"
+       newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup || die
+       newconfd "${FILESDIR}"/xdm.confd-3 xdm || die
+}
+
+pkg_postinst() {
+       if [[ ${INFO} = yes ]]; then
+               einfo "You should consider reading upgrade guide for this release:"
+               einfo " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
+               echo
+               ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
+               ewarn "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/"
+       fi
+}
+
+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
+}
+
+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."
+}