summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-05os: move <arpa/inet.h> for any !win32 systemhurd-fixesPino Toscano1-4/+4
It is needed in IPv6 configurations (for inet_pton) also when SIOCGIFCONF is not defined. Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-10-05xfree86/hurd: include <hurd.h>Pino Toscano3-0/+3
Needed for using get_privileged_port. Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-10-04Bump version to 1.14.99.2Keith Packard1-3/+3
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit declsKeith Packard1-16/+0
These were duplicated when GLX support was re-added on two different branches. Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04xfree86: add a comment as to why the logdir is createdGaetan Nadon1-0/+1
Without the logdir, the xserver will write the content of the log file on the terminal stating that it cannot be written and will stop. Refer to https://bugs.freedesktop.org/show_bug.cgi?id=3889 Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04xfree86: Use $(MKDIR_P) for better code portabilityGaetan Nadon1-2/+1
Still true that we should not use the lower case $(mkdir_p) version. However, remove the 2005 comment as the MKDIR_P is widely used now. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Uninstall X link and CYGWIN libXorg.exe.a in local install targetsGaetan Nadon1-0/+8
It is our duty to uninstall any files and/or directories that we installed through install-data-local and install-exec-hook. Currently the X symbolic link to Xorg remains on disk after running make uninstall. Note the exception for logdir which is usually shared by other modules. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Xorg binary: use install-exec-hook rather than install-exec-localGaetan Nadon1-5/+4
The former was explicitly designed to execute additional code after the binary has been installed. The latter can be executed in any order, hence it's current dependency on install-binPROGRAMS as a workaround. The CYGWIN libXorg.exe.a target is an installation target rather than a post-installation one, so it should not be done as a hook. It does not depend on the Xorg executable being installed. Automake: "These hooks are run after all other install rules of the appropriate type, exec or data, have completed. So, for instance, it is possible to perform post-installation modifications using an install hook". "With the -local targets, there is no particular guarantee of execution order; typically, they are run early, but with parallel make, there is no way to be sure of that". Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Use $(LN_S) provided by AC_PROG_LN_S macro to create linksGaetan Nadon1-1/+1
For better code portability. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04The Xorg binary is missing the extension $(EXEEXT) in the makefileGaetan Nadon1-1/+1
This is not a problem on UNIX platforms, but on CYGWIN it creates a broken link to Xorg rather than a link to Xorg.exe. From the CYGWIN log on tinderbox, we can see that the executable Xorg.exe is installed correctly. We can see the command used to create the link: (cd /jhbuild/install/[...]/install/bin && rm -f X && ln -s Xorg X) Note that the "relink" makefile target correctly appends $(EXEEXT) to Xorg. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Merge remote-tracking branch 'anholt/ephyr-fixes'Keith Packard21-4162/+1685
2013-10-04miext/shadow: missing c2p_core.h breaks "make distcheck" target.Gaetan Nadon1-0/+1
Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Merge remote-tracking branch 'whot/for-keith'Keith Packard3-2/+7
2013-10-04Merge remote-tracking branch 'ajax/xserver-next'Keith Packard76-1159/+417
2013-09-25test: add new os executable to .gitignoreGaetan Nadon1-0/+1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-09-25xserver: enable InputClass option "GrabDevice" by default for non-seat0 ↵Laércio de Sousa1-0/+4
seats (#69478) This patch contributes to fill the remaining gaps which make systemd-multi-seat-x wrapper still necessary in some multiseat setups. This also replaces previous evdev patch that does the same thing for that particular driver. When option "-seat" is passed with an argument different from "seat0", option "GrabDevice" for input devices is enabled by default (no need of enabling it in xorg.conf's "InputClass" section). Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478 Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-09-25dmx: provide enough space for axis mappingsPeter Hutterer1-2/+2
relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit set in the ABS_* range is axis 2, and so on. This requires us to actually have enough space to have all the ABS_*/REL_* range. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-09-20damage: Must translate initial window damage by window offsetKeith Packard1-0/+2
Damage is reported relative to the drawable origin, but the window borderClip is absolute. Translate the region by the window position before reporting damage to adjust. Reported-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-09-16XQuartz: pbproxy: Fix build with -DDEBUGJeremy Huddleston Sequoia1-2/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-09-16XQuartz: Fix build with moved pseudoramiXJeremy Huddleston Sequoia2-0/+2
Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2013-09-11glx: Fill in some missing attributes from DoGetFBConfigsAdam Jackson1-2/+12
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Remove a dead commentAdam Jackson1-4/+0
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Catch another failure case in drawable creationAdam Jackson1-0/+4
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Remove screen number from __GLXconfigAdam Jackson1-2/+0
Not used. There's no real reason to match against this instead of matching against fbconfig or visual ID anyway. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Remove pixmapMode from __GLXconfigAdam Jackson4-7/+0
This has never been filled in with anything meaningful afaict, and you can't get to it from the client in any event. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Remove support for NV_vertex_program and NV_fragment_programAdam Jackson1-4/+0
Mesa doesn't implement these anymore, never really did outside of swrast anyway. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: realloc style fix in RenderLargeAdam Jackson1-9/+6
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Eliminate a small malloc from QueryContextAdam Jackson1-15/+8
No reason to have that be a failure path. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Handle failure to create the pixmap backing the pbufferAdam Jackson1-0/+2
We happen not to sanitize the width/height we pass to CreatePixmap here, oops. It's not exploitable, but it's certainly a crash, so let's just throw BadAlloc instead. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Implement GLX_PRESERVED_CONTENTS drawable attributeAdam Jackson1-2/+10
We back pixmaps with pbuffers so they're never actually clobbered. Say so when asked. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Implement GLX_FBCONFIG_ID in GetDrawableAttributesAdam Jackson1-1/+4
Required by GLX 1.4, section 3.3.6, "Querying Attributes". Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributesAdam Jackson1-1/+7
Required by GLX 1.4, section 3.3.6, "Querying Attributes". Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Compute number of attributes in GetDrawableAttributes on the flyAdam Jackson1-9/+11
This doesn't have any effect yet, but is needed to properly build the reply for pbuffers. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Style fixesAdam Jackson1-3/+7
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Pull GLX vendor string out of __GLXscreenAdam Jackson3-5/+3
Given how we're currently implementing GLX this can't meaningfully vary per-screen. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glx: Remove unused bits from the context structAdam Jackson1-1/+0
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glxproxy: Don't track GLCLientm{aj,in}orVersionAdam Jackson3-10/+0
Basically just a port of 62f06b0d to glxproxy. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11dmx/glx: Remove unused __glXNopAdam Jackson3-40/+0
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damageext: Style fixAdam Jackson1-8/+14
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Remove "post-rendering" hooksAdam Jackson3-102/+2
This is a revert of 974db58f5b730c3770ee461665a02dd4334d1dea. There are no consumers of this API, we must not need it. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Don't rewrite Text ops to GlyphBlt opsAdam Jackson1-42/+19
There's no particularly good reason to, and it breaks Xnest. Bugzilla: http://bugs.freedesktop.org/2454 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Simplify DamageUnregisterAdam Jackson6-13/+9
You can only register one drawable on a given damage, so there's no reason to require the caller to specify the drawable, the damage is enough. The implementation would do something fairly horrible if you _did_ pass mismatched drawable and damage, so let's avoid the problem entirely. v2: Simplify xf86RotateDestroy even more [anholt] Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Implicitly unregister on destroyAdam Jackson7-10/+3
There's no reason not to, and it simplifies quite a few callers. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10fb: Remove unused compatibility wrappersAdam Jackson2-61/+0
Originally added in early 2009, not being used elsewhere anymore. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Remove deprecated miPointerCurrentScreenAdam Jackson3-19/+1
The only remaining use was in some debugging code in DMX. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10xfree86: Remove deprecated unimplemented xf86MapReadSideEffectsAdam Jackson3-17/+0
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10dix: FIXES is not optionalAdam Jackson8-40/+0
It's already not optional at configure time, this just makes it so at build time too. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10vbe: Don't try to load the ddc submoduleAdam Jackson1-15/+2
DDC is built into the server now. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10misprite: Delete some dead private storageAdam Jackson1-7/+0
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect")Adam Jackson1-2/+1
The DRI2 code is now built-in to the server, even for Xorg. The only thing this could protect against is trying to run a libglx built with DRI2 support against an Xorg built without it, which is firmly in "doctor it hurts when I do this" territory. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 23:09:41 +0000