[Xcb-commit] 2 commits - xcb-demo

[Josh Triplett]

 xcb-demo/Makefile.am  |    7 ++++++-
 xcb-demo/configure.ac |    1 +
 xcb-demo/xcbxvinfo.c  |    4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
diff-tree ff4d08610341d1437600e9c60dbf8551559a34d8 (from f52419bf381f498111c2f7b204fdec427ae6f959)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Thu Apr 27 15:43:51 2006 -0700

    Fix xcbxvinfo for rename of XCBConnSetupSuccessRep to XCBSetup; eliminates deprecation warnings.

diff --git a/xcb-demo/xcbxvinfo.c b/xcb-demo/xcbxvinfo.c
index 495af78..0f9a363 100644
--- a/xcb-demo/xcbxvinfo.c
+++ b/xcb-demo/xcbxvinfo.c
@@ -13,7 +13,7 @@ static void PrintUsage()
 
 XCBSCREEN *ScreenOfDisplay (XCBConnection *c, int screen)
 {
-    XCBSCREENIter iter = XCBConnSetupSuccessRepRootsIter (XCBGetSetup (c));
+    XCBSCREENIter iter = XCBSetupRootsIter (XCBGetSetup (c));
     for (; iter.rem; --screen, XCBSCREENNext (&iter))
         if (screen == 0)
             return iter.data;
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 
     free(query_ext);
 
-    nscreens = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c)).rem;
+    nscreens = XCBSetupRootsLength(XCBGetSetup(c));
 
     for (i = 0; i < nscreens; i++)
     {
diff-tree f52419bf381f498111c2f7b204fdec427ae6f959 (from 6c51d68ae5ea13eb309d02c17562323e186b8788)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Thu Apr 27 15:42:24 2006 -0700

    Actually build xcbxvinfo.

diff --git a/xcb-demo/Makefile.am b/xcb-demo/Makefile.am
index 21793ed..8abeec9 100644
--- a/xcb-demo/Makefile.am
+++ b/xcb-demo/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST = autogen.sh README
 INCLUDES = $(XCB_CFLAGS)
 LDADD = $(XCB_LIBS)
 
-bin_PROGRAMS = hypnomoire xdpyinfo xcb-test dpms rendertest xcbrandr xcbxf86dri
+bin_PROGRAMS = dpms hypnomoire rendertest xcb-test xcbrandr xcbxf86dri \
+               xcbxvinfo xdpyinfo
 
 hypnomoire_CFLAGS = $(XCBAUX_CFLAGS)
 hypnomoire_LDADD = $(XCBAUX_LIBS) -lm -lpthread
@@ -35,3 +36,7 @@ xcbrandr_SOURCES = xcbrandr.c
 xcbxf86dri_CFLAGS = $(XCBXF86DRI_CFLAGS)
 xcbxf86dri_LDADD = $(XCBXF86DRI_LIBS)
 xcbxf86dri_SOURCES = xcbxf86dri.c
+
+xcbxvinfo_CFLAGS = $(XCBXV_CFLAGS)
+xcbxvinfo_LDADD = $(XCBXV_LIBS)
+xcbxvinfo_SOURCES = xcbxvinfo.c
diff --git a/xcb-demo/configure.ac b/xcb-demo/configure.ac
index d989498..fcebfc9 100644
--- a/xcb-demo/configure.ac
+++ b/xcb-demo/configure.ac
@@ -18,5 +18,6 @@ PKG_CHECK_MODULES(XCBDPMS, xcb-dpms)
 PKG_CHECK_MODULES(XCBRENDER, xcb-render)
 PKG_CHECK_MODULES(XCBRANDR, xcb-randr)
 PKG_CHECK_MODULES(XCBXF86DRI, xcb-xf86dri)
+PKG_CHECK_MODULES(XCBXV, xcb-xv)
 
 AC_OUTPUT([Makefile tests/Makefile])