[PATCH 10/15] glamor: Disable the XV code for now.

[Eric Anholt]

We're going to want to make this DIX code instead of XF86 if at all
possible, but for now just disable it so we can work on the rest of
the build.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor.h    | 2 ++
 glamor/glamor_xv.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/glamor/glamor.h b/glamor/glamor.h
index da1ad3d..7dc2973 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -437,7 +437,9 @@ extern _X_EXPORT Bool glamor_poly_line_nf(DrawablePtr pDrawable, GCPtr pGC,
 extern _X_EXPORT Bool glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc,
                                            int mode, int n, DDXPointPtr points);
 
+#if 0
 extern _X_EXPORT XF86VideoAdaptorPtr glamor_xv_init(ScreenPtr pScreen,
                                                     int num_texture_ports);
+#endif
 
 #endif                          /* GLAMOR_H */
diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index bdc4c73..6e91a0c 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -627,9 +627,11 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports)
     return adapt;
 }
 #else
+#if 0
 XF86VideoAdaptorPtr
 glamor_xv_init(ScreenPtr screen, int num_texture_ports)
 {
     return NULL;
 }
 #endif
+#endif
-- 
1.8.5.1