git: bdddfef6ff5f - main - cad/uhdm: Update 1.66 → 1.70

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 23 Jul 2023 07:24:24 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bdddfef6ff5ff95aefaead781658935d85434ea0

commit bdddfef6ff5ff95aefaead781658935d85434ea0
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-23 06:27:20 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-23 07:24:17 +0000

    cad/uhdm: Update 1.66 → 1.70
---
 cad/uhdm/Makefile                                             |  4 ++--
 cad/uhdm/distinfo                                             | 10 +++++-----
 cad/uhdm/files/patch-CMakeLists.txt                           | 11 ++++++-----
 .../files/patch-third__party_capnproto_c++_src_kj_cidr.c++    | 11 +++++++++++
 cad/uhdm/pkg-plist                                            |  4 ++--
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile
index b98644e230e9..529f14b9c8a3 100644
--- a/cad/uhdm/Makefile
+++ b/cad/uhdm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uhdm
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.66
+DISTVERSION=	1.70
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -18,7 +18,7 @@ USE_LDCONFIG=	${PREFIX}/lib/uhdm
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	${PORTNAME:tu}
-GH_TUPLE=	capnproto:capnproto:14f24a4:capnproto/third_party/capnproto \
+GH_TUPLE=	capnproto:capnproto:48e4889:capnproto/third_party/capnproto \
 		google:googletest:58d77fa:googletest/third_party/googletest
 
 CMAKE_ON=	BUILD_SHARED_LIBS
diff --git a/cad/uhdm/distinfo b/cad/uhdm/distinfo
index 865307eb6094..8120c5a42c24 100644
--- a/cad/uhdm/distinfo
+++ b/cad/uhdm/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1686981365
-SHA256 (chipsalliance-UHDM-v1.66_GH0.tar.gz) = 677ed2601841442d33a8d8a701459b6d926fcac9726f6b600c4029ecd545ea49
-SIZE (chipsalliance-UHDM-v1.66_GH0.tar.gz) = 1762385
-SHA256 (capnproto-capnproto-14f24a4_GH0.tar.gz) = 1130e78658e8b1ceb3a69a6b3a964913f22505532ab217299e5600f371922877
-SIZE (capnproto-capnproto-14f24a4_GH0.tar.gz) = 2121570
+TIMESTAMP = 1690089901
+SHA256 (chipsalliance-UHDM-v1.70_GH0.tar.gz) = e38f8255f858adcb25a4780a73b5bba1bde619f1b74b96e28270fe6e1bba283a
+SIZE (chipsalliance-UHDM-v1.70_GH0.tar.gz) = 1763527
+SHA256 (capnproto-capnproto-48e4889_GH0.tar.gz) = 947caebe3908f03baa546ff350c2460e9598674069295a264e018a552885c3b1
+SIZE (capnproto-capnproto-48e4889_GH0.tar.gz) = 2403821
 SHA256 (google-googletest-58d77fa_GH0.tar.gz) = a55ceaae12e0ea65fee295b8d807bab5c06a719e98d9ac15af7f7c42a8d5000e
 SIZE (google-googletest-58d77fa_GH0.tar.gz) = 854878
diff --git a/cad/uhdm/files/patch-CMakeLists.txt b/cad/uhdm/files/patch-CMakeLists.txt
index dd15fbdf3824..66d35d0c428c 100644
--- a/cad/uhdm/files/patch-CMakeLists.txt
+++ b/cad/uhdm/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2023-04-16 17:58:00 UTC
+--- CMakeLists.txt.orig	2023-07-22 04:56:00 UTC
 +++ CMakeLists.txt
-@@ -404,6 +404,6 @@ install(
-   FILES ${CMAKE_CURRENT_BINARY_DIR}/UHDM.pc
-   DESTINATION lib/pkgconfig)
+@@ -203,7 +203,7 @@ configure_file(${PROJECT_SOURCE_DIR}/include/config.h.
+ target_compile_options(uhdm PUBLIC
+   "SHELL:$<IF:$<CXX_COMPILER_ID:MSVC>,/FI uhdm/config.h,-include uhdm/config.h>")
  
 -if(BUILD_SHARED_LIBS)
 +if(FALSE AND BUILD_SHARED_LIBS)
-   add_subdirectory(python)
+   set_property(TARGET uhdm PROPERTY POSITION_INDEPENDENT_CODE 1)
  endif()
+ 
diff --git a/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++ b/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++
new file mode 100644
index 000000000000..69bca64c8231
--- /dev/null
+++ b/cad/uhdm/files/patch-third__party_capnproto_c++_src_kj_cidr.c++
@@ -0,0 +1,11 @@
+--- third_party/capnproto/c++/src/kj/cidr.c++.orig	2023-07-23 06:08:18 UTC
++++ third_party/capnproto/c++/src/kj/cidr.c++
+@@ -34,6 +34,8 @@
+ #else
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <sys/types.h>
++#include <netinet/in.h>
+ #endif
+ 
+ namespace kj {
diff --git a/cad/uhdm/pkg-plist b/cad/uhdm/pkg-plist
index 072753ef31f9..0c6e45267a36 100644
--- a/cad/uhdm/pkg-plist
+++ b/cad/uhdm/pkg-plist
@@ -305,8 +305,8 @@ lib/cmake/UHDM/UHDMTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/UHDM/UHDMTargets.cmake
 lib/uhdm/UHDM.capnp
 lib/uhdm/libcapnp.so
-lib/uhdm/libcapnp.so.0.8.0
+lib/uhdm/libcapnp.so.0.11-dev
 lib/uhdm/libkj.so
-lib/uhdm/libkj.so.0.8.0
+lib/uhdm/libkj.so.0.11-dev
 lib/uhdm/libuhdm.so
 libdata/pkgconfig/UHDM.pc