Attachment 161109 Details for Bug 196978 – cleanup, v2 (shar, 3 ports)

cleanup, v2 (shar, 3 ports)

evdev-ports.cleanup.v2.shar (text/plain), 9.09 KB, created by Jan Beich on 2015-09-16 07:47:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-09-16 07:47:40 UTC

Size: 9.09 KB

patch

obsolete

>#!/bin/sh
># This is a shell archive
>echo x devel/libevdev
>mkdir -p devel/libevdev > /dev/null 2>&1
>echo x devel/libevdev/distinfo
>sed 's/^X//' > devel/libevdev/distinfo << 'SHAR_END'
>XSHA256 (libevdev-1.4.4.tar.xz) = ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9
>XSIZE (libevdev-1.4.4.tar.xz) = 409856
>SHAR_END
>echo x devel/libevdev/pkg-descr
>sed 's/^X//' > devel/libevdev/pkg-descr << 'SHAR_END'
>Xlibevdev is a wrapper library for evdev devices. It moves the common
>Xtasks when dealing with evdev devices into a library and provides a
>Xlibrary interface to the callers, thus avoiding erroneous ioctls, etc.
>X
>XThe eventual goal is that libevdev wraps all ioctls available to evdev
>Xdevices, thus making direct access unnecessary.
>X
>XWWW: http://www.freedesktop.org/wiki/Software/libevdev
>SHAR_END
>echo x devel/libevdev/Makefile
>sed 's/^X//' > devel/libevdev/Makefile << 'SHAR_END'
>X# $FreeBSD$
>X
>XPORTNAME=	libevdev
>XPORTVERSION=	1.4.4
>XCATEGORIES=	devel
>XMASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/
>X
>XMAINTAINER=	hselasky@FreeBSD.org
>XCOMMENT=	Linux Event Device library
>X
>XLICENSE=	MIT # without linux/*.h
>XLICENSE_FILE=	${WRKSRC}/COPYING
>X
>XBUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
>XRUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
>X
>XUSES=		gmake libtool pathfix pkgconfig python:build tar:xz
>XEXTRACT_AFTER_ARGS=	--exclude include # v4l_compat
>XGNU_CONFIGURE=	yes
>XCONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
>XCPPFLAGS+=	-I${LOCALBASE}/include # v4l_compat
>XINSTALL_TARGET=	install-strip
>XUSE_LDCONFIG=	yes
>X
>Xpost-patch:
>X	@${REINPLACE_CMD} -e '/input\.h/s,top_srcdir,LOCALBASE,' \
>X		${WRKSRC}/libevdev/Makefile.in
>X# XXX tools require signalfd(2), test require /dev/uinput
>X	@${REINPLACE_CMD} -e '/^SUBDIRS/s,tools test,,' \
>X		${WRKSRC}/Makefile.in
>X
>X.include <bsd.port.mk>
>SHAR_END
>echo x devel/libevdev/pkg-plist
>sed 's/^X//' > devel/libevdev/pkg-plist << 'SHAR_END'
>Xinclude/libevdev-1.0/libevdev/libevdev-uinput.h
>Xinclude/libevdev-1.0/libevdev/libevdev.h
>Xlib/libevdev.a
>Xlib/libevdev.so
>Xlib/libevdev.so.2
>Xlib/libevdev.so.2.1.10
>Xlibdata/pkgconfig/libevdev.pc
>Xman/man3/libevdev.3.gz
>SHAR_END
>echo x devel/libmtdev
>mkdir -p devel/libmtdev > /dev/null 2>&1
>echo x devel/libmtdev/distinfo
>sed 's/^X//' > devel/libmtdev/distinfo << 'SHAR_END'
>XSHA256 (mtdev-1.1.5.tar.bz2) = 6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f
>XSIZE (mtdev-1.1.5.tar.bz2) = 274162
>SHAR_END
>echo x devel/libmtdev/pkg-plist
>sed 's/^X//' > devel/libmtdev/pkg-plist << 'SHAR_END'
>Xbin/mtdev-test
>Xinclude/mtdev-mapping.h
>Xinclude/mtdev-plumbing.h
>Xinclude/mtdev.h
>Xlib/libmtdev.a
>Xlib/libmtdev.so
>Xlib/libmtdev.so.1
>Xlib/libmtdev.so.1.0.0
>Xlibdata/pkgconfig/mtdev.pc
>SHAR_END
>echo x devel/libmtdev/Makefile
>sed 's/^X//' > devel/libmtdev/Makefile << 'SHAR_END'
>X# $FreeBSD$
>X
>XPORTNAME=	mtdev
>XPORTVERSION=	1.1.5
>XCATEGORIES=	devel
>XMASTER_SITES=	http://bitmath.org/code/${PORTNAME}/
>XPKGNAMEPREFIX=	lib
>X
>XMAINTAINER=	hselasky@FreeBSD.org
>XCOMMENT=	Multitouch Protocol Translation Library
>X
>XLICENSE=	MIT
>XLICENSE_FILE=	${WRKSRC}/COPYING
>X
>XBUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
>XRUN_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
>X
>XUSES=		libtool pathfix tar:bz2
>XGNU_CONFIGURE=	yes
>XCPPFLAGS+=	-I${LOCALBASE}/include # v4l_compat
>XINSTALL_TARGET=	install-strip
>XUSE_LDCONFIG=	yes
>X
>X.include <bsd.port.mk>
>SHAR_END
>echo x devel/libmtdev/pkg-descr
>sed 's/^X//' > devel/libmtdev/pkg-descr << 'SHAR_END'
>XThe mtdev is a stand-alone library which transforms all variants of
>Xkernel MT events to the slotted type B protocol. The events put into
>Xmtdev may be from any MT device, specifically type A without contact
>Xtracking, type A with contact tracking, or type B with contact
>Xtracking. See the kernel documentation for further details.
>X
>XWWW: http://bitmath.org/code/mtdev/
>SHAR_END
>echo x devel/libmtdev/files
>mkdir -p devel/libmtdev/files > /dev/null 2>&1
>echo x devel/libmtdev/files/patch-src_common.h
>sed 's/^X//' > devel/libmtdev/files/patch-src_common.h << 'SHAR_END'
>X--- src/common.h.orig	2013-07-31 17:25:50 UTC
>X+++ src/common.h
>X@@ -33,7 +33,7 @@
>X 
>X #include <mtdev-mapping.h>
>X #include <mtdev-plumbing.h>
>X-#include <malloc.h>
>X+#include <stdlib.h>
>X #include <string.h>
>X #include <errno.h>
>X 
>SHAR_END
>echo x x11-drivers/xf86-input-evdev
>mkdir -p x11-drivers/xf86-input-evdev > /dev/null 2>&1
>echo x x11-drivers/xf86-input-evdev/files
>mkdir -p x11-drivers/xf86-input-evdev/files > /dev/null 2>&1
>echo x x11-drivers/xf86-input-evdev/distinfo
>sed 's/^X//' > x11-drivers/xf86-input-evdev/distinfo << 'SHAR_END'
>XSHA256 (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec
>XSIZE (xorg/driver/xf86-input-evdev-2.9.2.tar.bz2) = 387095
>SHAR_END
>echo x x11-drivers/xf86-input-evdev/Makefile
>sed 's/^X//' > x11-drivers/xf86-input-evdev/Makefile << 'SHAR_END'
>X# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 374982 2014-12-19 23:03:54Z dumbbell $
>X
>XPORTNAME=	xf86-input-evdev
>XPORTVERSION=	2.9.2
>XCATEGORIES=	x11-drivers
>X
>XMAINTAINER=	x11@FreeBSD.org
>XCOMMENT=	X.Org event device input driver
>X
>XLICENSE=	MIT # various styles
>XLICENSE_FILE=	${WRKSRC}/COPYING
>X
>XBUILD_DEPENDS=	v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
>XLIB_DEPENDS=	libevdev.so:${PORTSDIR}/devel/libevdev
>XRUN_DEPENDS=	webcamd>=3.1.0.1:${PORTSDIR}/multimedia/webcamd
>X
>XXORG_CAT=	driver
>XUSES=		pathfix
>XCONFIGURE_ENV=	UDEV_CFLAGS=" " UDEV_LIBS=" "
>XINSTALL_TARGET=	install-strip
>X
>XOPTIONS_DEFINE=	MULTITOUCH
>X
>XMULTITOUCH_DESC=	XInput 2.2 multitouch support
>XMULTITOUCH_LIB_DEPENDS=	libmtdev.so:${PORTSDIR}/devel/libmtdev
>X
>Xpost-patch-MULTITOUCH-off:
>X# XXX Convert to CONFIGURE_ENV
>X	@${REINPLACE_CMD} '/PKG_CONFIG/s/mtdev/nonexistent/' \
>X		${WRKSRC}/configure
>X
>X.include <bsd.port.mk>
>SHAR_END
>echo x x11-drivers/xf86-input-evdev/pkg-descr
>sed 's/^X//' > x11-drivers/xf86-input-evdev/pkg-descr << 'SHAR_END'
>XThis package contains the X.Org xf86-input-evdev driver. It supports
>Xall input devices that webcamd knows about, including tablets,
>Xtouchscreens, joysticks and HIDs.
>X
>XWWW: http://www.x.org
>SHAR_END
>echo x x11-drivers/xf86-input-evdev/pkg-plist
>sed 's/^X//' > x11-drivers/xf86-input-evdev/pkg-plist << 'SHAR_END'
>Xinclude/xorg/evdev-properties.h
>Xlib/xorg/modules/input/evdev_drv.so
>Xlibdata/pkgconfig/xorg-evdev.pc
>Xman/man4/evdev.4x.gz
>SHAR_END
>echo x x11-drivers/xf86-input-evdev/files/patch-src_evdev.c
>sed 's/^X//' > x11-drivers/xf86-input-evdev/files/patch-src_evdev.c << 'SHAR_END'
>X--- src/evdev.c.orig	2015-03-27 01:35:50 UTC
>X+++ src/evdev.c
>X@@ -37,9 +37,13 @@
>X #include <X11/keysym.h>
>X #include <X11/extensions/XI.h>
>X 
>X+#ifdef __linux__
>X #include <linux/version.h>
>X+#endif
>X #include <sys/stat.h>
>X+#ifdef HAVE_LIBUDEV
>X #include <libudev.h>
>X+#endif
>X #include <unistd.h>
>X #include <errno.h>
>X #include <fcntl.h>
>X@@ -222,6 +226,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo)
>X static BOOL
>X EvdevDeviceIsVirtual(const char* devicenode)
>X {
>X+#ifdef HAVE_LIBUDEV
>X     struct udev *udev = NULL;
>X     struct udev_device *device = NULL;
>X     struct stat st;
>X@@ -252,6 +257,9 @@ out:
>X     udev_device_unref(device);
>X     udev_unref(udev);
>X     return rc;
>X+#else
>X+    return FALSE;
>X+#endif
>X }
>X 
>X #ifndef HAVE_SMOOTH_SCROLLING
>X@@ -1086,11 +1094,13 @@ EvdevReadInput(InputInfoPtr pInfo)
>X     do {
>X         rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
>X         if (rc < 0) {
>X-            if (rc == -ENODEV) /* May happen after resume */
>X+            if (rc != -EAGAIN && rc != -EINTR && rc != -EWOULDBLOCK) {
>X+                /* May happen after resume or at device detach */
>X                 xf86RemoveEnabledDevice(pInfo);
>X-            else if (rc != -EAGAIN)
>X+                EvdevCloseDevice(pInfo);
>X                 LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error: %s\n", pInfo->name,
>X                                        strerror(-rc));
>X+            }
>X             break;
>X         } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
>X #ifdef MULTITOUCH
>X@@ -1470,10 +1480,15 @@ EvdevAddAbsValuatorClass(DeviceIntPtr de
>X             continue;
>X 
>X         abs = libevdev_get_abs_info(pEvdev->dev, axis);
>X+#ifdef __linux__
>X #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
>X         /* Kernel provides units/mm, X wants units/m */
>X         resolution = abs->resolution * 1000;
>X #endif
>X+#else
>X+        /* Kernel provides units/mm, X wants units/m */
>X+        resolution = abs->resolution * 1000;
>X+#endif
>X 
>X         xf86InitValuatorAxisStruct(device, axnum,
>X                                    atoms[axnum],
>SHAR_END
>echo x x11-drivers/xf86-input-evdev/files/patch-src_evdev.h
>sed 's/^X//' > x11-drivers/xf86-input-evdev/files/patch-src_evdev.h << 'SHAR_END'
>X--- src/evdev.h.orig	2015-03-27 01:35:50 UTC
>X+++ src/evdev.h
>X@@ -36,7 +36,15 @@
>X #define EVDEV_H
>X 
>X #include <linux/input.h>
>X-#include <linux/types.h>
>X+#include <sys/types.h>
>X+
>X+/* XXX Copied from <xf86str.h> for linux */
>X+/* Tolerate prior #include <linux/input.h> */
>X+#undef BUS_NONE
>X+#undef BUS_PCI
>X+#undef BUS_SBUS
>X+#undef BUS_PLATFORM
>X+#undef BUS_last
>X 
>X #include <xorg-server.h>
>X #include <xf86Xinput.h>
>SHAR_END
>exit

Actions: View

Attachments on bug 196978: 151994 | 160722 | 161107 | 161109