Julien Cristau wrote:
That patch is (mostly) wrong. wacom should indeed use pkg-config to get
the necessary cflags, but it doesn't have to care about pixman.
The file linuxwacom/src/xdrv/xf86Wacom.c includes the file xf86.h, which
is part of the xorg package. However down the chain of includes:
In file included from /usr/include/xorg/regionstr.h:53,
from /usr/include/xorg/region.h:51,
from /usr/include/xorg/window.h:52,
from /usr/include/xorg/input.h:55,
from /usr/include/xorg/xf86str.h:38,
from /usr/include/xorg/xf86.h:45,
from xf86Wacom.h:66,
from xf86Wacom.c:71:
/usr/include/xorg/miscstruct.h:54:20: error: pixman.h: No such file or
directory
So wacom does use pixman on one hand. On the other hand,
should be PKG_CHECK_MODULES(XSERVER, [xorg-server]).
You're right on there. I realize now that it's a dependancy of xorg,
which is a dependancy of the wacom tools, but pixman is not a direct
dependancy of wacom. Sorry for the trouble. I'll rewrite the patch then,
no problem.
diff -Naur debian/wacom.control debian/wacom.control
I'm not sure what this file is for, but this change looks wrong too.
The change adds pixman as a build dependancy. But yeah I'm not sure what
that file is for either. I was just being careful.
And... yeah. This new patch successfully compiles too. Without worrying
about pixman.
diff -aur linuxwacom/configure.in linuxwacom/configure.in
--- linuxwacom/configure.in 2007-10-12 14:45:10.000000000 -0700
+++ linuxwacom/configure.in 2007-10-12 14:43:52.000000000 -0700
@@ -11,6 +11,8 @@
WCM_LIBWACOMCFG_VER="0:1:0"
AC_SUBST(WCM_LIBWACOMCFG_VER)
+PKG_PROG_PKG_CONFIG
+
dnl Targets
WCM_PROGS=""
WCM_LIBS=""
@@ -60,6 +62,9 @@
AC_WCM_CHECK_TCL
AC_WCM_CHECK_TK
+dnl Check for pixman
+PKG_CHECK_MODULES(XSERVER,[xorg-server])
+
dnl Check for ncurses
AC_WCM_CHECK_NCURSES
diff -aur linuxwacom/src/xdrv/Makefile.am linuxwacom/src/xdrv/Makefile.am
--- linuxwacom/src/xdrv/Makefile.am 2007-06-05 09:53:31.000000000 -0700
+++ linuxwacom/src/xdrv/Makefile.am 2007-10-12 14:43:00.000000000 -0700
@@ -79,6 +79,7 @@
-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
-DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \
-DNDEBUG -DFUNCPROTO=15 \
+ $(XSERVER_CFLAGS) \
-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
-o $@ -c $(srcdir)/$(subst .o,.c,$@)
