I was shocked to see the wacom input driver hadn't been compiled for the
latest ABI, so I went and compiled it myself, fixed the problems that
were stopping it from compiling. pixman (whatever that is) is a
pkg-config package in the new xorg system, so anything that uses it (aka
wacom-tools) has to do the pkg-config niceties in the configuration and
makefiles. Also if we're using it we should depend on libpixman. So
that's what this patch does. I successfully built and installed the
packages after compiling this patch, though someone who knows more about
pixman might be able to minimize those compiler warnings.
After applying the attached patch (-p0) you have to run aclocal,
automake and autoconf again. I didn't want to include auto-generated
output in my patch.
diff -Naur linuxwacom/configure.in linuxwacom/configure.in
--- linuxwacom/configure.in 2007-10-12 12:37:40.000000000 -0700
+++ linuxwacom/configure.in 2007-10-12 12:18:47.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(PIXMAN,[pixman-1])
+
dnl Check for ncurses
AC_WCM_CHECK_NCURSES
diff -Naur 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 12:23:36.000000000 -0700
@@ -79,6 +79,7 @@
-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
-DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \
-DNDEBUG -DFUNCPROTO=15 \
+ $(PIXMAN_CFLAGS) \
-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
-o $@ -c $(srcdir)/$(subst .o,.c,$@)
diff -Naur debian/control debian/control
--- debian/control 2007-10-12 12:37:40.000000000 -0700
+++ debian/control 2007-10-12 12:46:04.000000000 -0700
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Ron Lee <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), po-debconf, xserver-xorg-dev, libxi-dev, libxt-dev, libncurses5-dev
+Build-Depends: debhelper (>= 5.0.0), po-debconf, xserver-xorg-dev, libxi-dev, libxt-dev, libncurses5-dev, libpixman-1-dev
Standards-Version: 3.7.2.2
Package: wacom-kernel-source
@@ -28,7 +28,7 @@
Package: xserver-xorg-input-wacom
Section: x11
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libpixman-1
Description: X.Org X server -- wacom input driver
This package provides the driver for wacom tablet devices.
.
diff -Naur debian/wacom.control debian/wacom.control
--- debian/wacom.control 2007-10-12 12:37:40.000000000 -0700
+++ debian/wacom.control 2007-10-12 12:44:34.000000000 -0700
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Ron Lee <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: libpixman-1-dev (>= 0.9.5-2) debhelper (>= 5.0.0)
Standards-Version: 3.7.2.0
Package: wacom-kernel-modules-${kpkg:Kernel-Version}
