Commit Graph

387 Commits

Author SHA1 Message Date
okan
27f67406f3 Remove support vax and XENOCARA_HAVE_SHARED_LIBS scaffolding.
ok matthieu@
2016-03-11 13:09:42 +00:00
matthieu
ab587bced4 Cleanup gcc warnings and function prototypes. 2016-03-06 17:11:46 +00:00
matthieu
926017f7f5 Fix typo introduced 5.5 years ago.
Note: this changes the #if test result, but the now #ifdef out code
has no effect.
2016-03-06 16:09:27 +00:00
matthieu
4a17b80391 No more aviion 2016-02-20 10:58:10 +00:00
jsg
f158428621 solbourne was removed 2016-02-07 09:51:01 +00:00
bentley
ca4d05124d Detect keyboard configuration by masking bits, not equality checks.
Fixes the case where a kbd(8) setting has multiple bits set
(e.g., us.dvorak.swapctrlcaps). Bug reported by Sevan Janiyan.

ok shadchin@ matthieu@
2015-12-29 18:47:21 +00:00
kettenis
ed4591c1ef On Broadwell, default to using the modesetting driver. Our KMS support on
Broadwell is still a bit weak and the modesetting driver seems to work
better than the intel driver, while still providing 3D acceleration and
video playback support.

ok phessler@, matthieu@, jsg@
2015-12-21 08:37:11 +00:00
kettenis
c7a6143bc4 Enable glamor on architectures where we have OpenGL.
ok jsg@, matthieu@
2015-12-01 21:20:21 +00:00
kettenis
2e2a8984c6 Remove a check for DRI3 in glamor_name_from_pixmap(). This makes DRI2 work
on OpenBSD where we don't have support for DRI3 yet.

ok jsg@, matthieu@
2015-12-01 21:18:47 +00:00
kettenis
bfcc545caa Use an ARGB8888 based texture even when DRI3 isn't enabled. This achieves the
same effect as a change that was recently made upstream.  The code changed
significantly in the meantime.

ok jsg@, matthieu@
2015-12-01 21:17:49 +00:00
kettenis
e6977614b0 Call miSyncSetup() if we don't call miSyncShmScreenInit() because
HAVE_XSHMFENCE isn't defined.  This makes sure the relevant "private key"
gets installed such that we don't hit a fatal assert later.

ok jsg@, matthieu@
2015-12-01 21:13:48 +00:00
aoyama
184a98336b Pass --disable-libdrm option to configure when the machine does not
support DRI.  Found while building Xorg server on luna88k.

"fine for now" matthieu@
2015-11-17 10:49:57 +00:00
matthieu
1e036e407b Remove the -configure option. This has been broken for a loong time
and no one is going to fix it.
2015-11-15 08:28:24 +00:00
matthieu
f7d98a310c pledge(2) for the X server privileged process. ok deraadt@ 2015-11-11 21:07:49 +00:00
matthieu
4c6a4e1e00 Update to xserver 1.17.4.
tested by naddy@
2015-11-07 16:48:51 +00:00
matthieu
f00e3078a0 Reduce white space diff with upstreams. No other change. 2015-10-25 15:24:06 +00:00
matthieu
e957e25538 Post xserver 1.17 cleanup 2015-09-28 07:14:00 +00:00
matthieu
5f3337aec0 Post-xserver 1.17 cleanup. 2015-09-28 06:20:25 +00:00
matthieu
1867e4b0c7 Post xserver 1.17 cleanup. Remove now unused functions. 2015-09-28 06:00:47 +00:00
matthieu
11ed0dd96c Update for xserver 1.17 2015-09-28 05:59:26 +00:00
matthieu
7c1233b0b2 Patch for xserver 1.17. Missed in upgrade commit. 2015-09-28 05:53:20 +00:00
matthieu
86ea9f12e2 Update to xserver 1.17.2. tested by dcoppa@, jsg@, jasper@ & naddy@ 2015-09-16 19:10:19 +00:00
schwarze
0a779e4299 Remove abuse of \/ which is not a slash but an italic correction;
ok matthieu@, who will also push these fixes upstream (thanks).
2015-08-30 13:32:02 +00:00
matthieu
4d7af2a47c With the binutils got slot accounting fix, workaround it no longer needed
ok miod@
2015-08-29 17:49:14 +00:00
miod
67eafd3844 Build the Xserver with large got (-xgot as(1) option) on mips; needed to
accomodate the growth of recent changes. Tested on loongson.
2015-06-27 21:50:55 +00:00
matthieu
3e477e765c Merge from upstream: Don't listen to 'tcp' by default. Add '-listen' option.
commit cc59be38b7eff52a1d003b390f2994c73ee0b3e9
Author: Keith Packard <keithp@keithp.com>
Date:   Fri Sep 12 11:33:48 2014 -0700

    os: Don't listen to 'tcp' by default. Add '-listen' option. [v2]

    This disables the tcp listen socket by default. Then, it
    uses a new xtrans interface, TRANS(Listen), to provide a command line
    option to re-enable those if desired.

    v2: Leave unix socket enabled by default. Add configure options.

    Signed-off-by: Keith Packard <keithp@keithp.com>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2015-06-20 10:03:56 +00:00
matthieu
a8994d949f Obsolete XAA includes should be gone now. 2015-05-31 13:23:03 +00:00
matthieu
031b04adf7 Simplify arm_video.c; we will never have PCI graphics on this architecture.
This also makes it possible to run wsudl(4) on armv7 machines with echi(4).
Tested for non-regression on zaurus by Sigi Rudzio. Thanks.
2015-05-27 15:11:12 +00:00
matthieu
2b01672b3b Bury kdriver/wscons code in the Attic.
It has never worked and there is no plan to finish it.
2015-04-18 10:22:11 +00:00
matthieu
5b19f6d757 Update to xserver 1.16.4.
Contains fix for CVE-2015-0255. ok dcoppa@
2015-02-11 20:58:46 +00:00
kettenis
389048d736 Enable file descriptor passing code.
ok deraadt@, matthieu@
2015-02-09 09:55:52 +00:00
kettenis
a77282edc7 Use __MAP_NOFAULT to map shared memory passed through file descriptors. This
completely avoids the risk of getting killed by a signal because the backing
storage isn't there.

Use the __-prefixed name for now, as we might still change the name.

ok deraadt@, matthieu@
2015-02-09 09:45:32 +00:00
jsg
56b31a08cf Recognise the synaptics with sw buttons mouse type and set the
clickpad and has_secondary_buttons properties.

Initial diff from myself with additional changes from matthieu@
2015-01-15 01:30:40 +00:00
matthieu
7db4642f69 Update to xorg-server 1.16.3.
Most of the 1.16.2->1.16.3 changes are the security patches that
where already there. This adds some extra fixes plus a few unrelated
bug fixes.
2014-12-21 11:41:44 +00:00
matthieu
797ed93386 Protocol handling issues in X Window System servers
One year after Ilja van Sprundel, discovered and reported a large number
of issues in the way the X server code base handles requests from X clients,
they have been fixed.
2014-12-09 17:58:52 +00:00
matthieu
1cfce7c208 Update to xserver 1.16.2 2014-11-22 08:33:45 +00:00
matthieu
a20b025ef2 regen 2014-10-20 06:14:42 +00:00
matthieu
25d68f1c21 OpenBSD's make now supports -include. So reduce diff with upstreams.
ok kettenis@ espie@
2014-10-20 06:14:23 +00:00
matthieu
d1b6c6dea7 No more /dev/agp0 2014-10-18 14:39:40 +00:00
matthieu
64609bb78a white space diff redux 2014-09-28 10:01:52 +00:00
matthieu
4f58590a42 Update to xserver 1.16.1.
Tested by naddy@, jsg@ & kettenis@
2014-09-27 17:52:59 +00:00
matthieu
cd0bdbef9f Update to xserver 1.16.1.
Tested by naddy@, jsg@ & kettenis@
2014-09-27 17:49:46 +00:00
matthieu
4f333b168a Update to xorg-server 1.15.2. bug fixes. 2014-07-11 08:13:43 +00:00
matthieu
3bbfe7b179 Update to xserver 1.15.1.
Tested by at least ajacoutot@, dcoppa@ & jasper@
2014-05-02 19:27:46 +00:00
miod
81a3c9ac95 Remove {hp300,mvme68k,mvme88k} bits. 2014-03-18 22:37:28 +00:00
kettenis
569a1f6261 Call pci_system_init(), even if opening /dev/xf86 fails. Makes it possible to
run X with machdep.allowaperture=0 on hardware supported by radeondrm(4)
on macppc too.

tested by landry@
ok matthieu@, deraadt@
2014-02-26 22:29:17 +00:00
matthieu
66cca5a103 Fix build of (disabled) wsfb kdrive backend. 2014-02-15 15:00:28 +00:00
matthieu
625fe3923b mac68k and mvmeppc are no longer supported. 2013-12-28 16:31:18 +00:00
matthieu
8742d82e5a Update to xserver 1.14.5 2013-12-28 14:40:01 +00:00
kettenis
29c59cee22 Avoid timeouts of ULONG_MAX milliseconds. Stops the X server from crashing
with "select returned EINVAL" messages.

ok matthieu@
2013-12-15 11:31:09 +00:00
matthieu
511a911dd8 Update to xserver 1.14.4 2013-12-08 10:53:01 +00:00
matthieu
639856387e Fix from upstreams for CVE-2013-4396
Use after free in Xserver handling of ImageText requests
2013-10-09 05:37:56 +00:00
matthieu
5ae225f39c Update to xserver 1.14.3 2013-09-28 15:36:30 +00:00
jsg
84922f95ab revert a local patch to check for swrastg, LLVMpipe installs as swrast now
ok mpi@ ajacoutot@
2013-09-09 14:51:24 +00:00
matthieu
577763cda7 Uodate to xserver 1.14.2. Tested by krw@, shadchin@, todd@ 2013-08-24 19:44:25 +00:00
mlarkin
ed3e701ae3 Corresponding xenocara cleanup from the amd64/i386 MTRR cleanup diff just
committed. Removes a #define that wasn't used anywhere (for completeness
and to make the range definitions match what's in the kernel now).

ok jsg@, deraadt@
2013-08-24 04:31:54 +00:00
bcallah
1e7e085482 No xorg xserver on octeon.
ok matthieu@
2013-08-17 17:06:33 +00:00
kettenis
a9e4debd4a Handle more /dev/drmN devices.
ok matthieu@, jsg@
2013-08-13 18:14:31 +00:00
matthieu
0036bbec2a Build the X server on hp300 again. from miod@. Ok deraadt@ 2013-07-29 06:10:22 +00:00
aoyama
2db9dc4ecc Re-commit luna88k_video.c. Previous file is 'doubled' by mistake. 2013-07-16 14:39:22 +00:00
aoyama
08420f85c8 Add monochrome X server support for luna88k.
Some luna88k specific quirks are needed in
driver/xf86-video-wsfb/src/wsfb_driver.c for now.

ok matthieu@
2013-07-15 13:23:17 +00:00
matthieu
adec87cf5d Update to X server 1.14.1. Tested by many during t2k13. Thanks. 2013-06-07 17:28:45 +00:00
ajacoutot
5a95941c6d Merge the following commit from upstream:
Touch: Fix duplicate TouchBegin selection with virtual devices
http://cgit.freedesktop.org/xorg/xserver/commit/?id=314776eb369ca2e438907795ae030dd743c281fc

This fixes gtk+3 applications crashing with 'BadImplementation' error.

ok matthieu@
2013-05-19 07:20:38 +00:00
todd
7cfc4a7689 backport (whitespace changes only) a fix for panning that also effected scale
to permit:
   xrandr --output LVDS1 --mode 1280x800 --panning 1380x1024 --scale 1.8x1.8
to behave properly.
based on upstream commit 1bf81af4a6be1113bcc3b940ab264d5c9e0f0c5d that is in
the 1.14 xserver that is not ready for OpenBSD yet
ok matthieu@
2013-03-21 21:26:08 +00:00
aoyama
786472fe94 Add xenocara defines/files for luna88k, no X server at this moment.
ok miod@
2013-03-16 01:24:43 +00:00
miod
80ae22700e Build the X server on hp300 again. Tested on catseye. 2013-03-14 20:49:52 +00:00
mpi
5675f61d57 Try to load the gallium3d "swrastg" driver if available before falling back
to the default mesa "swrast" one for software rendering.

ok matthieu@
2012-11-11 12:18:31 +00:00
tobiasu
5530414e6d Include declaration of sparcDriverName()
Fixes segfault on sunffb graphics. ok matthieu@
2012-11-04 17:20:33 +00:00
stsp
3827241485 Attach the synaptics(4) driver to elantech touchpads during auto-configuration.
ok matthieu@
2012-10-29 13:34:28 +00:00
matthieu
e26a212fd0 Regen autotools build system with a clean environment.
It was previously generated with a config pointing to OpenBSD's libtool
which is not ready yet.
2012-10-27 14:52:25 +00:00
matthieu
58d9658ddc regen 2012-10-14 08:59:33 +00:00
matthieu
b1c72389c3 Link Xorg with -lpthread, for the llvm-pipe drm. Requested by mpi@
Tested that it doesn't have any performance impact. ok ajacoutot@,
matthew@ (some months ago).
2012-10-14 08:58:45 +00:00
matthieu
ee040bc225 Fix bad merge that changed an fcntl() into a priv_open_device().
Should fix mouse re-open after VT-switch
2012-10-08 22:40:43 +00:00
matthieu
1c882161e8 In priv_open_device() allow opening tty[E-J]0. While there remove
ttyD[1-7] from the list, since those devices will never get used by X.
2012-08-14 15:57:57 +00:00
matthieu
1996326d50 Fix a logic introducred in rev 1.23. The parent pid is initialized
by the main X server too late in the privsep case (already in the
unpriviliged child). So keep the early init for this case.
2012-08-12 14:06:42 +00:00
matthieu
143961ca76 Un-blacklist radeon, blacklist radeonold. So X -configure will now
select the radeon driver.
2012-08-08 16:37:19 +00:00
matthieu
5f8132e311 Add privsep prototypes to osdep.h 2012-08-07 20:16:12 +00:00
matthieu
c7c0180b4c In non-privilege sepration mode, avoid accidentally sending
a SIGUSR1 signal to init(8).

It can happen that xdm dies before the X server that it started.
In that case X's is reparented by init...

This is handled correctly when privilege separation is not compiled
but got overlooked in the privilege separation case.
2012-08-07 20:15:23 +00:00
matthieu
4f2bf5df6d Rename 'socket' parameter to avoid shadowing the global declaration. 2012-08-07 20:13:18 +00:00
matthieu
20c1ecb828 Remove white space diff with X.Org. 2012-08-07 20:12:01 +00:00
matthieu
eb59960f12 regen autotools 2012-08-05 18:14:29 +00:00
matthieu
fe11647d1f Update to xserver 1.12.3. 2012-08-05 18:11:37 +00:00
matthieu
8ead23f263 Remove mac68k bits from Xenocara.
The imake config bits are not removed.
Those files are frozen, until they can be removed, once the last
port that still uses imake dies.
2012-06-20 19:56:34 +00:00
matthieu
baeff29842 screenFd -> consoleFd conversions that were missed in xserver 1.12 import. 2012-06-16 15:08:08 +00:00
matthieu
e60da74507 Update to xserver 1.12.2. tested by naddy@, krw@, mpi@. 2012-06-10 13:21:05 +00:00
matthieu
b4a75b3e96 Return an error much earlier if recvmsg fails. 2012-04-04 20:34:55 +00:00
matthieu
f0cf820ebf Disable doc formatting tools explicitely 2012-03-10 18:35:56 +00:00
matthieu
e4b13eedd8 Introduce a black list of drivers for Xorg -configure, and blacklist
all radeon driver variants, except radeonold.
This fixes the conflicting symbols warnings seen by Xorg -configure
and forces it to use radeonold in the generated xorg.conf file.

Xorg -configure is still broken in many ways, and should be
avoided.
2012-03-04 17:55:31 +00:00
matthieu
a682cc0ce7 Use the 'macintosh' xkb model on adb keyboards. From mpi@, reminded by
landry@. ok deraadt@
2012-02-11 18:30:29 +00:00
matthieu
2be03eee0e Disable build of Xserver on hp300 and mac68k. Building the Xserver
with gcc 2.95 is getting hopeless and there is not enough manpower at
the moment to switch these platforms to a more recent compiler.
ok miod@, Nick@
2012-02-07 19:46:11 +00:00
matthieu
9576ef223d Update to xserver 1.11.4. tested by krw@, shadchin@. 2012-01-31 07:52:35 +00:00
matthieu
d253c9004d Switch to the xf86-input-ws input driver for mouse by default.
ok shadchin@.
2012-01-08 17:15:52 +00:00
matthieu
05b4e5f308 Revert stuff from my local tree which leaked in xserver 1.11.3 update. 2011-12-29 10:47:37 +00:00
matthieu
4344ac3914 Bugfix Update to xserver 1.11.3 2011-12-18 16:08:59 +00:00
ajacoutot
289590f6a5 Merge patch from http://patchwork.freedesktop.org/patch/7707/,
Xi: allow passive keygrabs on the XIAll(Master)Devices fake deviceslogin.
Amongst other things, this fixes a regression that can be seen in media
keys handling under gnome-settings-daemon.

ok matthieu@
2011-11-15 00:09:30 +00:00
matthieu
fad3fc950a Bring back ChangeLog 2011-11-05 14:18:04 +00:00
matthieu
61a7d5427d Update to xserver 1.11.2 2011-11-05 13:32:40 +00:00
matthieu
a05754665a Fix CVE-2011-4028: File disclosure vulnerability.
use O_NOFOLLOW to open the existing lock file, so symbolic links
aren't followed, thus avoid revealing if it point to an existing file.

Note that xserver on OpenBSD isn't affected by CVE-2011-4029.
2011-10-18 14:58:36 +00:00
mpi
9fa376d08a Use the synaptics driver with ALPS touchpads
with and ok matthieu@
2011-09-21 17:42:03 +00:00
shadchin
4e607c59bd Cleaning of current solution for 'Kill X on Ctrl+Alt+Backspace on default'
ok matthieu@
2011-09-17 13:39:30 +00:00