From e82c34c2f7ac3fbb23ab14cbee8df2dd9178f5a4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 15 Oct 2009 13:13:47 -0700 Subject: Add DRI2 support. (v2) v2: Build fix from jcristau. --- Makefile.am | 3 +++ configure.ac | 2 ++ src/.gitignore | 1 + src/Makefile.am | 10 ++++++++++ xcb-dri2.pc.in | 11 +++++++++++ 5 files changed, 27 insertions(+) create mode 100644 xcb-dri2.pc.in diff --git a/Makefile.am b/Makefile.am index 3a2f6f5..ff9dea1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,6 +13,9 @@ endif if BUILD_DPMS pkgconfig_DATA += xcb-dpms.pc endif +if BUILD_DRI2 +pkgconfig_DATA += xcb-dri2.pc +endif if BUILD_GLX pkgconfig_DATA += xcb-glx.pc endif diff --git a/configure.ac b/configure.ac index 96f5079..a748489 100644 --- a/configure.ac +++ b/configure.ac @@ -132,6 +132,7 @@ esac XCB_EXTENSION(Composite, "yes") XCB_EXTENSION(Damage, "yes") XCB_EXTENSION(DPMS, "yes") +XCB_EXTENSION(DRI2, "yes") XCB_EXTENSION(GLX, "yes") XCB_EXTENSION(RandR, "yes") XCB_EXTENSION(Record, "yes") @@ -174,6 +175,7 @@ xcb.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc +xcb-dri2.pc xcb-glx.pc xcb-randr.pc xcb-record.pc diff --git a/src/.gitignore b/src/.gitignore index 86d9b9c..21421a2 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -2,6 +2,7 @@ bigreq.* composite.* damage.* dpms.* +dri2.* glx.* randr.* record.* diff --git a/src/Makefile.am b/src/Makefile.am index f58ee65..8bec613 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,6 +60,16 @@ libxcb_dpms_la_LIBADD = $(XCB_LIBS) nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h endif +EXTHEADERS += dri2.h +EXTSOURCES += dri2.c +EXTENSION_XML += dri2.xml +if BUILD_DRI2 +lib_LTLIBRARIES += libxcb-dri2.la +libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined +libxcb_dri2_la_LIBADD = $(XCB_LIBS) +nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h +endif + EXTHEADERS += glx.h EXTSOURCES += glx.c EXTENSION_XML += glx.xml diff --git a/xcb-dri2.pc.in b/xcb-dri2.pc.in new file mode 100644 index 0000000..a9944df --- /dev/null +++ b/xcb-dri2.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCB DRI2 +Description: XCB DRI2 Extension +Version: @PACKAGE_VERSION@ +Requires: xcb +Libs: -L${libdir} -lxcb-dri2 +Cflags: -I${includedir} -- cgit v1.2.3