xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'

To: debian-x@lists.debian.org
Subject: xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
From: Ian Campbell <ijc-guest@alioth.debian.org>
Date: Sat, 16 Jan 2010 19:35:15 +0000
Message-id: <[🔎] E1NWEQV-0002TK-2O@alioth.debian.org>
 ChangeLog       |    2 
 Makefile.in     |    2 
 config.h.in     |    3 +
 configure       |  123 +++++++++++++++++++++++++++++++++++++++++++++-----------
 configure.ac    |    7 ++-
 src/Makefile.am |    2 
 src/Makefile.in |    4 +
 src/ivtv.c      |   22 +++++++---
 src/ivtv_hw.c   |    8 ++-
 9 files changed, 139 insertions(+), 34 deletions(-)

New commits:
commit d3798d4edecde2a3624d4e1c0052ba0289bf6ef4
Author: hverkuil <hverkuil@f93e8361-94ff-0310-af1b-c9b61a63ab7d>
Date:   Sun Nov 15 10:09:05 2009 +0000

    Updated ChangeLog.
    
    
    git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/trunk@4151 f93e8361-94ff-0310-af1b-c9b61a63ab7d

diff --git a/ChangeLog b/ChangeLog
index 4e3db85..d606755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+#1.1.1  - Compile fixes for latest Xorg. Thanks to Ian Armstrong and Nicolas Chauvet
+	  who did most of the work.
 #1.1.0  - No longer uses proprietary ivtv ioctls with ivtv > 1.4.0
 	- Added Xv attribute 'XV_VIDEODEVNUM'. This is read-only & contains the number 
 	  of the video device being using for output. (i.e. 48 = video48)

commit 886b3cf633060d72cdeeec19af9ed1d7e9eaf817
Author: hverkuil <hverkuil@f93e8361-94ff-0310-af1b-c9b61a63ab7d>
Date:   Sun Nov 15 10:04:09 2009 +0000

    Also update the version in configure.ac.
    
    
    git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/trunk@4150 f93e8361-94ff-0310-af1b-c9b61a63ab7d

diff --git a/configure b/configure
index 51825c4..a4eadf4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.0.
+# Generated by GNU Autoconf 2.62 for xf86-video-ivtv 1.1.1.
 #
 # Report bugs to <http://ivtvdriver.org/trac>.
 #
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-ivtv'
 PACKAGE_TARNAME='xf86-video-ivtv'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-video-ivtv 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-video-ivtv 1.1.1'
 PACKAGE_BUGREPORT='http://ivtvdriver.org/trac'
 
 ac_unique_file="Makefile.am"
@@ -1501,7 +1501,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-ivtv 1.1.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-ivtv 1.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1571,7 +1571,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-ivtv 1.1.0:";;
+     short | recursive ) echo "Configuration of xf86-video-ivtv 1.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1686,7 +1686,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-ivtv configure 1.1.0
+xf86-video-ivtv configure 1.1.1
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1700,7 +1700,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-ivtv $as_me 1.1.0, which was
+It was created by xf86-video-ivtv $as_me 1.1.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2419,7 +2419,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-ivtv'
- VERSION='1.1.0'
+ VERSION='1.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13232,7 +13232,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-ivtv $as_me 1.1.0, which was
+This file was extended by xf86-video-ivtv $as_me 1.1.1, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13285,7 +13285,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xf86-video-ivtv config.status 1.1.0
+xf86-video-ivtv config.status 1.1.1
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 3dac739..743bdd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ivtv],
-        1.1.0,
+        1.1.1,
         [http://ivtvdriver.org/trac],
         xf86-video-ivtv)
 

commit 52564f8762b43ea83c6e8b6a8694fd11c4e3b651
Author: hverkuil <hverkuil@f93e8361-94ff-0310-af1b-c9b61a63ab7d>
Date:   Sun Nov 15 09:59:25 2009 +0000

    Patch provided by Ian Armstrong:
    
    This is simply a fix to allow the driver to compile & run with the latest
    Xorg release. The version is changed to 1.1.1, but there is no functional
    difference with 1.1.0. The driver can still build & run with previous versions.
    
    Thanks should go to Nicolas Chauvet <kwizart@gmail.com> who did most of the
    work.
    
    
    git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/trunk@4149 f93e8361-94ff-0310-af1b-c9b61a63ab7d

diff --git a/Makefile.in b/Makefile.in
index 8d166fc..b092df5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,6 +164,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 abs_builddir = @abs_builddir@
diff --git a/config.h.in b/config.h.in
index 085cc0e..5fd1190 100644
--- a/config.h.in
+++ b/config.h.in
@@ -32,6 +32,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* xextproto 7.1 available */
+#undef HAVE_XEXTPROTO_71
+
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
diff --git a/configure b/configure
index 8507c57..51825c4 100755
--- a/configure
+++ b/configure
@@ -895,6 +895,10 @@ CPP
 PKG_CONFIG
 XORG_CFLAGS
 XORG_LIBS
+XEXT_CFLAGS
+XEXT_LIBS
+HAVE_XEXTPROTO_71_TRUE
+HAVE_XEXTPROTO_71_FALSE
 PCIACCESS_CFLAGS
 PCIACCESS_LIBS
 XSERVER_LIBPCIACCESS_TRUE
@@ -941,6 +945,8 @@ CPP
 PKG_CONFIG
 XORG_CFLAGS
 XORG_LIBS
+XEXT_CFLAGS
+XEXT_LIBS
 PCIACCESS_CFLAGS
 PCIACCESS_LIBS'
 
@@ -1607,6 +1613,8 @@ Some influential environment variables:
   PKG_CONFIG  path to pkg-config utility
   XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
   XORG_LIBS   linker flags for XORG, overriding pkg-config
+  XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
+  XEXT_LIBS   linker flags for XEXT, overriding pkg-config
   PCIACCESS_CFLAGS
               C compiler flags for PCIACCESS, overriding pkg-config
   PCIACCESS_LIBS
@@ -4420,13 +4428,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4423: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4431: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4426: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4434: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4429: output\"" >&5)
+  (eval echo "\"\$as_me:4437: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5537,7 +5545,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5540 "configure"' > conftest.$ac_ext
+  echo '#line 5548 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7376,11 +7384,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7379: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7383: \$? = $ac_status" >&5
+   echo "$as_me:7391: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7700,11 +7708,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7703: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7711: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7707: \$? = $ac_status" >&5
+   echo "$as_me:7715: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7805,11 +7813,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7808: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7816: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7812: \$? = $ac_status" >&5
+   echo "$as_me:7820: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7860,11 +7868,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7871: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7867: \$? = $ac_status" >&5
+   echo "$as_me:7875: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10652,7 +10660,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10655 "configure"
+#line 10663 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10752,7 +10760,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10755 "configure"
+#line 10763 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12010,6 +12018,66 @@ else
 fi
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XEXT" >&5
+$as_echo_n "checking for XEXT... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xextproto >= 7.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xextproto >= 7.0.99.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xextproto >= 7.0.99.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xextproto >= 7.0.99.1" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+else
+	pkg_failed=untried
+fi
+
+if test $pkg_failed = yes; then
+	XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xextproto >= 7.0.99.1"`
+	# Put the nasty error message in config.log where it belongs
+	echo "$XEXT_PKG_ERRORS" 1>&5
+
+	HAVE_XEXTPROTO_71="no"
+elif test $pkg_failed = untried; then
+	HAVE_XEXTPROTO_71="no"
+else
+	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
+	XEXT_LIBS=$pkg_cv_XEXT_LIBS
+	HAVE_XEXTPROTO_71="yes";
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XEXTPROTO_71 1
+_ACEOF
+
+fi
+ if  test "$HAVE_XEXTPROTO_71" = "yes" ; then
+  HAVE_XEXTPROTO_71_TRUE=
+  HAVE_XEXTPROTO_71_FALSE='#'
+else
+  HAVE_XEXTPROTO_71_TRUE='#'
+  HAVE_XEXTPROTO_71_FALSE=
+fi
+
+
 # Checks for extensions
 
 	SAVE_CFLAGS="$CFLAGS"
@@ -12828,6 +12896,13 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${HAVE_XEXTPROTO_71_TRUE}" && test -z "${HAVE_XEXTPROTO_71_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAVE_XEXTPROTO_71\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z "${XSERVER_LIBPCIACCESS_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
diff --git a/configure.ac b/configure.ac
index 1827643..3dac739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,11 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
diff --git a/src/Makefile.am b/src/Makefile.am
index f74a16a..70e7531 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @XEXT_CFLAGS@
 ivtv_drv_la_LTLIBRARIES = ivtv_drv.la
 ivtv_drv_la_LDFLAGS = -module -avoid-version
 ivtv_drv_ladir = @moduledir@/drivers
diff --git a/src/Makefile.in b/src/Makefile.in
index d63d9f8..6b247ab 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -167,6 +167,8 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
 abs_builddir = @abs_builddir@
@@ -228,7 +230,7 @@ top_srcdir = @top_srcdir@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @XEXT_CFLAGS@
 ivtv_drv_la_LTLIBRARIES = ivtv_drv.la
 ivtv_drv_la_LDFLAGS = -module -avoid-version
 ivtv_drv_ladir = @moduledir@/drivers
diff --git a/src/ivtv.c b/src/ivtv.c
index 7f18bde..0888204 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -51,8 +51,10 @@ in this Software without prior written authorization from the XFree86 Project.
 /* for visuals */
 #include "fb.h"
 
-#include "xf86Resources.h"
-#include "xf86RAC.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+# include "xf86Resources.h"
+# include "xf86RAC.h"
+#endif
 
 #ifdef XvExtension
 # include "xf86xv.h"
@@ -112,12 +114,12 @@ static int pix24bpp = 0;
 #define IVTVDEV_DRIVER_NAME	"ivtv"
 #define IVTVDEV_VERSION_MAJOR	1
 #define IVTVDEV_VERSION_MINOR	1
-#define IVTVDEV_VERSION_PATCH	0
+#define IVTVDEV_VERSION_PATCH	1
 #define IVTVDEV_VERSION	((IVTVDEV_VERSION_MAJOR << 16) | \
 			(IVTVDEV_VERSION_MINOR << 8) | \
 			(IVTVDEV_VERSION_PATCH))
 
-DriverRec IVTVDEV = {
+_X_EXPORT DriverRec IVTVDEV = {
     IVTVDEV_VERSION,
     IVTVDEV_DRIVER_NAME,
     IVTVDevIdentify,
@@ -175,7 +177,7 @@ static XF86ModuleVersionInfo IVTVDevVersRec = {
     {0, 0, 0, 0}
 };
 
-XF86ModuleData ivtvModuleData = { &IVTVDevVersRec, IVTVDevSetup, NULL };
+_X_EXPORT XF86ModuleData ivtvModuleData = { &IVTVDevVersRec, IVTVDevSetup, NULL };
 
 pointer
 IVTVDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -185,7 +187,9 @@ IVTVDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
     if (!setupDone) {
 	setupDone = TRUE;
 	xf86AddDriver(&IVTVDEV, module, 0);
+#ifndef HAVE_XEXTPROTO_71
 	LoaderRefSymLists(fbSymbols, shadowSymbols, NULL);
+#endif
 	return (pointer) 1;
     }
     if (errmaj)
@@ -403,6 +407,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
 
     devPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
+#ifndef XSERVER_LIBPCIACCESS
     pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
     /* XXX Is this right?  Can probably remove RAC_FB */
     pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
@@ -413,6 +418,7 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
 	    "DevPreInit: xf86RegisterResources() found resource conflicts\n");
 	return FALSE;
     }
+#endif
 
     /* open device */
     if (!ivtvHWInit(pScrn, NULL,
@@ -519,9 +525,12 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
 	IVTVDevFreeRec(pScrn);
 	return FALSE;
     }
+
+#ifndef HAVE_XEXTPROTO_71
     if (mod && syms) {
 	xf86LoaderReqSymLists(syms, NULL);
     }
+#endif
 
     /* Load shadow */
     xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using \"Shadow Framebuffer\"\n");
@@ -529,7 +538,10 @@ IVTVDevPreInit(ScrnInfoPtr pScrn, int flags)
 	IVTVDevFreeRec(pScrn);
 	return FALSE;
     }
+
+#ifndef HAVE_XEXTPROTO_71
     xf86LoaderReqSymLists(shadowSymbols, NULL);
+#endif
 
     TRACE_EXIT("PreInit");
     return TRUE;
diff --git a/src/ivtv_hw.c b/src/ivtv_hw.c
index 6c00be2..b50c2b0 100644
--- a/src/ivtv_hw.c
+++ b/src/ivtv_hw.c
@@ -55,8 +55,12 @@ in this Software without prior written authorization from the XFree86 Project.
 #include "xf86cmap.h"
 
 #include "globals.h"
-#define DPMS_SERVER
-#include <X11/extensions/dpms.h>
+#ifdef HAVE_XEXTPROTO_71
+# include <X11/extensions/dpmsconst.h>
+#else
+# define DPMS_SERVER
+# include <X11/extensions/dpms.h>
+#endif
 
 #if IVTVDEBUG
 # define TRACE_ENTER(str)	ErrorF("ivtv_hw: " str " %d\n",pScrn->scrnIndex)
Reply to:
Prev by Date: xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.1.1'
Next by Date: xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
Previous by thread: xserver-xorg-video-ivtvdev: Changes to 'upstream/tags/1.1.1'
Next by thread: xserver-xorg-video-ivtvdev: Changes to 'refs/tags/xserver-xorg-video-ivtvdev-1.1.1-1'
Index(es):
- Date
- Thread