Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libxcb build support for libxcb 1.6. ...



details:   https://anonhg.NetBSD.org/src/rev/015b2bcb5812
branches:  trunk
changeset: 756434:015b2bcb5812
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Jul 17 23:43:27 2010 +0000

description:
build support for libxcb 1.6.  not yet used.

XXX: i couldn't get the python/xml generator to run outside of
XXX: the libxcb build tree, so i just copied these from there,
XXX: but ideally files/Makefile could know how to do this.

diffstat:

 external/mit/xorg/lib/libxcb/Makefile               |     27 +
 external/mit/xorg/lib/libxcb/bigreq/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/composite/Makefile     |      5 +
 external/mit/xorg/lib/libxcb/damage/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/dpms/Makefile          |      5 +
 external/mit/xorg/lib/libxcb/dri2/Makefile          |      5 +
 external/mit/xorg/lib/libxcb/files/Makefile         |     26 +
 external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs |     30 +
 external/mit/xorg/lib/libxcb/files/bigreq.c         |     98 +
 external/mit/xorg/lib/libxcb/files/bigreq.h         |    141 +
 external/mit/xorg/lib/libxcb/files/composite.c      |    754 +
 external/mit/xorg/lib/libxcb/files/composite.h      |    742 +
 external/mit/xorg/lib/libxcb/files/config.h         |     84 +
 external/mit/xorg/lib/libxcb/files/damage.c         |    472 +
 external/mit/xorg/lib/libxcb/files/damage.h         |    521 +
 external/mit/xorg/lib/libxcb/files/dpms.c           |    656 +
 external/mit/xorg/lib/libxcb/files/dpms.h           |    731 +
 external/mit/xorg/lib/libxcb/files/dri2.c           |   1075 +
 external/mit/xorg/lib/libxcb/files/dri2.h           |   1186 +
 external/mit/xorg/lib/libxcb/files/glx.c            |  12747 ++++++++++++++
 external/mit/xorg/lib/libxcb/files/glx.h            |  13173 +++++++++++++++
 external/mit/xorg/lib/libxcb/files/randr.c          |   4827 +++++
 external/mit/xorg/lib/libxcb/files/randr.h          |   5020 +++++
 external/mit/xorg/lib/libxcb/files/record.c         |   1208 +
 external/mit/xorg/lib/libxcb/files/record.h         |   1348 +
 external/mit/xorg/lib/libxcb/files/render.c         |   4353 +++++
 external/mit/xorg/lib/libxcb/files/render.h         |   4412 +++++
 external/mit/xorg/lib/libxcb/files/res.c            |    561 +
 external/mit/xorg/lib/libxcb/files/res.h            |    682 +
 external/mit/xorg/lib/libxcb/files/screensaver.c    |    567 +
 external/mit/xorg/lib/libxcb/files/screensaver.h    |    613 +
 external/mit/xorg/lib/libxcb/files/shape.c          |   1017 +
 external/mit/xorg/lib/libxcb/files/shape.h          |   1096 +
 external/mit/xorg/lib/libxcb/files/shm.c            |    705 +
 external/mit/xorg/lib/libxcb/files/shm.h            |    738 +
 external/mit/xorg/lib/libxcb/files/sync.c           |   1511 +
 external/mit/xorg/lib/libxcb/files/sync.h           |   1707 ++
 external/mit/xorg/lib/libxcb/files/xc_misc.c        |    340 +
 external/mit/xorg/lib/libxcb/files/xc_misc.h        |    410 +
 external/mit/xorg/lib/libxcb/files/xevie.c          |    524 +
 external/mit/xorg/lib/libxcb/files/xevie.h          |    667 +
 external/mit/xorg/lib/libxcb/files/xf86dri.c        |   1338 +
 external/mit/xorg/lib/libxcb/files/xf86dri.h        |   1489 +
 external/mit/xorg/lib/libxcb/files/xfixes.c         |   2953 +++
 external/mit/xorg/lib/libxcb/files/xfixes.h         |   2790 +++
 external/mit/xorg/lib/libxcb/files/xinerama.c       |    655 +
 external/mit/xorg/lib/libxcb/files/xinerama.h       |    808 +
 external/mit/xorg/lib/libxcb/files/xinput.c         |   5717 ++++++
 external/mit/xorg/lib/libxcb/files/xinput.h         |   6882 ++++++++
 external/mit/xorg/lib/libxcb/files/xproto.c         |  14471 ++++++++++++++++
 external/mit/xorg/lib/libxcb/files/xproto.h         |  15326 ++++++++++++++++++
 external/mit/xorg/lib/libxcb/files/xselinux.c       |   2951 +++
 external/mit/xorg/lib/libxcb/files/xselinux.h       |   2973 +++
 external/mit/xorg/lib/libxcb/files/xtest.c          |    399 +
 external/mit/xorg/lib/libxcb/files/xtest.h          |    431 +
 external/mit/xorg/lib/libxcb/files/xv.c             |   3156 +++
 external/mit/xorg/lib/libxcb/files/xv.h             |   3307 +++
 external/mit/xorg/lib/libxcb/files/xvmc.c           |   1255 +
 external/mit/xorg/lib/libxcb/files/xvmc.h           |   1375 +
 external/mit/xorg/lib/libxcb/glx/Makefile           |      5 +
 external/mit/xorg/lib/libxcb/libxcb/Makefile        |     64 +
 external/mit/xorg/lib/libxcb/libxcb/shlib_version   |      4 +
 external/mit/xorg/lib/libxcb/randr/Makefile         |      5 +
 external/mit/xorg/lib/libxcb/record/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/render/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/res/Makefile           |      5 +
 external/mit/xorg/lib/libxcb/screensaver/Makefile   |      5 +
 external/mit/xorg/lib/libxcb/shape/Makefile         |      5 +
 external/mit/xorg/lib/libxcb/shm/Makefile           |      5 +
 external/mit/xorg/lib/libxcb/sync/Makefile          |      5 +
 external/mit/xorg/lib/libxcb/xc_misc/Makefile       |      5 +
 external/mit/xorg/lib/libxcb/xcb.mk                 |     26 +
 external/mit/xorg/lib/libxcb/xevie/Makefile         |      5 +
 external/mit/xorg/lib/libxcb/xf86dri/Makefile       |      5 +
 external/mit/xorg/lib/libxcb/xfixes/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/xinerama/Makefile      |      5 +
 external/mit/xorg/lib/libxcb/xinput/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/xproto/Makefile        |      5 +
 external/mit/xorg/lib/libxcb/xtest/Makefile         |      5 +
 external/mit/xorg/lib/libxcb/xv/Makefile            |      5 +
 external/mit/xorg/lib/libxcb/xvmc/Makefile          |      5 +
 81 files changed, 133259 insertions(+), 0 deletions(-)

diffs (truncated from 133583 to 300 lines):

diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/Makefile     Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,27 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:27 mrg Exp $
+
+SUBDIR=        libxcb .WAIT
+
+SUBDIR+= \
+       composite \
+       damage \
+       dpms \
+       dri2 \
+       glx \
+       randr \
+       record \
+       render \
+       res \
+       screensaver \
+       shape \
+       shm \
+       sync \
+       xevie \
+       xf86dri \
+       xfixes \
+       xinerama \
+       xtest \
+       xv \
+       xvmc \
+
+.include <bsd.subdir.mk>
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/bigreq/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/bigreq/Makefile      Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:27 mrg Exp $
+
+XCBEXT=        bigreq
+
+.include "../xcb.mk"
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/composite/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/composite/Makefile   Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:27 mrg Exp $
+
+XCBEXT=        composite
+
+.include "../xcb.mk"
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/damage/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/damage/Makefile      Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:27 mrg Exp $
+
+XCBEXT=        damage
+
+.include "../xcb.mk"
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/dpms/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/dpms/Makefile        Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:28 mrg Exp $
+
+XCBEXT=        dpms
+
+.include "../xcb.mk"
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/dri2/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/dri2/Makefile        Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:28 mrg Exp $
+
+XCBEXT=        dri2
+
+.include "../xcb.mk"
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/files/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/files/Makefile       Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,26 @@
+#      $NetBSD: Makefile,v 1.1 2010/07/17 23:43:28 mrg Exp $
+
+# This makefile is used to generate the libxcb xml/python generated files.
+# For now it is broken, and these files were copied from a normal libxcb
+# build.
+
+.include <bsd.own.mk>
+.include "Makefile.xmlsrcs"
+
+PYTHON?=       /usr/pkg/bin/python2.6
+PYTHONLIB?=    /usr/pkg/lib/python2.6
+C_CLIENT?=     ${X11SRCDIR.xcb}/src/c_client.py
+
+.SUFFIXES: .c .xml
+
+# this doesn't work; needs to run in the xcb tree for some reason?
+.xml.c:
+       ${PYTHON} ${C_CLIENT} -p ${PYTHONLIB}/site-packages ${.IMPSRC}
+
+generate_from_xml: ${XMLSRCS}
+
+all: generate_from_xml
+
+.include <bsd.subdir.mk>
+
+.PATH: ${X11SRCDIR.xcb-proto}/src
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs       Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,30 @@
+#      $NetBSD: Makefile.xmlsrcs,v 1.1 2010/07/17 23:43:28 mrg Exp $
+
+# list of the libxcb xml-generated .c files.
+
+XMLSRCS= \
+       xproto.c \
+       bigreq.c \
+       xc_misc.c \
+       composite.c \
+       damage.c \
+       dpms.c \
+       dri2.c \
+       glx.c \
+       randr.c \
+       record.c \
+       render.c \
+       res.c \
+       screensaver.c \
+       shape.c \
+       shm.c \
+       sync.c \
+       xevie.c \
+       xf86dri.c \
+       xfixes.c \
+       xinerama.c \
+       xinput.c \
+       xselinux.c \
+       xtest.c \
+       xv.c \
+       xvmc.c
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/files/bigreq.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/files/bigreq.c       Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,98 @@
+/*
+ * This file generated automatically from bigreq.xml by c_client.py.
+ * Edit at your peril.
+ */
+
+#include <string.h>
+#include <assert.h>
+#include "xcbext.h"
+#include "bigreq.h"
+
+xcb_extension_t xcb_big_requests_id = { "BIG-REQUESTS", 0 };
+
+
+/*****************************************************************************
+ **
+ ** xcb_big_requests_enable_cookie_t xcb_big_requests_enable
+ ** 
+ ** @param xcb_connection_t *c
+ ** @returns xcb_big_requests_enable_cookie_t
+ **
+ *****************************************************************************/
+ 
+xcb_big_requests_enable_cookie_t
+xcb_big_requests_enable (xcb_connection_t *c  /**< */)
+{
+    static const xcb_protocol_request_t xcb_req = {
+        /* count */ 2,
+        /* ext */ &xcb_big_requests_id,
+        /* opcode */ XCB_BIG_REQUESTS_ENABLE,
+        /* isvoid */ 0
+    };
+    
+    struct iovec xcb_parts[4];
+    xcb_big_requests_enable_cookie_t xcb_ret;
+    xcb_big_requests_enable_request_t xcb_out;
+    
+    
+    xcb_parts[2].iov_base = (char *) &xcb_out;
+    xcb_parts[2].iov_len = sizeof(xcb_out);
+    xcb_parts[3].iov_base = 0;
+    xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
+    xcb_ret.sequence = xcb_send_request(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req);
+    return xcb_ret;
+}
+
+
+/*****************************************************************************
+ **
+ ** xcb_big_requests_enable_cookie_t xcb_big_requests_enable_unchecked
+ ** 
+ ** @param xcb_connection_t *c
+ ** @returns xcb_big_requests_enable_cookie_t
+ **
+ *****************************************************************************/
+ 
+xcb_big_requests_enable_cookie_t
+xcb_big_requests_enable_unchecked (xcb_connection_t *c  /**< */)
+{
+    static const xcb_protocol_request_t xcb_req = {
+        /* count */ 2,
+        /* ext */ &xcb_big_requests_id,
+        /* opcode */ XCB_BIG_REQUESTS_ENABLE,
+        /* isvoid */ 0
+    };
+    
+    struct iovec xcb_parts[4];
+    xcb_big_requests_enable_cookie_t xcb_ret;
+    xcb_big_requests_enable_request_t xcb_out;
+    
+    
+    xcb_parts[2].iov_base = (char *) &xcb_out;
+    xcb_parts[2].iov_len = sizeof(xcb_out);
+    xcb_parts[3].iov_base = 0;
+    xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3;
+    xcb_ret.sequence = xcb_send_request(c, 0, xcb_parts + 2, &xcb_req);
+    return xcb_ret;
+}
+
+
+/*****************************************************************************
+ **
+ ** xcb_big_requests_enable_reply_t * xcb_big_requests_enable_reply
+ ** 
+ ** @param xcb_connection_t                  *c
+ ** @param xcb_big_requests_enable_cookie_t   cookie
+ ** @param xcb_generic_error_t              **e
+ ** @returns xcb_big_requests_enable_reply_t *
+ **
+ *****************************************************************************/
+ 
+xcb_big_requests_enable_reply_t *
+xcb_big_requests_enable_reply (xcb_connection_t                  *c  /**< */,
+                               xcb_big_requests_enable_cookie_t   cookie  /**< */,
+                               xcb_generic_error_t              **e  /**< */)
+{
+    return (xcb_big_requests_enable_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e);
+}
+
diff -r 312242820b67 -r 015b2bcb5812 external/mit/xorg/lib/libxcb/files/bigreq.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/libxcb/files/bigreq.h       Sat Jul 17 23:43:27 2010 +0000
@@ -0,0 +1,141 @@
+/*
+ * This file generated automatically from bigreq.xml by c_client.py.
+ * Edit at your peril.
+ */
+
+/**
+ * @defgroup XCB_BigRequests_API XCB BigRequests API
+ * @brief BigRequests XCB Protocol Implementation.
+ * @{
+ **/
+
+#ifndef __BIGREQ_H
+#define __BIGREQ_H
+
+#include "xcb.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define XCB_BIGREQUESTS_MAJOR_VERSION 0
+#define XCB_BIGREQUESTS_MINOR_VERSION 0
+  
+extern xcb_extension_t xcb_big_requests_id;
+
+/**
+ * @brief xcb_big_requests_enable_cookie_t
+ **/
+typedef struct xcb_big_requests_enable_cookie_t {
+    unsigned int sequence; /**<  */
+} xcb_big_requests_enable_cookie_t;
+
+/** Opcode for xcb_big_requests_enable. */
+#define XCB_BIG_REQUESTS_ENABLE 0
+
+/**
+ * @brief xcb_big_requests_enable_request_t
+ **/
+typedef struct xcb_big_requests_enable_request_t {
+    uint8_t  major_opcode; /**<  */
+    uint8_t  minor_opcode; /**<  */
+    uint16_t length; /**<  */
+} xcb_big_requests_enable_request_t;
+
+/**
+ * @brief xcb_big_requests_enable_reply_t
+ **/
+typedef struct xcb_big_requests_enable_reply_t {
+    uint8_t  response_type; /**<  */
+    uint8_t  pad0; /**<  */
+    uint16_t sequence; /**<  */
+    uint32_t length; /**<  */
+    uint32_t maximum_request_length; /**<  */
+} xcb_big_requests_enable_reply_t;



Home | Main Index | Thread Index | Old Index