View | Details | Raw Unified | Return to bug 191156 | Differences between
and this patch

Collapse All | Expand All

(-)x11-drivers/xf86-input-wacom/Makefile (-1 / +10 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	xf86-input-wacom
3
PORTNAME=	xf86-input-wacom
4
PORTVERSION=	0.24.99.1
4
PORTVERSION=	0.25.99.1
5
CATEGORIES=	x11-drivers
5
CATEGORIES=	x11-drivers
6
MASTER_SITES=	SF/linuxwacom/${PORTNAME}
6
MASTER_SITES=	SF/linuxwacom/${PORTNAME}
7
7
Lines 8-13 MASTER_SITES= SF/linuxwacom/${PORTNAME} Link Here
8
MAINTAINER=	jbeich@vfemail.net
8
MAINTAINER=	jbeich@vfemail.net
9
COMMENT=	X.Org Wacom tablet driver
9
COMMENT=	X.Org Wacom tablet driver
10
10
11
LICENSE=	GPLv2 # or any later version
12
11
BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
13
BUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
12
RUN_DEPENDS=	webcamd>0:${PORTSDIR}/multimedia/webcamd
14
RUN_DEPENDS=	webcamd>0:${PORTSDIR}/multimedia/webcamd
13
15
Lines 19-24 CONFIGURE_ARGS= --without-systemd-unit-dir \ Link Here
19
		--without-udev-rules-dir \
21
		--without-udev-rules-dir \
20
		--without-doxygen
22
		--without-doxygen
21
23
24
OPTIONS_DEFINE=	DEBUG TEST
25
26
DEBUG_CONFIGURE_ENABLE=debug
27
28
TEST_CONFIGURE_ENABLE=unit-tests
29
TEST_ALL_TARGET=check
30
22
post-patch:
31
post-patch:
23
	@${REINPLACE_CMD} -e 's/as_fn_error.*udev/${TRUE} &/' \
32
	@${REINPLACE_CMD} -e 's/as_fn_error.*udev/${TRUE} &/' \
24
		-e 's/dir=.*xorg-server/& \
33
		-e 's/dir=.*xorg-server/& \
(-)x11-drivers/xf86-input-wacom/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (xorg/driver/xf86-input-wacom-0.24.99.1.tar.bz2) = 4b68b1570bd6ce085010980fa1842825e5d676cd2962ec6ad2d7d5bc52149983
1
SHA256 (xorg/driver/xf86-input-wacom-0.25.99.1.tar.bz2) = 395142ebc8864ba6aa6c6bc7ce65c1f00d71ac31cef029b24fb248c34325546e
2
SIZE (xorg/driver/xf86-input-wacom-0.24.99.1.tar.bz2) = 586002
2
SIZE (xorg/driver/xf86-input-wacom-0.25.99.1.tar.bz2) = 588017
(-)x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.c (+74 lines)
Line 0 Link Here
1
--- test/fake-symbols.c~
2
+++ test/fake-symbols.c
3
@@ -92,7 +92,11 @@ xf86NameCmp(const char *s1, const char *
4
 }
5
 
6
 _X_EXPORT char *
7
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 18
8
 xf86CheckStrOption(OPTTYPE optlist, const char *name, CONST char *deflt)
9
+#else
10
+xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt)
11
+#endif
12
 {
13
     return NULL;
14
 }
15
@@ -231,7 +235,7 @@ InitValuatorAxisStruct(DeviceIntPtr dev,
16
 {
17
     return TRUE;
18
 }
19
-#else
20
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 12
21
 _X_EXPORT void
22
 InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label,
23
                        int minval, int maxval, int resolution,
24
@@ -239,6 +243,14 @@ InitValuatorAxisStruct(DeviceIntPtr dev,
25
 {
26
     return;
27
 }
28
+#else
29
+_X_EXPORT void
30
+InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label,
31
+                       int minval, int maxval, int resolution,
32
+                       int min_res, int max_res)
33
+{
34
+    return;
35
+}
36
 #endif
37
 
38
 _X_EXPORT void
39
@@ -279,7 +291,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceI
40
 _X_EXPORT int
41
 XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type,
42
                         int format, int mode, unsigned long len,
43
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 16
44
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
45
                         const void *
46
 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 12
47
                         const pointer
48
@@ -506,6 +518,7 @@ xf86UnblockSIGIO (int wasset)
49
 
50
 /* This is not the same as the X server one, but it'll do for the tests */
51
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
52
+#define InputOption InputOption_custom
53
 typedef struct _InputOption {
54
     struct _InputOption *next;
55
     char *key;
56
@@ -537,6 +550,7 @@ input_option_free_list(InputOption **opt
57
 		*opts = tmp;
58
 	}
59
 }
60
+#undef InputOption
61
 #endif
62
 
63
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 16
64
@@ -558,9 +572,9 @@ _X_EXPORT void xf86PostTouchEvent(Device
65
     uint32_t flags, const ValuatorMask *mask) {
66
 	return;
67
 }
68
+#endif
69
 
70
 _X_EXPORT void
71
 xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
72
 {
73
 }
74
-#endif
(-)x11-drivers/xf86-input-wacom/files/patch-test-fake-symbols.h (+10 lines)
Line 0 Link Here
1
--- test/fake-symbols.h~
2
+++ test/fake-symbols.h
3
@@ -2,7 +2,6 @@
4
 #include <dix.h>
5
 #include <os.h>
6
 #include <exevents.h>
7
-#include <Xprintf.h>
8
 #include <xf86.h>
9
 #include <xf86Xinput.h>
10
 #include <xf86_OSproc.h>
(-)x11-drivers/xf86-input-wacom/files/patch-test-wacom-tests.c (+19 lines)
Line 0 Link Here
1
--- test/wacom-tests.c~
2
+++ test/wacom-tests.c
3
@@ -184,7 +184,7 @@ test_normalize_pressure(void)
4
 
5
 	priv.common = &common;
6
 	priv.pInfo = &pInfo;
7
-	pInfo.name = strdupa("Wacom test device");
8
+	pInfo.name = strdup("Wacom test device");
9
 	common.wcmPressureRecalibration = 1;
10
 
11
 	priv.minPressure = 0;
12
@@ -229,6 +229,7 @@ test_normalize_pressure(void)
13
 		/* we count up, so assume normalised pressure goes up too */
14
 		assert(prev_pressure == pressure);
15
 	}
16
+	free(pInfo.name);
17
 }
18
 
19
 /**

Return to bug 191156