Skip to content
Snippets Groups Projects
  1. Jun 27, 2018
  2. Jun 16, 2018
  3. Jun 13, 2018
    • Jeremy Puhlman's avatar
      Remove libdir from pc files. · 91c1c8e1
      Jeremy Puhlman authored and Adam Jackson's avatar Adam Jackson committed
      
      Currently the pc files define libdir, however they are installed into
      /usr/share, which means they should be architecture agnostic. In a
      multilib system, xorg-proto built for each multilib abi, the value of
      libdir is going to be different. These should either be installed in
      <libdir>/pkgconfig or they shouldn't define libdir, espeically since
      they don't actually use the definition. This specifically causes an
      issue when trying to install both abis at the same time, since they are
      not binary identical, something like rpm will complain that they
      conflict.
      
      Signed-off-by: default avatarJeremy Puhlman <jpuhlman@mvista.com>
      Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
      91c1c8e1
  4. Mar 30, 2018
  5. Mar 27, 2018
  6. Mar 19, 2018
    • Adam Jackson's avatar
      randrproto: Fix missing #undef RRLease · 30a20138
      Adam Jackson authored
      
      clang did not like this, and it's hard to blame it:
      
      ../randr/randrstr.h:66:13: warning: redefinition of typedef 'CARD32' is a C11 feature [-Wtypedef-redefinition]
      typedef XID RRLease;
                  ^
      /opt/X11/include/X11/extensions/randrproto.h:53:17: note: expanded from macro 'RRLease'
                      ^
      /opt/X11/include/X11/Xmd.h:111:23: note: previous definition is here
      typedef unsigned long CARD32;
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      30a20138
  7. Mar 14, 2018
  8. Feb 28, 2018
  9. Feb 20, 2018
  10. Feb 15, 2018
  11. Feb 14, 2018
  12. Feb 12, 2018
  13. Feb 06, 2018
  14. Feb 05, 2018
  15. Feb 01, 2018
  16. Jan 30, 2018
    • Adam Jackson's avatar
      Add a meson build system · 627f4f40
      Adam Jackson authored
      
      Builds on the work Dylan Baker did for glproto. Note that this does
      not produce _quite_ identical pc files as the autotools build, but it
      only affects the name and description strings which are only informative
      anyway.
      
      Just to be petty:
      
      % time ( ./configure --prefix=/tmp/xorgproto && make install; ) >& /dev/null
      2.42s user 1.67s system 107% cpu 3.804 total
      
      % time ( meson setup build && meson configure build -Dprefix=/tmp/xorgproto && ninja -C build install ) >& /dev/null
      0.55s user 0.11s system 100% cpu 0.658 total
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      627f4f40
    • Adam Jackson's avatar
      Move the headers under include/X11/... · 9d14a8fa
      Adam Jackson authored
      
      I kinda hate to do this, it was nice to have everything in one place.
      However, the meson build wants to be able to wrap this module as a
      dependency, and code that depends on these headers includes them in the
      form:
      
          #include <X11/Xfuncproto.h>
      
      As a result, any include path meson can construct needs to point to the
      root of a hierarchy that has the same path layout as an installed copy,
      hence this change.
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      9d14a8fa
    • Adam Jackson's avatar
      git mv *proto/ attic/ · dc2c6e8e
      Adam Jackson authored
      
      Stash the old documentation build recipes somewhere less immediately
      ugly.
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      dc2c6e8e
    • Adam Jackson's avatar
      git rm -f NEWS · d9f9efc7
      Adam Jackson authored
      
      This was from damageproto, and hadn't been touched in a decade. Not
      exactly "news" anymore.
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      d9f9efc7
    • Adam Jackson's avatar
      git rm duplicate-files · 74a78da1
      Adam Jackson authored
      
      At this point all that's left in subdirs (besides include/) are the
      automake rules for building the specs. Probably we should make those
      build again at some point.
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      74a78da1
    • Adam Jackson's avatar
      git rm -f */.gitignore · 94169653
      Adam Jackson authored
      
      Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
      94169653
Loading