On Thursday 18 Oct 2007, Stanley Merkx wrote:
> > On Wednesday 17 Oct 2007, Stanley Merkx wrote:
> >> Requested 'xorg-server >= 1.0.99.901' but version of xorg-server is
> >> 1.0.1
> >> configure:20184: error: Package requirements (xorg-server >= 1.0.99.901
> >> xproto fontsproto ) were not met.
> >>
> >> Which is indeed right... (I knew I saw this at some point too yesterday,
> >> but couldn't find it back as it is stuck somewhere halfway the
> >> config.log)...
> >>
> >> So, nothing else to it than to upgrade? Or build X from source?
> >
> > I'm not convinced the version check is correct. Apply the attached patch
> > to the X driver & run './autogen.sh' (This will automatically rerun
> > ./configure)
>
> Okay, the patch applies cleanly and configure now runs, but then I run
> into the following error:
>
> gcc -DHAVE_CONFIG_H -I. -I. -I.. -DXFree86Server -DIN_MODULE
> -DXFree86Module -DXFree86LOADER -I/usr/include/xorg -g -O2 -MT ivtv.lo
> -MD -MP -MF .deps/ivtv.Tpo -c ivtv.c -fPIC -DPIC -o .libs/ivtv.o
> ivtv.c: In function 'IVTVshadowUpdatePacked':
> ivtv.c:202: error: 'struct _shadowBuf' has no member named 'pDamage'
> ivtv.c:202: warning: initialization makes pointer from integer without a
> cast make[2]: *** [ivtv.lo] Error 1
Okay. Reverse that patch by applying it again with the -R option. Now try this
patch instead. As before, run './autogen.sh' after applying it
--
Ian
Index: src/ivtv_hw.h
===================================================================
--- src/ivtv_hw.h (revision 4076)
+++ src/ivtv_hw.h (working copy)
@@ -91,10 +91,10 @@
#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
+#ifndef X_MODULAR
+# if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7,0,0,0,0)
+# define X_MODULAR 1
+# endif
#endif
Bool ivtvHWGetRec(ScrnInfoPtr pScrn);
Index: configure.ac
===================================================================
--- configure.ac (revision 4076)
+++ configure.ac (working copy)
@@ -47,8 +47,11 @@
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
+ [AC_DEFINE(X_MODULAR,1,[...])])
+
# 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
_______________________________________________
ivtv-devel mailing list
[email protected]
http://ivtvdriver.org/mailman/listinfo/ivtv-devel
