From owner-svn-ports-head@freebsd.org Wed Mar 17 10:01:27 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BCAE35A85B4; Wed, 17 Mar 2021 10:01:27 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0lzq51b9z3Cw6; Wed, 17 Mar 2021 10:01:27 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F9EB4D8A; Wed, 17 Mar 2021 10:01:27 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12HA1RNX035563; Wed, 17 Mar 2021 10:01:27 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12HA1Qgk035148; Wed, 17 Mar 2021 10:01:26 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202103171001.12HA1Qgk035148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 17 Mar 2021 10:01:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568637 - in head/comms: hidapi hidapi/files py-hidapi X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/comms: hidapi hidapi/files py-hidapi X-SVN-Commit-Revision: 568637 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 10:01:27 -0000 Author: tijl Date: Wed Mar 17 10:01:26 2021 New Revision: 568637 URL: https://svnweb.freebsd.org/changeset/ports/568637 Log: The libusb project has adopted hidapi. Update to their latest release, 0.10.1. Bump py-hidapi so it gets rebuilt to use new functions. Hand over to maintainer of py-hidapi so the two can be maintained together. Reported by: Corey Stephan (marquette.edu) Tested by: ehaupt Deleted: head/comms/hidapi/files/patch-libusb-hid.c Modified: head/comms/hidapi/Makefile head/comms/hidapi/distinfo head/comms/hidapi/files/patch-configure.ac head/comms/hidapi/pkg-descr head/comms/hidapi/pkg-plist head/comms/py-hidapi/Makefile Modified: head/comms/hidapi/Makefile ============================================================================== --- head/comms/hidapi/Makefile Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/hidapi/Makefile Wed Mar 17 10:01:26 2021 (r568637) @@ -2,27 +2,24 @@ PORTNAME= hidapi DISTVERSIONPREFIX= ${PORTNAME}- -DISTVERSION= 0.8.0-rc1 -PORTREVISION= 3 +DISTVERSION= 0.10.1 CATEGORIES= comms -MAINTAINER= tijl@FreeBSD.org +MAINTAINER= ehaupt@FreeBSD.org COMMENT= Library to access USB HID-class devices LICENSE= BSD3CLAUSE GPLv3 LICENSE_COMB= dual +USES= autoreconf gettext-tools iconv:wchar_t libtool localbase \ + pkgconfig + USE_GITHUB= yes -GH_ACCOUNT= signal11 +GH_ACCOUNT= libusb -USES= autoreconf gettext-tools iconv:wchar_t libtool GNU_CONFIGURE= yes -USE_LDCONFIG= yes INSTALL_TARGET= install-strip -PORTDOCS= * - -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib +USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS Modified: head/comms/hidapi/distinfo ============================================================================== --- head/comms/hidapi/distinfo Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/hidapi/distinfo Wed Mar 17 10:01:26 2021 (r568637) @@ -1,2 +1,3 @@ -SHA256 (signal11-hidapi-hidapi-0.8.0-rc1_GH0.tar.gz) = 3c147200bf48a04c1e927cd81589c5ddceff61e6dac137a605f6ac9793f4af61 -SIZE (signal11-hidapi-hidapi-0.8.0-rc1_GH0.tar.gz) = 101833 +TIMESTAMP = 1615890404 +SHA256 (libusb-hidapi-hidapi-0.10.1_GH0.tar.gz) = f71dd8a1f46979c17ee521bc2117573872bbf040f8a4750e492271fc141f2644 +SIZE (libusb-hidapi-hidapi-0.10.1_GH0.tar.gz) = 119581 Modified: head/comms/hidapi/files/patch-configure.ac ============================================================================== --- head/comms/hidapi/files/patch-configure.ac Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/hidapi/files/patch-configure.ac Wed Mar 17 10:01:26 2021 (r568637) @@ -1,18 +1,18 @@ ---- configure.ac.orig 2013-10-06 22:43:37 UTC +--- configure.ac.orig 2020-11-24 11:39:27 UTC +++ configure.ac -@@ -89,11 +89,11 @@ case $host in +@@ -82,13 +82,11 @@ case $host in os="freebsd" threads="pthreads" - CFLAGS="$CFLAGS -I/usr/local/include" - LDFLAGS="$LDFLAGS -L/usr/local/lib" - LIBS="${LIBS}" - AC_CHECK_LIB([usb], [libusb_init], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -lusb"], [hidapi_lib_error libusb]) + PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9], true, [hidapi_lib_error libusb-1.0]) + LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} $libusb_LIBS" + CFLAGS_LIBUSB="${CFLAGS_LIBUSB} $libusb_CFLAGS" - AC_CHECK_LIB([iconv], [iconv_open], [LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} -liconv"], [hidapi_lib_error libiconv]) -+ AC_CHECK_DECLS([libusb_get_string_descriptor], [], [], [[#include ]]) -+ AC_CHECK_DECLS([libusb_handle_events_completed], [], [], [[#include ]]) + AM_ICONV + LIBS_LIBUSB_PRIVATE="${LIBS_LIBUSB_PRIVATE} ${LTLIBICONV}" - echo libs_priv: $LIBS_LIBUSB_PRIVATE ;; - *-mingw*) + *-kfreebsd*) + AC_MSG_RESULT([ (kFreeBSD back-end)]) Modified: head/comms/hidapi/pkg-descr ============================================================================== --- head/comms/hidapi/pkg-descr Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/hidapi/pkg-descr Wed Mar 17 10:01:26 2021 (r568637) @@ -3,4 +3,4 @@ work with USB HID-Class devices. While it can be used with standard HID devices like keyboards, mice, and joysticks, it is most useful when used with custom (Vendor-Defined) HID devices. -WWW: http://www.signal11.us/oss/hidapi/ +WWW: https://github.com/libusb/hidapi Modified: head/comms/hidapi/pkg-plist ============================================================================== --- head/comms/hidapi/pkg-plist Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/hidapi/pkg-plist Wed Mar 17 10:01:26 2021 (r568637) @@ -4,3 +4,9 @@ lib/libhidapi.so lib/libhidapi.so.0 lib/libhidapi.so.0.0.0 libdata/pkgconfig/hidapi.pc +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-bsd.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-gpl3.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-orig.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt +%%PORTDOCS%%%%DOCSDIR%%/README.md Modified: head/comms/py-hidapi/Makefile ============================================================================== --- head/comms/py-hidapi/Makefile Wed Mar 17 08:07:45 2021 (r568636) +++ head/comms/py-hidapi/Makefile Wed Mar 17 10:01:26 2021 (r568637) @@ -3,6 +3,7 @@ PORTNAME= hidapi PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= comms python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}