xserver-xorg-video-ivtvdev: Changes to 'upstream/trunk'
Makefile.in | 6 +++---
README | 9 +++++----
config.h.in | 12 ++++++++++++
configure | 33 +++++++++++++++++++++++----------
configure.ac | 5 ++++-
src/ivtv.c | 2 +-
src/ivtv_hw.h | 7 -------
src/ivtv_xv.c | 4 ++--
8 files changed, 50 insertions(+), 28 deletions(-)
New commits:
commit 48fbd819f3ba302215d69b61870de974c57fd7c2
Author: hverkuil <hverkuil@f93e8361-94ff-0310-af1b-c9b61a63ab7d>
Date: Fri Oct 19 19:17:52 2007 +0000
Allows building with some older Xorg 7.x releases.
git-svn-id: http://ivtvdriver.org/svn/xf86-video-ivtv/trunk@4079 f93e8361-94ff-0310-af1b-c9b61a63ab7d
diff --git a/Makefile.in b/Makefile.in
index ee651a5..18a8352 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,10 +52,10 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README ChangeLog $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure config.guess config.sub depcomp \
- install-sh ltmain.sh missing
+ $(top_srcdir)/configure ChangeLog config.guess config.sub \
+ depcomp install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/README b/README
index 4d52737..be744b4 100644
--- a/README
+++ b/README
@@ -40,12 +40,13 @@ So don't use that.
Xorg 7.x Servers
================
-For new 7.x servers run the configure script followed by make and then make install.
-The installation path may well need to be altered using the --prefix option.
+For new 7.x servers run the autogen.sh script followed by make and then
+make install. The installation path may well need to be altered using the
+--prefix option.
-If you get this error when running the configure script:
+If you get this error when running autogen.sh or the configure script:
-checking for XORG... configure: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto ) were not met.
+checking for XORG... configure: error: Package requirements (xorg-server xproto fontsproto ) were not met.
then it is likely that you are missing the xorg-server development
package. For Fedora this package is called 'xorg-x11-server-sdk'.
diff --git a/config.h.in b/config.h.in
index db6ccf2..b3efa5f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -50,8 +50,20 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
+
+/* Update some functions to new X parameter list */
+#undef X_NEW_PARMS
diff --git a/configure b/configure
index ca8c3f7..8735e5e 100755
--- a/configure
+++ b/configure
@@ -20015,7 +20015,6 @@ else
fi
-# Checks for pkg-config packages
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -20136,6 +20135,20 @@ echo "${ECHO_T}no" >&6; }
fi
fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define X_NEW_PARMS 1
+_ACEOF
+
+fi
+
+# Checks for pkg-config packages
pkg_failed=no
{ echo "$as_me:$LINENO: checking for XORG" >&5
@@ -20143,12 +20156,12 @@ echo $ECHO_N "checking for XORG... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20157,12 +20170,12 @@ else
fi
if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto fontsproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server xproto fontsproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20171,18 +20184,18 @@ else
fi
if test $pkg_failed = yes; then
- XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" 1>&5
- { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met.
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables
to avoid the need to call pkg-config. See the pkg-config man page for
more details." >&5
-echo "$as_me: error: Package requirements (xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) were not met.
+echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
diff --git a/configure.ac b/configure.ac
index 7cea937..acc2f8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,8 +47,11 @@ AC_ARG_WITH(xorg-module-dir,
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
+ [AC_DEFINE(X_NEW_PARMS,1,[Update some functions to new X parameter list])])
+
# 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 extensions
diff --git a/src/ivtv.c b/src/ivtv.c
index c8c0a2f..008aa5f 100644
--- a/src/ivtv.c
+++ b/src/ivtv.c
@@ -198,7 +198,7 @@ IVTVDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static void
IVTVshadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
{
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
RegionPtr damage = DamageRegion(pBuf->pDamage);
#else
RegionPtr damage = &pBuf->damage;
diff --git a/src/ivtv_hw.h b/src/ivtv_hw.h
index a7d0170..6ad0744 100644
--- a/src/ivtv_hw.h
+++ b/src/ivtv_hw.h
@@ -90,13 +90,6 @@ extern int ivtvHWPrivateIndex;
# define IVTVDEVHW_BYTE_SWAP 1
#endif
-/* FIXME - There must be a better way to do this..... */
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0)
-# define X_MODULAR 1
-#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,0,0,0,0)
-# define X_MODULAR 1
-#endif
-
Bool ivtvHWGetRec(ScrnInfoPtr pScrn);
void ivtvHWFreeRec(ScrnInfoPtr pScrn);
Bool ivtvHWProbe(pciVideoPtr pPci, char *device, char **namep);
diff --git a/src/ivtv_xv.c b/src/ivtv_xv.c
index 1a16e69..7c54352 100644
--- a/src/ivtv_xv.c
+++ b/src/ivtv_xv.c
@@ -66,7 +66,7 @@ static void IVTVStopVideo(ScrnInfoPtr, pointer, Bool);
static void IVTVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,
unsigned int *, unsigned int *, pointer);
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
static int IVTVPutImage(ScrnInfoPtr, short, short, short, short, short,
short, short, short, int, unsigned char *, short,
short, Bool, RegionPtr, pointer, DrawablePtr);
@@ -676,7 +676,7 @@ IVTVHM12ScaleYUV12(unsigned char *src, unsigned char *dst,
return (sc_x << 16) | sc_y;
}
-#ifdef X_MODULAR
+#ifdef X_NEW_PARMS
static int
IVTVPutImage(ScrnInfoPtr pScrn,
short src_x, short src_y,
Reply to: