[PULL] xserver updates

Adam Jackson ajax at redhat.com
Fri Jul 17 08:18:24 PDT 2015


On Wed, 2015-07-08 at 11:08 -0700, Keith Packard wrote:
> 
> Looks like this is ready to merge, but I couldn't bisect through this
> when attempting to find the cause of the dixGetGlyphs warning, and the
> resulting build generates a pile of warnings. So, someone needs to clean
> up the patch series so that each point along the sequence builds, and
> the result builds without warnings.
> 

Indeed, some of the rootless patches have to be applied before the
'build unconditionally' change, or else, it doesn't. Same set as before
but reordered to build at every step, plus the dmx build fix:

The following changes since commit 90db5edf119187f8b1b9207c8c384d6cd7ef9edc:

  prime: add rotation support for offloaded outputs (v2) (2015-07-08 11:13:09 -0700)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

for you to fetch changes up to 7b0f940625a0f6eee2ef91dfbfa4a206246940f5:

  atom: make FreeAtom static (2015-07-08 16:41:29 -0400)

----------------------------------------------------------------
Adam Jackson (23):
      dmx: Fix the build
      present: static cleanup
      parser: static cleanup
      dri3: Remove unbuilt dri3_event.c
      dri3: static cleanup
      dix: Unexport various implementation details
      randr: Unexport some implementation details
      render: Hide/unexport some implementation details
      xfree86: Hide some pre-randr mode validation details
      dga: Hide a bunch of implementation details
      xge: Hide some implementation details
      vidmode: Hide implementation details
      xfixes: Unexport xfixes.h
      dix: unifdef pWin->rootlessUnhittable
      rootless: Genericize the config header a bit
      rootless: Build unconditionally
      fb: Make rootless-agnostic
      mi: Remove questionable optimization from the rootless path
      dix: Restore PaintWindow screen hook
      glx/swrast: Do more GLX extension setup
      glx: Implement GLX_ARB_context_flush_control
      atom: Bump initial table size
      atom: make FreeAtom static

 Xext/geext.c                    |  10 +-
 Xext/geint.h                    |   5 +-
 composite/compwindow.c          |   2 +-
 configure.ac                    |   2 +-
 dix/atom.c                      |   6 +-
 dix/colormap.c                  | 337 ++++++++++++++++++++--------------------
 dix/dispatch.c                  |   1 +
 dix/dixfonts.c                  |  12 +-
 dix/enterleave.c                |   2 +-
 dix/enterleave.h                |   2 -
 dix/main.c                      |   2 +
 dix/window.c                    |   9 +-
 dri3/dri3.c                     |   3 +-
 dri3/dri3_event.c               | 163 -------------------
 dri3/dri3_priv.h                |   2 -
 fb/fb.h                         |   5 -
 glx/createcontext.c             |  15 ++
 glx/extension_string.c          |   1 +
 glx/extension_string.h          |   3 +-
 glx/glxcmds.c                   |  20 ++-
 glx/glxcontext.h                |   5 +
 glx/glxdri2.c                   |   7 +
 glx/glxdriswrast.c              |  43 ++++-
 hw/vfb/Makefile.am              |   1 -
 hw/xfree86/common/Makefile.am   |   1 -
 hw/xfree86/common/dgaproc.h     |  62 ++------
 hw/xfree86/common/vidmodeproc.h |  77 +++++----
 hw/xfree86/common/xf86.h        |  11 --
 hw/xfree86/common/xf86DGA.c     |  36 ++---
 hw/xfree86/common/xf86Mode.c    |  11 +-
 hw/xfree86/common/xf86VidMode.c |   2 +-
 hw/xfree86/doc/ddxDesign.xml    |  75 ---------
 hw/xfree86/parser/InputClass.c  | 152 +++++++++---------
 hw/xfree86/parser/OutputClass.c |  52 +++----
 hw/xfree86/parser/Screen.c      |  80 +++++-----
 hw/xfree86/parser/Vendor.c      |  32 ++--
 hw/xfree86/parser/configProcs.h |   6 -
 hw/xfree86/sdksyms.sh           |  12 --
 hw/xquartz/quartz.c             |   4 +-
 hw/xwin/winrandr.c              |   2 +-
 include/Makefile.am             |   4 +-
 include/colormap.h              |  12 --
 include/dixfont.h               |  35 -----
 include/dixstruct.h             |  23 ++-
 include/scrnintstr.h            |   5 +
 include/swaprep.h               | 320 +++++++++++++++++++-------------------
 include/swapreq.h               |   6 +-
 include/windowstr.h             |   4 +-
 mi/miexpose.c                   |  35 +----
 mi/miglblt.c                    |   1 +
 mi/mioverlay.c                  |  12 +-
 mi/miscrinit.c                  |   1 +
 mi/miwindow.c                   |  11 +-
 miext/Makefile.am               |   9 +-
 miext/damage/damage.c           |   1 +
 miext/rootless/rootlessCommon.h |   1 +
 miext/rootless/rootlessConfig.h |  21 +--
 miext/rootless/rootlessScreen.c |   3 +-
 miext/rootless/rootlessWindow.c |  31 +++-
 miext/rootless/rootlessWindow.h |   1 +
 os/utils.c                      |   1 +
 present/present_event.c         |   2 +-
 present/present_priv.h          |   2 -
 present/present_request.c       |   4 +-
 randr/randrstr.h                |  10 +-
 render/glyph.c                  |  10 +-
 render/glyphstr.h               |  36 ++---
 render/mipict.c                 |  16 +-
 render/mipict.h                 |  36 -----
 render/picture.c                |  24 +--
 render/picture.h                |   6 +-
 render/picturestr.h             |  50 +-----
 xfixes/Makefile.am              |   4 -
 xfixes/xfixes.h                 |   6 +-
 74 files changed, 810 insertions(+), 1206 deletions(-)
 delete mode 100644 dri3/dri3_event.c

- ajax


More information about the xorg-devel mailing list