From nobody Sun Mar 20 19:44:23 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40F4D1A1D865; Sun, 20 Mar 2022 19:44:24 +0000 (UTC) (envelope-from git@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 4KM7Vc1Lhzz3C7D; Sun, 20 Mar 2022 19:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647805464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=btRvb9aWqZCRExLTQpLU6E2a5BCmz4LtfXuTLveMDYY=; b=NdGP3Xb+JKAZTpuHsewjeHWDeM24UNwhiDWdcEHgY8l3Qt7hhpB15qUFbawlRnidCz6Lqt M31gwBXrXEsMxRAFEIzXMcQtQ70vQxSPERMS1dC8Arlz4BO0ezaM9ZuOy36w7SruNHWXsM g4T10LdXTxz3VZst3JtyXLSHbzWvmaJpomvbb8sSW8WultMkQw1QF4sBcjG3GZe9tjeWwS /4deL5q3V3zSNDnZ2biGP1K1Hdms9tS3wZDSyssqv3QxiWfJXywn56xv9HeQrAgTe0zegY ZMbODQV0XuYzWqkLVUYCEfTRSOcR7O/vW1VjTk6ZSv8WJO5OZqNSlgBPsS6Qww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0938B54CD; Sun, 20 Mar 2022 19:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22KJiNFF090592; Sun, 20 Mar 2022 19:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22KJiNM4090591; Sun, 20 Mar 2022 19:44:23 GMT (envelope-from git) Date: Sun, 20 Mar 2022 19:44:23 GMT Message-Id: <202203201944.22KJiNM4090591@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b4062ba359fa - main - biology/biosig: Update 2.3.3 -> 2.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4062ba359faf7d7fed2672163fd77ecd3ee47e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647805464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=btRvb9aWqZCRExLTQpLU6E2a5BCmz4LtfXuTLveMDYY=; b=dodfTfpwTWLLmVd3gRXJMiZXH2OhNseFyXuyUGHSl8bm4AcsAkEbKTAokV8Q/b6aMrFCMh FLm87MfYmpW3h2jUbRcyMfNaX1vAb9CpWmMc7Y4DNyNp1Hrv+94BXt2pbjCWMElrr0CAen ynS/MvCnFqp/k63qLVgi0Sn3j0GJJFVgw9OJXcOY96/uW5AWMDkTp9v2pEki0dR/YwH3SQ Yjm/uzIhxPLsuKBL0EW8voEd1ZQDcVUkYDRksKghNREt8qLDcpjsvXSTEqY0xD+NpRSYpn vE1KzoOuwLvMV4zQcHe7Gm6tI7S7tR6sdZLqdiNpWF0iR0K2rzOhwBnT2tmpRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647805464; a=rsa-sha256; cv=none; b=FSX+dLxrqn3li1i+iD/lZHltt892qhUbIiPwiVpTKhhfl6JzDeHrgL7s0BDopSUNne9C7m 3QwidXNE8JcCy5dZBiNB6Ocbp7sAr8Do+EEDjs9PT7ccUl8Gz46N4vm8bJeZyld88Dfwt+ Hn9Te6CBFp5KbXiFmHoAjtMELf8s3bTw7PzhsVMTEUL+T4BeT/c52HYwSbY/2BYJ3R9S0U ZV0MAie1abFY5MuF0qK11pWDdiQfGWL0zraBm/DxaSWeSOG06PkBR95pwCxY1S5w/xQOcg 0GD+qyLwbdiKp/rL3cVzdZwNHmavsn9Cl/25rJZpR5TZI9dhlnHYJuR5X95fZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4062ba359faf7d7fed2672163fd77ecd3ee47e0 commit b4062ba359faf7d7fed2672163fd77ecd3ee47e0 Author: Yuri Victorovich AuthorDate: 2022-03-20 19:43:56 +0000 Commit: Yuri Victorovich CommitDate: 2022-03-20 19:43:56 +0000 biology/biosig: Update 2.3.3 -> 2.4.0 Reported by: portscout --- biology/biosig/Makefile | 2 +- biology/biosig/distinfo | 6 +-- biology/biosig/files/patch-biosig4c++_biosig.c | 43 ---------------------- .../patch-biosig4c++_t220_sopen__scp__write.c | 28 -------------- biology/biosig/pkg-plist | 1 + 5 files changed, 5 insertions(+), 75 deletions(-) diff --git a/biology/biosig/Makefile b/biology/biosig/Makefile index 91d5131797fb..a57c1e5f3e0c 100644 --- a/biology/biosig/Makefile +++ b/biology/biosig/Makefile @@ -1,5 +1,5 @@ PORTNAME= biosig -DISTVERSION= 2.3.3 +DISTVERSION= 2.4.0 CATEGORIES= biology MASTER_SITES= SF/${PORTNAME}/BioSig%20for%20C_C%2B%2B/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/biology/biosig/distinfo b/biology/biosig/distinfo index af035532c834..c41e6ae5d2e0 100644 --- a/biology/biosig/distinfo +++ b/biology/biosig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629098745 -SHA256 (biosig-2.3.3.src.tar.gz) = ecff695e912265cbb817b936209086d1b5854afeb44ed58e701feeb2e0b1b33e -SIZE (biosig-2.3.3.src.tar.gz) = 2525173 +TIMESTAMP = 1647805069 +SHA256 (biosig-2.4.0.src.tar.gz) = 3a7cdc0f003f28de2572984db865808039a52a943c587cfb5a87679548864365 +SIZE (biosig-2.4.0.src.tar.gz) = 2540501 diff --git a/biology/biosig/files/patch-biosig4c++_biosig.c b/biology/biosig/files/patch-biosig4c++_biosig.c deleted file mode 100644 index 06f8a056571d..000000000000 --- a/biology/biosig/files/patch-biosig4c++_biosig.c +++ /dev/null @@ -1,43 +0,0 @@ ---- biosig4c++/biosig.c.orig 2021-08-13 09:17:15 UTC -+++ biosig4c++/biosig.c -@@ -631,7 +631,7 @@ int ifsetpos(HDRTYPE* hdr, size_t *pos) { - // gnu linux on sparc needs this - fpos_t p; - p.__pos = *pos; --#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ -+#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ || __FreeBSD__ - fpos_t p = *pos; - #else - fpos_t p; -@@ -652,7 +652,7 @@ int ifsetpos(HDRTYPE* hdr, size_t *pos) { - #if __gnu_linux__ - // gnu linux on sparc needs this - *pos = p.__pos; --#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ -+#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ || __FreeBSD__ - *pos = p; - #else - *pos = p.__pos; -@@ -678,7 +678,7 @@ int ifgetpos(HDRTYPE* hdr, size_t *pos) { - #if __gnu_linux__ - // gnu linux on sparc needs this - *pos = p.__pos; // ugly hack but working --#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ -+#elif __sparc__ || __APPLE__ || __MINGW32__ || ANDROID || __NetBSD__ || __CYGWIN__ || __FreeBSD__ - *pos = p; - #else - *pos = p.__pos; // ugly hack but working -@@ -1219,8 +1219,11 @@ HDRTYPE* constructHDR(const unsigned NS, const unsigne - hdr->data.size[0] = 0; // rows - hdr->data.size[1] = 0; // columns - hdr->data.block = NULL; -- hdr->T0 = t_time2gdf_time(time(NULL)-timezone); // localtime -- hdr->tzmin = -timezone/60; // convert from seconds west of UTC to minutes east; -+ -+ time_t t=time(NULL); -+ struct tm *tt = localtime(&t); -+ hdr->tzmin = tt->tm_gmtoff/60; -+ hdr->T0 = t_time2gdf_time(time(NULL)-tt->tm_gmtoff); // localtime - - { - uint8_t Equipment[8] = "b4c_1.5 "; diff --git a/biology/biosig/files/patch-biosig4c++_t220_sopen__scp__write.c b/biology/biosig/files/patch-biosig4c++_t220_sopen__scp__write.c deleted file mode 100644 index 20cb7ed4f3b8..000000000000 --- a/biology/biosig/files/patch-biosig4c++_t220_sopen__scp__write.c +++ /dev/null @@ -1,28 +0,0 @@ ---- biosig4c++/t220/sopen_scp_write.c.orig 2021-08-13 09:17:15 UTC -+++ biosig4c++/t220/sopen_scp_write.c -@@ -388,10 +388,8 @@ int sopen_SCP_write(HDRTYPE* hdr) { - if (VERBOSE_LEVEL>7) fprintf(stdout,"Section 1 Tag 25 \n"); - - gdf_time T1 = hdr->T0; --#ifndef __APPLE__ -- T1 += (int32_t)ldexp(timezone/86400.0,32); --#endif -- T0_tm = gdf_time2tm_time(T1); -+ T0_tm = gdf_time2tm_time(hdr->T0); -+ T0_tm->tm_gmtoff = hdr->tzmin*60; - - *(ptr+sectionStart+curSectLen) = 25; // tag - leu16a(4, ptr+sectionStart+curSectLen+1); // length -@@ -719,10 +717,8 @@ int sopen_SCP_write(HDRTYPE* hdr) { - - // Recording Date and Time - gdf_time T1 = hdr->T0; --#ifndef __APPLE__ -- T1 += (int32_t)ldexp(timezone/86400.0,32); --#endif -- T0_tm = gdf_time2tm_time(T1); -+ T0_tm = gdf_time2tm_time(hdr->T0); -+ T0_tm->tm_gmtoff = hdr->tzmin*60; - - leu16a(T0_tm->tm_year+1900, PtrCurSect+10); // year - PtrCurSect[12] = (uint8_t)(T0_tm->tm_mon + 1); // month diff --git a/biology/biosig/pkg-plist b/biology/biosig/pkg-plist index fca3a09eb6fe..26ccdf0ceb6b 100644 --- a/biology/biosig/pkg-plist +++ b/biology/biosig/pkg-plist @@ -222,6 +222,7 @@ man/man1/sigviewer.1.gz %%DATADIR%%/matlab/t330_StimFit/simul002.m %%DATADIR%%/matlab/t340_MachineLearningOptimalDetection/README.md %%DATADIR%%/matlab/t340_MachineLearningOptimalDetection/demo_mod.m +%%DATADIR%%/matlab/t340_MachineLearningOptimalDetection/demo_modx.m %%DATADIR%%/matlab/t340_MachineLearningOptimalDetection/minidet2gdf.m %%DATADIR%%/matlab/t340_MachineLearningOptimalDetection/mod_optimal_detection_filter.m %%DATADIR%%/matlab/t400_Classification/Contents.m