From ce2a51840197f6d9510ce4ecf32feff597c09be7 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Wed, 6 Jan 2010 13:02:49 -0500 Subject: [PATCH] Add xorg-server with DontLie support. --- x11-base/xorg-server/Manifest | 4 + ...nts-is-true-for-passive-grabs-add-th.patch | 83 ++++++ .../files/xorg-server-dont-lie.patch | 103 +++++++ .../xorg-server/xorg-server-1.7.3.902.ebuild | 265 ++++++++++++++++++ 4 files changed, 455 insertions(+) create mode 100644 x11-base/xorg-server/Manifest create mode 100644 x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch create mode 100644 x11-base/xorg-server/files/xorg-server-dont-lie.patch create mode 100644 x11-base/xorg-server/xorg-server-1.7.3.902.ebuild diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest new file mode 100644 index 0000000..7b6aac4 --- /dev/null +++ b/x11-base/xorg-server/Manifest @@ -0,0 +1,4 @@ +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 +AUX xorg-server-dont-lie.patch 3869 RMD160 6c189aed56dc3915259ff12dc42a75556d2b31bd SHA1 1fb3ed5bf29ffc8e7f278339376ab57bfad0a803 SHA256 4f537dd9526315b2d7368e6d6bc0d8c819c6bfa9ed8f57e04300197a476b035d +DIST xorg-server-1.7.3.902.tar.bz2 4920314 RMD160 81f33b7fa734d887db316e9fe617ff6cf4ef9c41 SHA1 176defecb42912ebae187c347ca2168a3139bc0b SHA256 4ccab4a1dc3290fef3b84687eebffc037c926356711bbfd05981e39c53078741 +EBUILD xorg-server-1.7.3.902.ebuild 7054 RMD160 0420cb4cdf2a7466af4882820b70a6b8f1732c54 SHA1 53cae9e6e43ebf15e736feddd5ef606cbce90fbc SHA256 77b8fe6d432277677ca43d31938a290fd81af9a61898be35aed67ce3b076153f diff --git a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch new file mode 100644 index 0000000..82f4f50 --- /dev/null +++ b/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch @@ -0,0 +1,83 @@ +From 873ef3430e92b0756c0dbe5033f6aec38a20d6ad Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 16 Dec 2009 13:43:22 +1000 +Subject: [PATCH] dix: if owner-events is true for passive grabs, add the window mask (#25400) + +A client requesting a GrabModeSync button grab, owner-events true, with only +the ButtonRelease mask set would never receive the press event even if the +grab window had the ButtonPress mask set. + +The protocol requires that if owner-events is true, then the delivery mask +is the combination of the grab mask + the window event mask. + +X.Org Bug 25400 + +Signed-off-by: Peter Hutterer +--- + dix/events.c | 36 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 36 insertions(+), 0 deletions(-) + +diff --git a/dix/events.c b/dix/events.c +index 7e0867c..12b12a8 100644 +--- a/dix/events.c ++++ b/dix/events.c +@@ -3590,6 +3590,8 @@ CheckPassiveGrabsOnWindow( + xE = &core; + count = 1; + mask = grab->eventMask; ++ if (grab->ownerEvents) ++ mask |= pWin->eventMask; + } else if (match & XI2_MATCH) + { + rc = EventToXI2((InternalEvent*)event, &xE); +@@ -3611,6 +3613,24 @@ CheckPassiveGrabsOnWindow( + mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8]; + else if (event->type == XI_Enter || event->type == XI_FocusIn) + mask = grab->xi2mask[device->id][event->type/8]; ++ ++ if (grab->ownerEvents && wOtherInputMasks(grab->window)) ++ { ++ InputClientsPtr icp = ++ wOtherInputMasks(grab->window)->inputClients; ++ ++ while(icp) ++ { ++ if (rClient(icp) == rClient(grab)) ++ { ++ int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type; ++ mask |= icp->xi2mask[device->id][evtype/8]; ++ break; ++ } ++ ++ icp = icp->next; ++ } ++ } + } else + { + rc = EventToXI((InternalEvent*)event, &xE, &count); +@@ -3622,6 +3642,22 @@ CheckPassiveGrabsOnWindow( + continue; + } + mask = grab->eventMask; ++ if (grab->ownerEvents && wOtherInputMasks(grab->window)) ++ { ++ InputClientsPtr icp = ++ wOtherInputMasks(grab->window)->inputClients; ++ ++ while(icp) ++ { ++ if (rClient(icp) == rClient(grab)) ++ { ++ mask |= icp->mask[device->id]; ++ break; ++ } ++ ++ icp = icp->next; ++ } ++ } + } + + (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE); +-- +1.6.5.2 + diff --git a/x11-base/xorg-server/files/xorg-server-dont-lie.patch b/x11-base/xorg-server/files/xorg-server-dont-lie.patch new file mode 100644 index 0000000..9af34d5 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-dont-lie.patch @@ -0,0 +1,103 @@ +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 6fbf613..88c8a56 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -703,7 +703,8 @@ typedef enum { + FLAG_AUTO_ENABLE_DEVICES, + FLAG_GLX_VISUALS, + FLAG_DRI2, +- FLAG_USE_SIGIO ++ FLAG_USE_SIGIO, ++ FLAG_DONTLIE + } FlagValues; + + /** +@@ -767,6 +768,8 @@ static OptionInfoRec FlagOptions[] = { + {0}, FALSE }, + { FLAG_USE_SIGIO, "UseSIGIO", OPTV_BOOLEAN, + {0}, FALSE }, ++ { FLAG_DONTLIE, "DontLie", OPTV_BOOLEAN, ++ {0}, FALSE }, + { -1, NULL, OPTV_NONE, + {0}, FALSE }, + }; +@@ -824,6 +827,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) + xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch); + xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap); + xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom); ++ xf86GetOptValBool(FlagOptions, FLAG_DONTLIE, &xf86Info.dontLie); + + xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI); + if (xf86Info.ignoreABI) { +diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c +index 98f8284..c7d03a4 100644 +--- a/hw/xfree86/common/xf86Globals.c ++++ b/hw/xfree86/common/xf86Globals.c +@@ -110,6 +110,7 @@ xf86InfoRec xf86Info = { + .dontVTSwitch = FALSE, + .dontZap = FALSE, + .dontZoom = FALSE, ++ .dontLie = FALSE, + .notrapSignals = FALSE, + .caughtSignal = FALSE, + .currentScreen = NULL, +diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h +index b2095aa..05166f9 100644 +--- a/hw/xfree86/common/xf86Privstr.h ++++ b/hw/xfree86/common/xf86Privstr.h +@@ -68,6 +68,8 @@ typedef struct { + Bool dontVTSwitch; + Bool dontZap; + Bool dontZoom; ++ Bool dontLie; ++ + Bool notrapSignals; /* don't exit cleanly - die at fault */ + Bool caughtSignal; + +diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre +index 942c397..dd1269c 100644 +--- a/hw/xfree86/doc/man/xorg.conf.man.pre ++++ b/hw/xfree86/doc/man/xorg.conf.man.pre +@@ -490,6 +490,12 @@ When this option is enabled, those key sequences have no special meaning + and are passed to clients. + Default: off. + .TP 7 ++.BI "Option \*qDontLie\*q \*q" boolean \*q ++This option suggests that the server should avoid lying whenever possible. ++Currently this means that RandR 1.2 drivers will try to compute the proper DPI ++instead of making it up. ++Default: off. ++.TP 7 + .BI "Option \*qDisableVidModeExtension\*q \*q" boolean \*q + This disables the parts of the VidMode extension used by the xvidtune client + that can be used to change the video modes. +diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c +index 1fc63c4..5d8bc29 100644 +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) + else + { + xf86OutputPtr output = config->output[config->compat_output]; ++ xf86CrtcPtr crtc = output->crtc; + + if (output->conf_monitor && + (output->conf_monitor->mon_width > 0 && +@@ -817,6 +818,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) + mmWidth = output->conf_monitor->mon_width; + mmHeight = output->conf_monitor->mon_height; + } ++ else if (xf86Info.dontLie && crtc && crtc->mode.HDisplay && ++ output->mm_width && output->mm_height) ++ { ++ /* ++ * If the output has a mode and a declared size, use that ++ * to scale the screen size ++ */ ++ DisplayModePtr mode = &crtc->mode; ++ mmWidth = output->mm_width * width / mode->HDisplay; ++ mmHeight = output->mm_height * height / mode->VDisplay; ++ } + else + { + /* diff --git a/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild b/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild new file mode 100644 index 0000000..31f689e --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.7.3.902.ebuild @@ -0,0 +1,265 @@ +# 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.7.3.902.ebuild,v 1.1 2009/12/27 23:42:03 scarabeus Exp $ + +EAPI="2" + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular 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} 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.3.3 + >=x11-libs/xtrans-1.2.2 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libpciaccess-0.10.3 + >=x11-libs/pixman-0.15.20 + 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 + 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/libXtst-1.0.3 + ) + !minimal? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=x11-libs/libXres-1.0.3 + >=media-libs/mesa-7.4[nptl=] + ) + >=x11-libs/libxkbui-1.0.2 + kdrive? ( + >=x11-libs/libXext-1.0.5 + 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 + +## Deps that don't have a version in configure.ac but do here: +# x11-proto/resourceproto +# x11-proto/fontsproto +# x11-libs/libXau +# x11-libs/libXfont +# x11-libs/libXdmcp +# x11-libs/libXext +# x11-libs/libX11 +# x11-libs/libXrender +# x11-libs/libXmu +# x11-libs/libXfixes +# x11-libs/libXtst +# x11-proto/xineramaproto +# x11-proto/dmxproto +## Deps that are larger here than in configure.ac +# x11-libs/libpciaccess-0.8.0 +# + +DEPEND="${RDEPEND} + !!net-dialup/dtrace + sys-devel/flex + >=x11-proto/randrproto-1.2.99.3 + >=x11-proto/renderproto-0.11 + >=x11-proto/fixesproto-4.1 + >=x11-proto/damageproto-1.1 + >=x11-proto/xextproto-7.0.99.3 + >=x11-proto/xproto-7.0.13 + >=x11-proto/xf86dgaproto-2.0.99.1 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.99.1 + >=x11-proto/compositeproto-0.4 + >=x11-proto/recordproto-1.13.99.1 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/scrnsaverproto-1.1 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/xineramaproto-1.1.3 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/inputproto-1.9.99.902 + >=x11-proto/bigreqsproto-1.1.0 + >=x11-proto/xcmiscproto-1.2.0 + >=x11-proto/glproto-1.4.9 + dmx? ( >=x11-proto/dmxproto-2.2.99.1 ) + !minimal? ( + >=x11-proto/xf86driproto-2.1.0 + >=x11-proto/dri2proto-2.1 + >=x11-libs/libdrm-2.3.0 + )" + +PDEPEND="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/" + + # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=25400 + "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch" + ) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}/xorg-server-dont-lie.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 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 + + 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 +} + +pkg_postinst() { + switch_opengl_implem + + echo + ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" + 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." +} -- 2.43.2