Index: x11/libwacom/Makefile =================================================================== --- x11/libwacom/Makefile +++ x11/libwacom/Makefile @@ -2,23 +2,25 @@ # $FreeBSD$ PORTNAME= libwacom -PORTVERSION= 0.32 DISTVERSIONPREFIX=libwacom- +DISTVERSION= 1.2 CATEGORIES= x11 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= c70cb56f1670.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/216 + MAINTAINER= x11@FreeBSD.org COMMENT= Adds tablet support to libinput LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libgudev-1.0.so:devel/libgudev USE_GITHUB= yes GH_ACCOUNT= linuxwacom -USES= autoreconf gettext-runtime gmake gnome libtool localbase \ +USES= autoreconf gettext-runtime gmake gnome libtool \ pkgconfig pathfix tar:bzip2 USE_GNOME= glib20 GNU_CONFIGURE= yes @@ -26,6 +28,7 @@ INSTALL_TARGET= install-strip post-patch: - @${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' ${WRKSRC}/data/Makefile.am + @${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' \ + ${WRKSRC}/data/Makefile.am ${WRKSRC}/data/layouts/Makefile.am .include Index: x11/libwacom/distinfo =================================================================== --- x11/libwacom/distinfo +++ x11/libwacom/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1546211624 -SHA256 (linuxwacom-libwacom-libwacom-0.32_GH0.tar.gz) = 316ea0985260ec95884bf6c5cd3e962f344ef1d43dd3fbed6d95555fdb3e4aca -SIZE (linuxwacom-libwacom-libwacom-0.32_GH0.tar.gz) = 120925 +TIMESTAMP = 1577051129 +SHA256 (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) = 102fd9c8a9ae30d76003ed58df0fb349625d49697c7c7c4e1aacf85d58039f9f +SIZE (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) = 110520 +SHA256 (c70cb56f1670.patch) = b4699568234c4ba6696ebcd8b3a56b950285bc9db4b03fb68c31c6e1aea20d1b +SIZE (c70cb56f1670.patch) = 820 Index: x11/libwacom/pkg-plist =================================================================== --- x11/libwacom/pkg-plist +++ x11/libwacom/pkg-plist @@ -4,8 +4,11 @@ lib/libwacom.so lib/libwacom.so.2 lib/libwacom.so.2.6.1 +lib/udev/rules.d/65-libwacom.rules libdata/pkgconfig/libwacom.pc man/man1/libwacom-list-local-devices.1.gz +%%DATADIR%%/bamboo-0fg-m-p-alt.tablet +%%DATADIR%%/bamboo-0fg-s-p-alt.tablet %%DATADIR%%/bamboo-0fg-s-p.tablet %%DATADIR%%/bamboo-16fg-m-pt.tablet %%DATADIR%%/bamboo-16fg-s-p.tablet @@ -23,15 +26,18 @@ %%DATADIR%%/bamboo-4fg-s-t.tablet %%DATADIR%%/bamboo-4fg-se-m-pt.tablet %%DATADIR%%/bamboo-4fg-se-s-pt.tablet +%%DATADIR%%/bamboo-one-m-p.tablet %%DATADIR%%/bamboo-one.tablet %%DATADIR%%/bamboo-pad-wireless.tablet %%DATADIR%%/bamboo-pad.tablet %%DATADIR%%/cintiq-12wx.tablet %%DATADIR%%/cintiq-13hd.tablet %%DATADIR%%/cintiq-13hdt.tablet +%%DATADIR%%/cintiq-16.tablet %%DATADIR%%/cintiq-20wsx.tablet %%DATADIR%%/cintiq-21ux.tablet %%DATADIR%%/cintiq-21ux2.tablet +%%DATADIR%%/cintiq-22.tablet %%DATADIR%%/cintiq-22hd.tablet %%DATADIR%%/cintiq-22hdt.tablet %%DATADIR%%/cintiq-24hd-touch.tablet @@ -53,6 +59,7 @@ %%DATADIR%%/dth-2452.tablet %%DATADIR%%/dti-520.tablet %%DATADIR%%/dtk-1651.tablet +%%DATADIR%%/dtk-1660e.tablet %%DATADIR%%/dtk-2241.tablet %%DATADIR%%/dtk-2451.tablet %%DATADIR%%/dtu-1031.tablet @@ -63,9 +70,16 @@ %%DATADIR%%/dtu-1931.tablet %%DATADIR%%/dtu-2231.tablet %%DATADIR%%/ek-remote.tablet +%%DATADIR%%/elan-2072.tablet %%DATADIR%%/elan-22e2.tablet %%DATADIR%%/elan-24db.tablet %%DATADIR%%/elan-2537.tablet +%%DATADIR%%/elan-2627.tablet +%%DATADIR%%/elan-2628.tablet +%%DATADIR%%/elan-264c.tablet +%%DATADIR%%/elan-29a1.tablet +%%DATADIR%%/elan-29b6.tablet +%%DATADIR%%/elan-5515.tablet %%DATADIR%%/generic.tablet %%DATADIR%%/graphire-usb.tablet %%DATADIR%%/graphire-wireless-8x6.tablet @@ -75,6 +89,7 @@ %%DATADIR%%/graphire3-6x8.tablet %%DATADIR%%/graphire4-4x5.tablet %%DATADIR%%/graphire4-6x8.tablet +%%DATADIR%%/huion-h420.tablet %%DATADIR%%/huion-h610-pro.tablet %%DATADIR%%/intuos-12x12.tablet %%DATADIR%%/intuos-12x18.tablet @@ -87,10 +102,9 @@ %%DATADIR%%/intuos-m-p3.tablet %%DATADIR%%/intuos-m-pt.tablet %%DATADIR%%/intuos-m-pt2.tablet -%%DATADIR%%/intuos-pro-2-l-wl.tablet %%DATADIR%%/intuos-pro-2-l.tablet -%%DATADIR%%/intuos-pro-2-m-wl.tablet %%DATADIR%%/intuos-pro-2-m.tablet +%%DATADIR%%/intuos-pro-2-s.tablet %%DATADIR%%/intuos-pro-l.tablet %%DATADIR%%/intuos-pro-m.tablet %%DATADIR%%/intuos-pro-s.tablet @@ -133,8 +147,10 @@ %%DATADIR%%/isdv4-117.tablet %%DATADIR%%/isdv4-124.tablet %%DATADIR%%/isdv4-12c.tablet +%%DATADIR%%/isdv4-2d1f-002e.tablet %%DATADIR%%/isdv4-4004.tablet %%DATADIR%%/isdv4-4800.tablet +%%DATADIR%%/isdv4-4806.tablet %%DATADIR%%/isdv4-4807.tablet %%DATADIR%%/isdv4-4809.tablet %%DATADIR%%/isdv4-4814.tablet @@ -142,9 +158,15 @@ %%DATADIR%%/isdv4-4822.tablet %%DATADIR%%/isdv4-4824.tablet %%DATADIR%%/isdv4-4831.tablet +%%DATADIR%%/isdv4-4841.tablet %%DATADIR%%/isdv4-484c.tablet %%DATADIR%%/isdv4-485e.tablet +%%DATADIR%%/isdv4-4865.tablet %%DATADIR%%/isdv4-486a.tablet +%%DATADIR%%/isdv4-4870.tablet +%%DATADIR%%/isdv4-488f.tablet +%%DATADIR%%/isdv4-48c9.tablet +%%DATADIR%%/isdv4-48ed.tablet %%DATADIR%%/isdv4-5000.tablet %%DATADIR%%/isdv4-5002.tablet %%DATADIR%%/isdv4-5010.tablet @@ -163,14 +185,32 @@ %%DATADIR%%/isdv4-50b4.tablet %%DATADIR%%/isdv4-50b6.tablet %%DATADIR%%/isdv4-50b8.tablet +%%DATADIR%%/isdv4-50db.tablet +%%DATADIR%%/isdv4-50e9.tablet +%%DATADIR%%/isdv4-50ef.tablet %%DATADIR%%/isdv4-50f1.tablet %%DATADIR%%/isdv4-50f8.tablet %%DATADIR%%/isdv4-50fd.tablet %%DATADIR%%/isdv4-5110.tablet +%%DATADIR%%/isdv4-5115.tablet %%DATADIR%%/isdv4-5122.tablet +%%DATADIR%%/isdv4-5128.tablet +%%DATADIR%%/isdv4-513b.tablet %%DATADIR%%/isdv4-5146.tablet +%%DATADIR%%/isdv4-5147.tablet %%DATADIR%%/isdv4-5150.tablet +%%DATADIR%%/isdv4-5157.tablet +%%DATADIR%%/isdv4-5158.tablet +%%DATADIR%%/isdv4-515a.tablet +%%DATADIR%%/isdv4-5169.tablet %%DATADIR%%/isdv4-516b.tablet +%%DATADIR%%/isdv4-517d.tablet +%%DATADIR%%/isdv4-5196.tablet +%%DATADIR%%/isdv4-51af.tablet +%%DATADIR%%/isdv4-51be.tablet +%%DATADIR%%/isdv4-51bf.tablet +%%DATADIR%%/isdv4-51c4.tablet +%%DATADIR%%/isdv4-51e2.tablet %%DATADIR%%/isdv4-90.tablet %%DATADIR%%/isdv4-93.tablet %%DATADIR%%/isdv4-e2.tablet @@ -180,8 +220,85 @@ %%DATADIR%%/isdv4-ec.tablet %%DATADIR%%/isdv4-ed.tablet %%DATADIR%%/isdv4-ef.tablet +%%DATADIR%%/layouts/bamboo-0fg-s-p-alt.svg +%%DATADIR%%/layouts/bamboo-0fg-s-p.svg +%%DATADIR%%/layouts/bamboo-16fg-m-pt.svg +%%DATADIR%%/layouts/bamboo-16fg-s-pt.svg +%%DATADIR%%/layouts/bamboo-16fg-s-t.svg +%%DATADIR%%/layouts/bamboo-2fg-fun-m-pt.svg +%%DATADIR%%/layouts/bamboo-2fg-fun-s-pt.svg +%%DATADIR%%/layouts/bamboo-2fg-s-pt.svg +%%DATADIR%%/layouts/bamboo-2fg-s-t.svg +%%DATADIR%%/layouts/bamboo-4fg-fun-m-pt.svg +%%DATADIR%%/layouts/bamboo-4fg-fun-s-pt.svg +%%DATADIR%%/layouts/bamboo-4fg-s-pt.svg +%%DATADIR%%/layouts/bamboo-4fg-s-t.svg +%%DATADIR%%/layouts/bamboo-4fg-se-m-pt.svg +%%DATADIR%%/layouts/bamboo-4fg-se-s-pt.svg +%%DATADIR%%/layouts/bamboo-pad.svg +%%DATADIR%%/layouts/cintiq-12wx.svg +%%DATADIR%%/layouts/cintiq-13hd.svg +%%DATADIR%%/layouts/cintiq-20wsx.svg +%%DATADIR%%/layouts/cintiq-21ux.svg +%%DATADIR%%/layouts/cintiq-21ux2.svg +%%DATADIR%%/layouts/cintiq-22hd.svg +%%DATADIR%%/layouts/cintiq-24hd.svg +%%DATADIR%%/layouts/cintiq-companion-2.svg +%%DATADIR%%/layouts/cintiq-companion-hybrid.svg +%%DATADIR%%/layouts/cintiq-companion.svg +%%DATADIR%%/layouts/dth-2242.svg +%%DATADIR%%/layouts/dth-2452.svg +%%DATADIR%%/layouts/dti-520.svg +%%DATADIR%%/layouts/dtk-1651.svg +%%DATADIR%%/layouts/dtk-2451.svg +%%DATADIR%%/layouts/dtu-1031.svg +%%DATADIR%%/layouts/dtu-1141.svg +%%DATADIR%%/layouts/dtu-1141b.svg +%%DATADIR%%/layouts/ek-remote.svg +%%DATADIR%%/layouts/graphire-wireless-8x6.svg +%%DATADIR%%/layouts/graphire4-4x5.svg +%%DATADIR%%/layouts/graphire4-6x8.svg +%%DATADIR%%/layouts/huion-h420.svg +%%DATADIR%%/layouts/huion-h610-pro.svg +%%DATADIR%%/layouts/intuos-m-p.svg +%%DATADIR%%/layouts/intuos-m-p2.svg +%%DATADIR%%/layouts/intuos-m-p3.svg +%%DATADIR%%/layouts/intuos-m-pt.svg +%%DATADIR%%/layouts/intuos-m-pt2.svg +%%DATADIR%%/layouts/intuos-pro-2-l.svg +%%DATADIR%%/layouts/intuos-pro-2-m.svg +%%DATADIR%%/layouts/intuos-pro-2-s.svg +%%DATADIR%%/layouts/intuos-pro-l.svg +%%DATADIR%%/layouts/intuos-pro-m.svg +%%DATADIR%%/layouts/intuos-pro-s.svg +%%DATADIR%%/layouts/intuos-s-p.svg +%%DATADIR%%/layouts/intuos-s-p2.svg +%%DATADIR%%/layouts/intuos-s-p3.svg +%%DATADIR%%/layouts/intuos-s-pt.svg +%%DATADIR%%/layouts/intuos-s-pt2.svg +%%DATADIR%%/layouts/intuos3-12x12.svg +%%DATADIR%%/layouts/intuos3-12x19.svg +%%DATADIR%%/layouts/intuos3-4x5.svg +%%DATADIR%%/layouts/intuos3-4x6.svg +%%DATADIR%%/layouts/intuos3-6x11.svg +%%DATADIR%%/layouts/intuos3-6x8.svg +%%DATADIR%%/layouts/intuos3-9x12.svg +%%DATADIR%%/layouts/intuos4-12x19.svg +%%DATADIR%%/layouts/intuos4-4x6.svg +%%DATADIR%%/layouts/intuos4-6x9-wl.svg +%%DATADIR%%/layouts/intuos4-6x9.svg +%%DATADIR%%/layouts/intuos4-8x13.svg +%%DATADIR%%/layouts/intuos5-l.svg +%%DATADIR%%/layouts/intuos5-m.svg +%%DATADIR%%/layouts/intuos5-s.svg +%%DATADIR%%/layouts/mobilestudio-pro-13.svg +%%DATADIR%%/layouts/mobilestudio-pro-16.svg +%%DATADIR%%/layouts/xp-pen-star03.svg %%DATADIR%%/libwacom.stylus +%%DATADIR%%/mobilestudio-pro-13-2.tablet %%DATADIR%%/mobilestudio-pro-13.tablet +%%DATADIR%%/mobilestudio-pro-16-2.tablet +%%DATADIR%%/mobilestudio-pro-16-3.tablet %%DATADIR%%/mobilestudio-pro-16.tablet %%DATADIR%%/n-trig-pen.tablet %%DATADIR%%/one-by-wacom-m-p.tablet