From owner-svn-ports-head@freebsd.org Thu Nov 21 06:34:44 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
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 A8FEE1B047A;
Thu, 21 Nov 2019 06:34:44 +0000 (UTC)
(envelope-from yuri@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)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 47JVCm3pg9z3wdM;
Thu, 21 Nov 2019 06:34:44 +0000 (UTC)
(envelope-from yuri@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 61A86733F;
Thu, 21 Nov 2019 06:34:44 +0000 (UTC)
(envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAL6YiM2081890;
Thu, 21 Nov 2019 06:34:44 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAL6YhL4081886;
Thu, 21 Nov 2019 06:34:43 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201911210634.xAL6YhL4081886@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Thu, 21 Nov 2019 06:34:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r518077 - in head/misc/openhantek: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: in head/misc/openhantek: . files
X-SVN-Commit-Revision: 518077
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2019 06:34:44 -0000
Author: yuri
Date: Thu Nov 21 06:34:43 2019
New Revision: 518077
URL: https://svnweb.freebsd.org/changeset/ports/518077
Log:
misc/openhantek: Change to a more mantained fork OpenHantek/OpenHantek6022
This fork has some FreeBSD-specific patches in it.
Add the patch that removes libusb_set_auto_detach_kernel_driver because it causes libusb_claim_interface to fail.
Made sure that it works with the DSO-6022BE device.
Added:
head/misc/openhantek/files/
head/misc/openhantek/files/patch-openhantek_src_usb_uploadFirmware.cpp (contents, props changed)
head/misc/openhantek/pkg-message (contents, props changed)
Modified:
head/misc/openhantek/Makefile
head/misc/openhantek/distinfo
Modified: head/misc/openhantek/Makefile
==============================================================================
--- head/misc/openhantek/Makefile Thu Nov 21 05:37:53 2019 (r518076)
+++ head/misc/openhantek/Makefile Thu Nov 21 06:34:43 2019 (r518077)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= openhantek
-DISTVERSION= g20190903
+DISTVERSION= 3.0.0
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@@ -15,13 +15,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3
USES= cmake compiler:c++11-lang gl localbase qt:5
USE_GITHUB= yes
GH_ACCOUNT= OpenHantek
-GH_TAGNAME= e7e0c7b
-USE_QT= core gui opengl printsupport widgets buildtools_build qmake_build
+GH_PROJECT= OpenHantek6022 # there's also the openhantek account
+USE_QT= core gui opengl printsupport widgets buildtools_build linguist_build qmake_build
USE_GL= gl glu
PLIST_FILES= bin/OpenHantek
-
-post-patch:
- @${GREP} -rl "<libusb-1.0/libusb.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's|<libusb-1.0/libusb.h>|<libusb.h>|'
.include <bsd.port.mk>
Modified: head/misc/openhantek/distinfo
==============================================================================
--- head/misc/openhantek/distinfo Thu Nov 21 05:37:53 2019 (r518076)
+++ head/misc/openhantek/distinfo Thu Nov 21 06:34:43 2019 (r518077)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573368045
-SHA256 (OpenHantek-openhantek-g20190903-e7e0c7b_GH0.tar.gz) = c4237a4a84f0efaa889bda570f442eb08bcf1b157f0aae8da0979e6fd59d9ef5
-SIZE (OpenHantek-openhantek-g20190903-e7e0c7b_GH0.tar.gz) = 11613267
+TIMESTAMP = 1574309115
+SHA256 (OpenHantek-OpenHantek6022-3.0.0_GH0.tar.gz) = 7c756a6d3861b08a48a15fe14f633018c7ce8fba2f6a4961d5b403144f71f9e9
+SIZE (OpenHantek-OpenHantek6022-3.0.0_GH0.tar.gz) = 19666574
Added: head/misc/openhantek/files/patch-openhantek_src_usb_uploadFirmware.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/openhantek/files/patch-openhantek_src_usb_uploadFirmware.cpp Thu Nov 21 06:34:43 2019 (r518077)
@@ -0,0 +1,12 @@
+--- openhantek/src/usb/uploadFirmware.cpp.orig 2019-11-21 06:06:23 UTC
++++ openhantek/src/usb/uploadFirmware.cpp
+@@ -39,7 +39,9 @@ bool UploadFirmware::startUpload(USBDevice *device) {
+ temp_firmware_path->open();
+
+ /* We need to claim the first interface */
++#if !defined(__FreeBSD__)
+ libusb_set_auto_detach_kernel_driver(handle, 1);
++#endif
+ int status = libusb_claim_interface(handle, 0);
+ if (status != LIBUSB_SUCCESS) {
+ errorMessage = TR("libusb_claim_interface() failed: %1").arg(libusb_error_name(status));
Added: head/misc/openhantek/pkg-message
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/openhantek/pkg-message Thu Nov 21 06:34:43 2019 (r518077)
@@ -0,0 +1,38 @@
+[
+{ type: install
+ message: <<EOM
+You installed OpenHantek: the client for Hantek PC-oscilloscope.
+
+In order for OpenHantek to work you need:
+1. Have compatible device: DSO-6022, DSO-2020, etc.
+2. Make sure that your USB device has permissions for your user.
+ You can achieve this by adding a records like this to your
+ /etc/devd.conf:
+
+notify 100 {
+ match "system" "USB";
+ match "subsystem" "DEVICE";
+ match "type" "ATTACH";
+ match "vendor" "0x04b4";
+ match "product" "0x6022";
+ action "/usr/sbin/chown {your-user}:users /dev/usb/8.5.*";
+};
+notify 100 {
+ match "system" "USB";
+ match "subsystem" "DEVICE";
+ match "type" "ATTACH";
+ match "vendor" "0x04b5";
+ match "product" "0x6022";
+ action "/usr/sbin/chown {your-user}:users /dev/usb/8.5.*";
+};
+
+The "action" above doesn't use $device-name due to:
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242111
+
+Also please note that devices like this have two vendor/product id
+combinations, before and after loading the firmware, hence two
+commands above.
+
+EOM
+}
+]