Bug 133466
| Summary: | x11-drivers/input-wacom does not compile (with hack-fix) | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Kalten <kalten> | ||||
| Component: | Individual Port(s) | Assignee: | freebsd-ports-bugs (Nobody) <ports-bugs> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | ||||||
| Priority: | Normal | ||||||
| Version: | Latest | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
Maintainer of x11-drivers/input-wacom,
Please note that PR ports/133466 has just been submitted.
If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.
The full text of the PR can be found at:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133466
--
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool) I will check this out as soon as possible. I've already read the tinderbox report and there's an USB2 issue on CURRENT as well. Unfortunately I'm really buried in work, so I do not know when this will be. I approve the proposed fix. Here is the diff:
diff -Pur ports/x11-drivers/input-wacom.orig/Makefile ports/x11-drivers/input-wacom/Makefile
--- ports/x11-drivers/input-wacom.orig/Makefile 2009-04-08 10:45:59.000000000 +0200
+++ ports/x11-drivers/input-wacom/Makefile 2009-04-08 23:41:16.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME= input-wacom
PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/ \
SF
diff -Pur ports/x11-drivers/input-wacom.orig/files/patch-linuxwacom-run_configure ports/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
--- ports/x11-drivers/input-wacom.orig/files/patch-linuxwacom-run_configure 2009-04-08 10:45:59.000000000 +0200
+++ ports/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure 2009-04-08 23:40:28.000000000 +0200
@@ -9,3 +9,9 @@
rm -rf linuxwacom-${LINUXWACOM}
tar xf linuxwacom-${LINUXWACOM}.tar.bz2
+@@ -14,5 +14,5 @@
+ cp files/types.h linuxwacom-${LINUXWACOM}/src/xdrv/asm
+ cp files/input.h linuxwacom-${LINUXWACOM}/src/xdrv/linux
+ cd linuxwacom-${LINUXWACOM}
+-./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include"
++./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 --prefix=${PREFIX} --enable-dlloader CFLAGS="-I/usr/local/include -DWCM_XORG_XSERVER_1_6=true"
State Changed From-To: feedback->open Maintainer approved. State Changed From-To: open->closed Committed, thanks! pav 2009-04-09 23:10:19 UTC
FreeBSD ports repository
Modified files:
x11-drivers/input-wacom Makefile
x11-drivers/input-wacom/files patch-linuxwacom-run_configure
Log:
- Fix build with xorg-server 1.6
PR: ports/133466
Submitted by: Kalten <kalten@gmx.at>
Approved by: Dominic Fandrey <kamikaze@bsdforen.de> (maintainer)
Revision Changes Path
1.6 +1 -1 ports/x11-drivers/input-wacom/Makefile
1.3 +6 -0 ports/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
|
The driver x11-drivers/input-wacom does not compile anymore (since new Xorg, I suppose). ---SCHNIPP--- gmake[2]: Entering directory `/usr/ports/x11-drivers/input-wacom/work/linuxwacom/linuxwacom-0.8.2-2/src/xdrv' cc -I/usr/local/include -fPIC -pipe -std=c99 \ -pedantic -Wall -Wpointer-arith -fno-merge-constants \ -fno-stack-protector -I. -I../include -I/usr/local/include/xorg -I/usr/local/include \ -I/usr/local/include/xorg -I/usr/local/include/pixman-1 -I/usr/local/include \ -o xf86Wacom.o -c ./xf86Wacom.c In file included from ./xf86Wacom.c:84: ./xf86Wacom.h:30:28: error: xf86Version.h: No such file or directory ---schnapp--- I have a fresh 7.2-PRERELEASE with Version 701106 (according to /usr/share/examples/FreeBSD_version/). I did a csup on my ports on 2009_04_05 (INDEX-7.bz2 is from 13:50GMT the same day) prior to installing _any_ port. Fix: I found a dirty (?) solution: In that file linuxwacom/linuxwacom-0.8.2-2/src/xdrv/xf86Wacom.h the compiling error is happening, there is a #ifdef to distinguish the x-version: we need WCM_XORG_XSERVER_1_6 set there. It can be fixed, by changing the x11-drivers/input-wacom/files/patch-linuxwacom-run_configure file a bit. (see added patchfile) But I did not take care of older versions at all! I do not know, how to check Xorgs version to do it the right way: a better patch would be fine! BTW: as Xorg now uses hald, a policy/wacom_tablet.fdi file would be _very_ welcome! I have not managed to create one for my Bamboo Fun CTE-650 (stylus) on my own till now :-( Patch attached with submission follows: How-To-Repeat: »portinstall x11-drivers/input-wacom« or »make« in there.