Commit Graph

166 Commits

Author SHA1 Message Date
jsg
47c63d2e5f Import Mesa 9.2.5 2014-01-19 03:03:22 +00:00
jsg
c6a24178b5 Merge Mesa 9.2.3
ok mpi@ kettenis@
2013-11-24 06:19:52 +00:00
jsg
309b4c3237 Import Mesa 9.2.3 2013-11-24 05:52:36 +00:00
jsg
12557abee9 Merge Mesa 9.2.2 2013-11-09 02:46:54 +00:00
jsg
fc1e3907a6 Import Mesa 9.2.2 2013-11-09 02:25:41 +00:00
shadchin
bc888af018 Update to xkeyboard-config 2.10.1.
ok matthieu@
2013-10-26 17:49:57 +00:00
jsg
74afb4747b Merge Mesa 9.2.1 2013-10-05 09:53:49 +00:00
jsg
42e72c47e5 Import Mesa 9.2.1 2013-10-05 09:19:47 +00:00
jsg
84f07c3246 Merge Mesa 9.2.0 2013-09-05 13:58:30 +00:00
jsg
cb5c86a80d Import Mesa 9.2.0 2013-09-05 13:08:03 +00:00
naddy
ea97b1d614 use arc4random() as the preferred random number source in fontconfig
ok matthieu@
2013-09-01 19:47:52 +00:00
jsg
977241acdf don't depend on a list of archs to determine endianess,
unbreaks gallium build on sparc64.  found the hard way by florian@
ok kettenis@
2013-08-14 13:25:56 +00:00
jsg
54ad3dfaaa byteswap.h and bswap_32 aren't portable, replace them with calls to
gallium's util_bswap32 as suggested by kettenis.

already merged upstream
ok kettenis@
2013-06-17 23:21:23 +00:00
shadchin
d5ecde7a60 Sun LKey section defines two xkb groups that lead to problems if there was only
one layout is configured. Toggle this section to one group.

pointed out, tested and ok landry@, ok matthieu@
2013-06-15 16:00:39 +00:00
matthieu
ff44df0816 Fixes from upstreams for vulnerabilities reported by Ilja Van Sprundel
Integer overflow in XF86DRIOpenConnection() and
XF86DRIGetClientDriverName() [CVE-2013-1993]

Reminded by jsg@. Thanks
2013-06-10 19:21:20 +00:00
jsg
120dbb0038 correct RADEON_GEM_WAIT_IDLE use.
RADEON_GEM_WAIT_IDLE is declared DRM_IOW but mesa
uses it with drmCommandWriteRead instead of drmCommandWrite
which leads to the ioctl being unmatched and returning an
error on at least OpenBSD.

Problem originally found and fixed in libdrm by kettenis@
Dave Airlie pointed out that mesa has the same issue.

This change has already been merged in upstream mesa.

ok matthieu@ kettenis@
2013-06-09 13:57:18 +00:00
matthieu
3ff899d868 Update to libxcb 1.9.1. 2013-05-31 14:18:43 +00:00
matthieu
52f6d0ba20 Merge upstream fixes for several X libs vulnerabilities
discovered by Ilja van Sprundel.

CVE-2013-1981 X.org libX11 1.5.99.901 (1.6 RC1) integer overflows
CVE-2013-1982 X.org libXext 1.3.1 integer overflows
CVE-2013-1983 X.org libXfixes 5.0 integer overflows
CVE-2013-1984 X.org libXi 1.7.1 integer overflows
CVE-2013-1985 X.org libXinerama 1.1.2 integer overflows
CVE-2013-1986 X.org libXrandr 1.4.0 integer overflows
CVE-2013-1987 X.org libXrender 0.9.7 integer overflows
CVE-2013-1988 X.org libXRes 1.0.6 integer overflows
CVE-2013-1989 X.org libXv 1.0.7 integer overflows
CVE-2013-1990 X.org libXvMC 1.0.7 integer overflows
CVE-2013-1991 X.org libXxf86dga 1.1.3 integer overflows
CVE-2013-1992 X.org libdmx 1.1.2 integer overflows
CVE-2013-1994 X.org libchromeXvMC & libchromeXvMCPro in openChrome
0.3.2 integer overflows
CVE-2013-1995 X.org libXi 1.7.1 sign extension issues
CVE-2013-1996 X.org libFS 1.0.4 sign extension issues
CVE-2013-1997 X.org libX11 1.5.99.901 (1.6 RC1) buffer overflows
CVE-2013-1998 X.org libXi 1.7.1 buffer overflows
CVE-2013-1999 X.org libXvMC 1.0.7 buffer overflows
CVE-2013-2000 X.org libXxf86dga 1.1.3 buffer overflows
CVE-2013-2001 X.org libXxf86vm 1.1.2 buffer overflows
CVE-2013-2002 X.org libXt 1.1.3 buffer overflows
CVE-2013-2003 X.org libXcursor 1.1.13 integer overflows
CVE-2013-2004 X.org libX11 1.5.99.901 (1.6 RC1) unbounded recursion
CVE-2013-2005 X.org libXt 1.1.3 memory corruption
CVE-2013-2066 X.org libXv 1.0.7 buffer overflows
2013-05-23 22:42:07 +00:00
matthieu
59dcebd7e7 Merge from fontconfig git repository:
Fix fc-cache crash caused by looking up NULL object incorrectly
We were returning a skiplist node when looking up NULL!
2013-03-17 22:12:47 +00:00
matthieu
79dacaca45 MFC: Bug 60748 - broken conf.d/10-autohint.conf and conf.d/10-unhinted.conf
Move the target of recipes to the "pattern" from the "font". This is
to ensure the targeted objects is updated by them prior to
FcDefaultSubstitute() so that it can adds the default values properly.
2013-03-09 14:14:34 +00:00
matthieu
de08f67d60 Add missing fcntl(..., F_DUPFD_CLOEXEC) argument. 2013-03-09 14:01:04 +00:00
matthieu
ead261fb97 New config file providing replacement for Lucida fonts.
Replace ugly bitmapped fonts by Luxi or DejaVu TrueType fonts,
Provide aliases for commonly found Lucida family fonts (Lucida,
Lucida Grande, Lucida Sans Unicode).

Prodded by a submission by Tobias Ulmer. Ok mpi@.
2013-03-09 14:00:31 +00:00
matthieu
cb861fcea9 Add a substitution from fonts that map to ugly bitmapped ones
Maps to DejaVu fonts. Most of the work done by martynas@
and deraadt@, with inputs and tests from naddy@, todd@
and lots of others.
2013-03-09 13:59:48 +00:00
matthieu
0bbce74883 fc-cache] Add '-c' option fc-cache to chroot on startup
before (re)building the font cache. Useful for builds with
$DESTDIR set, to prepare a binary distribution.
2013-03-09 13:58:47 +00:00
matthieu
c9c2f93b5d Import fontconfig 2.10.91 in a separate directory
to make room for a BSD make build system.
2013-03-09 13:33:45 +00:00
matthieu
6d8faa157e Update to libxcb 1.9.0.
tested by ajacoutot@ and naddy@ on a full ports build
2012-11-22 20:31:32 +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
shadchin
77b31f4205 Update to xkeyboard-config 2.7
ok matthieu@, mpi@
2012-10-06 15:41:11 +00:00
matthieu
007f491121 Merge some definitions from dri 2.3 needed by xserver 1.13.
ok mpi@
2012-09-16 17:02:37 +00:00
mpi
983aa76032 Correctly define CPU_TO_LE32, required to build dri drivers on
big-endian archs.

ok kettenis@
2012-08-29 12:49:08 +00:00
mpi
d1207e5441 Re-add generated files and unbreak the build. I shouldn't have deleted
those during the update. Spotted by matthieu@
2012-08-17 16:26:59 +00:00
mpi
8578592ff1 Re-add generated files and unbreak the build. I shouldn't have deleted
those during the update. Spotted by matthieu@
2012-08-17 16:21:19 +00:00
mpi
942304ce5d Don't try to include an empty header 2012-08-17 14:18:49 +00:00
mpi
bb3c4ca180 Add a missing file from previous update 2012-08-17 14:17:18 +00:00
mpi
e67a5fe840 Upate to libGL 7.11.2
Tested by jsg@, matthieu@ and ajacoutot@, ok mattieu@
2012-08-17 13:57:59 +00:00
mpi
0e20e1901a Lets gallium a chance to build with our llvm port 2012-07-13 13:00:28 +00:00
mpi
a1f4d59825 Unbreak GLX1.3 ctors with software dri, this makes clutter/cogl works with
software accleration.

Upstream commit d44f821213d7ed67fed18d6ea6c34b61a665c89e by Adam Jackson

ok ajacoutot@, jasper@, robert@
2012-07-07 12:03:53 +00:00
mpi
73fa8c0344 Don't enable INTEL_swap_event unconditionally and wait forever for an
event that's not coming.

This unbreak clutter/cogl and probably other toolkits.

Upstream commit 25620eb1d277c6b80edb136eaeca12532fcfd3ce by Adam Jackson

ok ajacoutot@, jasper@, robert@
2012-07-07 12:00:49 +00:00
shadchin
acd1f5eb4c Update to 2.6
ok jasper@, krw@, matthieu@
2012-06-10 16:30:14 +00:00
pascal
4b13d7a756 Fix a prototype in order to be able to use this header with
-Werror=strict-prototypes enabled.

ok matthieu@
2012-04-30 20:58:39 +00:00
matthieu
1f3df99ce6 Update to libxcb 1.8.1. Tested by krw@, mpi@, shadchin@ 2012-03-27 19:14:20 +00:00
shadchin
5178ff34c7 Update to xkeyboard-config 2.5.
ok matthieu@
2012-01-24 16:24:33 +00:00
sthen
3890ec0e28 Workaround CVE-2012-0064, password-locked X screen savers can be bypassed
with Ctrl Alt *.

This is not the complete fix but mitigates the issue for now.

Bug was introduced to OpenBSD in the xserver update on 2011/11/05
(commit 7d2543a3cb3 upstream), so it affects -current since that date,
but no OpenBSD releases.

ok matthieu@ phessler@ dcoppa@, also tested by schwarze@, jj@

If you want this fix before new snapshots are available, copy the new
file to /usr/X11R6/share/X11/xkb/compat/xfree86 and reload the kbmap e.g.
setxkbmap $(setxkbmap -query | awk '/layout/ { print $2 }')
2012-01-19 16:18:55 +00:00
espie
6662f16ddc avoid pesky gcc warnings due to missing eol
okay matthieu@
2011-12-05 20:35:23 +00:00
shadchin
714d54a9e9 Fix Shift+Backspace
ok sthen@, matthieu@
2011-11-03 13:37:44 +00:00
matthieu
0717133623 Merge Mesa 7.10.3 2011-10-23 13:37:25 +00:00
matthieu
ecd3bcaeda Import Mesa 7.10.3 2011-10-23 13:29:21 +00:00
shadchin
77a8570968 Update to 2.4.1
ok jasper@, matthieu@
2011-10-16 17:18:56 +00:00
robert
1b417fdf29 Fix an X server crash when starting GLX 1.3 apps;
https://bugs.freedesktop.org/show_bug.cgi?id=29091

ok matthieu@, oga@
2011-10-01 16:13:07 +00:00
shadchin
752f53d70f more robust solution for 'Kill X on Ctrl+Alt+Backspace on default'
ok matthieu@
2011-09-17 13:41:14 +00:00
shadchin
f8291790c5 Update xkeyboard-config to 2.3
ok matthieu@, tested jasper@
2011-07-01 14:25:24 +00:00
matthieu
058b523fc8 Remove MesaDemos contents. Not used by Xenocara builds anymore. 2011-05-31 18:50:19 +00:00
shadchin
a067e4f1a4 Add support for zaurus
ok matthieu@
2011-04-10 17:49:13 +00:00
shadchin
ac434459e1 Add support for lkeys
ok matthieu@
2011-04-10 17:46:36 +00:00
jasper
8abf6371e4 Update xkeyboard-config to 2.2.1
* New structure of descriptions, massive changes in user-visible strings.
Special release for GNOME 3.

ok shadchin@ matthieu@
2011-04-10 17:08:49 +00:00
shadchin
bfae20612e Update xkeyboard-config to 2.1
ok matthieu@
2011-03-12 10:16:01 +00:00
shadchin
34ca43921b Update xkeyboard-config to 2.0
ok matthieu
2011-01-10 14:25:56 +00:00
dcoppa
964be84ed2 Bugfixes from upstream.
Minor tweaks (shutdown(2) related bits) by me.

OK matthieu@
2010-10-06 07:50:06 +00:00
matthieu
4638a5f252 Update to libxcb 1.7 2010-09-04 10:00:58 +00:00
dcoppa
2cda6f76a0 Pull in some fixes from upstream:
o various memleak fixes
o ensure get_wm_class_from_reply returns a valid C-string

OK matthieu@, deraadt@
2010-08-04 07:47:53 +00:00
oga
ed108ba924 Two patches cherry picked from mesa master just after 7.8 was branched
(but never made it into the 7.8 branch).

first:
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Apr 22 12:47:41 2010 -0700

    DRI2: add config query extension

    Add a new DRI2 configuration query extension.  Allows for DRI2
    client code to query for common DRI2 configuration options.

second:
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Apr 22 12:49:03 2010 -0700

    DRI2/GLX: check for vblank_mode in DRI2 GLX code

    Re-add support for the vblank_mode environment and configuration
    variable.  Useful for benchmarking and app control.

The final affect being that config and environment variables for
controlling swap mode work with dri2 now. which helps me a lot with
debugging.

ok matthieu@.
2010-07-24 19:03:21 +00:00
oga
ee7fac2a85 When a dri driver dlopen()s libGL to try and get the correct symbols (in
case libGL itself was dlopen()ed), it was using "libGL.so.1" (linux
convention, doesn't work on OpenBSD). Change it to "libGL.so" so it has
a hope in hell of working.

I finally wrote this patch when trying to port perl's OpenGL modules
ages ago and i finally decided that hacking each instance of dlopening
libGL to use RTLD_GLOBAL was dumb.

ok matthieu@
2010-07-24 18:16:40 +00:00
oga
5e874c650c This is a hack.
Since mesa changed some code, GL applications have been rather nasty to
the xserver, if they are unconstrained rendering wise they spam too many
requests at the xserver and make it slow as hell (even if the cpu is
fairly idle).

There is a throttling mechanism in the xserver (1.8 at least), but that
only really works if you are doing vblank syncing (which is turned off
in our intel driver right now for unrelated reasons), and even then an unsynced
client can cause the same problem.

While a proper fix is being worked on (I am in discussion with X
developers), comment out two conditionals in the intel mesa driver so
that even when using dri2 swapbuffers we wait on the swapbuffers before
last before rendeing more, this prevents almost DoSing the server.

Tested on ironlake, 855 and 965 by me (and my matthieu as well). ok
matthieu@
2010-07-24 18:13:33 +00:00
matthieu
cd750bf570 Update to Mesa 7.8.2. Tested by johan@. Thanks. 2010-06-22 20:04:22 +00:00
oga
9dc65d790c Bring back the local patch that has a habit of vanishing every time we
update mesa.

Specifically, we disallow in radeondrm for dri clients mapping
registers, so don't try and map them (and thus fail as we currently
were). for r300+ this was only used for falling back on old drm versions
(doesn't matter). For r100, the new BO abstraction used the SWI number
(in hardware scratch reg 3) for the buffer age, so use the newly added
getparam member to grab that info instead of trying to read the mapped
registers.

Update to the lastest kernel headers  before you even think about
building this or trying to use a snapshot on r100/r200.

So now radeon works with mesa again, hoorah!

Tested on rv250 by Josh Elsasser, and on R420 (and x800) by myself.
2010-05-26 22:55:53 +00:00
matthieu
da1bd1e8ce Remove a demo with huge data files. 2010-05-22 21:04:09 +00:00
matthieu
30f07f27f7 Remove a demo application with 40M of data files. 2010-05-22 20:50:09 +00:00
matthieu
e4fce73489 Update to Mesa 7.8.1. Tested on a bulk ports build by naddy@, ok oga@. 2010-05-22 20:05:42 +00:00
matthieu
852acd6263 Update to libxcb 1.6. Mostly for new dri2 helper lib, requested by oga@. 2010-04-18 20:06:18 +00:00
matthieu
e18fcadebe The reply type could be XCB_NONE if the property is not present.
Patch from upstreams, pointed out by David Coppa.
2010-03-20 07:41:31 +00:00
matthieu
7b8404708b Validate size of wm_hints and wm_size_hints
Without these checks, we can overflow the buffer or divide by zero.

Patch from upstreams, From David Coppa.
2010-03-20 07:37:07 +00:00
oga
1216b6a36c Fix some problems in libxcb-icccm affecting xcb based window managers.
Specifically, fix checks on the data so then we use the correct
sanitised length. From Peter Harris (pharris AT opentext DOT com), an
xcb developer, via David Coppa (dcoppa AT gmail DOT com); thanks!

requested by deraadt@
2010-03-07 15:51:34 +00:00
oga
383d27823d Stop printing to stderr whenever we fail to initialise GEM (every time
without diffs), libraries shouldn't do that, and it's frankly pretty
irritating.

ok matthieu ages ago. prompted by deraadt@
2009-11-21 13:05:59 +00:00
oga
f142b782ba undo a bit of overzealous backporting from the DRI2 bits, this chunk
isn't strictly needed and it causes GL apps to segfault on exit on the
965 with dri1 and xserver 1.6.

ok matthieu@
2009-09-08 23:31:10 +00:00
matthieu
86fe704ca5 update to xcb-util 0.3.6. Tested on a packages bulk build by naddy@. 2009-09-05 15:55:46 +00:00
matthieu
e9d6b4f7bf Update to libxcb 1.4. tested by naddy@ on a packages bulk build. 2009-09-05 15:54:43 +00:00
oga
9997d7a073 backport some code from mesa current (and 7.5) so that the dri2 protocol
is correctly handled. without fixes to mesa and the ddx, the so-called
backwards compat goop that was added just plain does not work and ends
up with rendering bullshit.
2009-08-06 15:50:02 +00:00
matthieu
7d22228cff regen after gcc 2.95 build fix 2009-07-20 20:55:45 +00:00
matthieu
ee57c931d5 gcc 2.95 build fixes. 2009-07-20 20:55:10 +00:00
matthieu
60c1de6788 Import xkeyboard-config version 1.6. 2009-06-06 17:52:23 +00:00
matthieu
f3b20b10a0 update to xcb-util 0.3.5 2009-05-31 16:49:15 +00:00
matthieu
8e91f6fca8 update to libxcb 1.3 2009-05-31 16:44:43 +00:00
matthieu
f4c2f8c818 import xcb-util 0.3.4 2009-05-23 14:37:52 +00:00
matthieu
65b2c83108 import libxcb 1.2 2009-05-22 15:55:46 +00:00
matthieu
fced6378df Update to Mesa 7.4.2. Tested by oga@, ckuethe@ and naddy@. 2009-05-17 20:26:36 +00:00
oga
a59dd3b126 Bah. Diff applied strangely last time. Fix fallout.
It builds now.
2009-02-05 01:37:06 +00:00
oga
ba0f4d62e2 Merge in two commits of mine from upstream mesa which mean that on
startup with and when we have only one pipe running we will always pick
the correct vblank pipe to sync to.

ok matthieu@.
2009-02-04 19:48:26 +00:00
oga
5e89e3dfdd Oops, missed a line removal. Fix build. 2009-01-11 20:35:40 +00:00
oga
1892786361 fix use of uninitialised value in one of our local changes.
ok matthieu@
2009-01-11 20:32:31 +00:00
oga
7efd4e6855 Remove ttm entrypoints. That memory manager interface isn't going to see the
light of day and has already been removed in mesa master (ages ago).

As a bonus, removes the annoying "falling back to classic" message on
launching a gl application.

ok matthieu@.
2009-01-10 15:56:13 +00:00
oga
64d859dd9e remove the triple buffering support from the intel driver, the support
from this was removed from the kernel and is very much deprecated.
Pageflipping is also probably broken and should not be used. Similar
change happened in mesa master a while back.

ok matthieu@
2009-01-10 15:27:14 +00:00
oga
89ec318c9a Remove "old style" DRI2 entrypoints.
ok matthieu@.
2009-01-10 15:12:43 +00:00
oga
dce0e78b94 Remove the ARB_occlusion_query support in the intel drivers. It was racy and
broken and the kernel ioctl doesn't exist anymore. GEM has a much better
solution for this.

ok matthieu (as part of a larger diff)
2009-01-10 15:09:50 +00:00
oga
3dcdb7063b For the radeon mesa driver, don't try and map the card's mmio region. We
really don't need it. There's one case where it's used, and that is on
``older'' drms, newer ones provide that one value via a parameter.

This is the first stage in my project to stop all cards mapping
registers. This does mean that drivers that depend on this may
eventually die (tdfx, i'm looking at you!).

ok matthieu@
2009-01-10 14:59:52 +00:00
matthieu
a5aec75608 oops do not commit emacs droppings 2008-11-02 15:03:19 +00:00
matthieu
895907f0b2 Mesa 7.2, Tested by ckuethe@, naddy@, oga@, and others. 2008-11-02 14:58:06 +00:00
matthieu
0c9c122b77 remove VMS specific stuff 2008-11-02 14:27:17 +00:00
matthieu
69e9f99391 remove ms-windows specific stuff 2008-11-02 14:26:07 +00:00
oga
e812b16917 Fix out-of-bounds memory access in swizzle_copy(). My fix was different,
but this one (from mesa, prompted by my diff) should run a little faster.
Now mplayer -vo gl or gl2 works with dri enabled.

Detected by otto malloc.  Some debugging help from todd.

ok matthieu@, todd@.
2008-08-12 23:16:07 +00:00
matthieu
37355e1dc2 unbreak biuld. From Travers Buda. Thanks. 2008-08-02 23:04:55 +00:00