summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac7
-rw-r--r--src/nv_video.c11
3 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d962cb9..a32ce89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-27 Aaron Plattner <aplattner@nvidia.com>
+
+ * configure.ac:
+ * src/nv_video.c:
+ Determine whether PutImage hooks take a DrawablePtr by server version.
+ Remove dependency on xorg-server >= 1.0.99.901.
+
2006-04-25 Aaron Plattner <aplattner@nvidia.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 5ac0706..8f44298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,13 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+# Determine whether XV PutImage takes a DrawablePtr
+PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
+ [AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
+ [])
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/nv_video.c b/src/nv_video.c
index c35bff0..33f3bb5 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -80,7 +80,12 @@ static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool);
+#if HAVE_XV_DRAWABLE
static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+#else
+static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+#endif
+
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
@@ -1004,8 +1009,10 @@ static int NVPutImage
short height,
Bool Sync,
RegionPtr clipBoxes,
- pointer data,
- DrawablePtr pDraw
+ pointer data
+#if HAVE_XV_DRAWABLE
+ , DrawablePtr pDraw
+#endif
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;