From patchwork Thu Oct 15 21:25:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 54111 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9FLQC0S011200 for ; Thu, 15 Oct 2009 21:26:12 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2004FA09B4; Thu, 15 Oct 2009 14:26:12 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from kingsolver.anholt.net (71-20-254-182.war.clearwire-wmx.net [71.20.254.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 474B0A09A0; Thu, 15 Oct 2009 14:25:54 -0700 (PDT) Received: from gaiman.anholt.net (localhost [127.0.0.1]) by kingsolver.anholt.net (Postfix) with ESMTP id 386172C9C0ED; Thu, 15 Oct 2009 14:25:54 -0700 (PDT) Received: by gaiman.anholt.net (Postfix, from userid 1000) id 3EF07162380; Thu, 15 Oct 2009 14:25:54 -0700 (PDT) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Thu, 15 Oct 2009 14:25:48 -0700 Message-Id: <1255641949-17558-4-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.6.4.3 In-Reply-To: <1255641949-17558-3-git-send-email-eric@anholt.net> References: <1255641949-17558-1-git-send-email-eric@anholt.net> <1255641949-17558-2-git-send-email-eric@anholt.net> <1255641949-17558-3-git-send-email-eric@anholt.net> Cc: xcb@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 2/2] Add DRI2 support. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org 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..fb19c28 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_XFREE86_DRI +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}