Le Tue, Dec 26, 2023 at 12:00:56PM +0100, Landry Breuil a écrit :
> Le Tue, Dec 26, 2023 at 10:27:51AM +0100, Landry Breuil a écrit :
> > Le Sat, Dec 23, 2023 at 07:52:57PM +0000, Klemens Nanni a écrit :
> > > On Sat, Dec 23, 2023 at 09:11:14AM +0100, Landry Breuil wrote:
> > > > Le Fri, Dec 22, 2023 at 12:12:43AM +0000, Klemens Nanni a écrit :
> > > > > Newer graphics/libvips requires highway>=1.0.5.
> > > > > I haven't tested other consumers yet.  amd64 regress:
> > > > 
> > > > can we update to 1.0.7 ? graphics/libjxl 0.9.0 requires it since
> > > > https://github.com/libjxl/libjxl/pull/2765.
> > > > 
> > > > -- Could NOT find HWY: Found unsuitable version "1.0.3", but required is at least "1.0.7" (found /usr/local/lib/libhwy.so.0.0)
> > > > 
> > > 
> > > Sure!
> 
> fwiw, with
> 
> +ALL_TARGET =    ${SHARED_LIBS:Mhwy*}
> +pre-test:
> +       ${MODCMAKE_BUILD_TARGET}
> 
> highway 1.0.7 builds and libjxl 0.9.0 & sdl-image builds, but that's
> clearly not the way to go :)
> 
> will run the libjxl tests, and check if libjxl 0.8.2 builds with this
> highway version.

here's an updated version for 1.1.0, which builds fine on i386/amd64
here. make regress isnt so bad:

test-1.1.0-amd64.log:95% tests passed, 45 tests failed out of 902
test-1.1.0-i386.log:99% tests passed, 5 tests failed out of 612

and libjxl 0.10.0 (which i'll send in another mail) builds fine with
this version.

tests on other exotic archs welcome, i'll probably commit that within
some days, all consumers seem fine with it.

Landry
? test-1.1.0-amd64-2.log
? test-1.1.0-amd64.log
? test-1.1.0-i386.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/highway/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	9 Apr 2023 07:53:53 -0000	1.3
+++ Makefile	25 Feb 2024 14:58:37 -0000
@@ -2,14 +2,13 @@
 
 GH_ACCOUNT =	google
 GH_PROJECT =	highway
-GH_TAGNAME =	1.0.3
-REVISION =	0
+GH_TAGNAME =	1.1.0
 
 CATEGORIES =	devel
 
-SHARED_LIBS +=	hwy		0.0 # 0.0
-SHARED_LIBS +=	hwy_contrib	0.0 # 0.0
-SHARED_LIBS +=	hwy_test	0.0 # 0.0
+SHARED_LIBS +=	hwy		0.1 # 0.0
+SHARED_LIBS +=	hwy_contrib	0.1 # 0.0
+SHARED_LIBS +=	hwy_test	0.1 # 0.0
 
 # Apache-2.0
 PERMIT_PACKAGE =	Yes
@@ -26,4 +25,7 @@
 CONFIGURE_ARGS +=	-DHWY_SYSTEM_GTEST=ON \
 			-DBUILD_SHARED_LIBS=ON
 
+ALL_TARGET =    ${SHARED_LIBS:Mhwy*}
+pre-test:
+	${MODCMAKE_BUILD_TARGET}
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/highway/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	4 Mar 2023 07:52:35 -0000	1.1.1.1
+++ distinfo	25 Feb 2024 14:58:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (highway-1.0.3.tar.gz) = Vm/HcxWHhHPZpr2BX33njHNzSs3LdFw93oV5VgrFRA4=
-SIZE (highway-1.0.3.tar.gz) = 1770704
+SHA256 (highway-1.1.0.tar.gz) = NUqLRTm1iOcLmOxwhEJz4/J0EwLEw3e8xOgbPRhm98k=
+SIZE (highway-1.1.0.tar.gz) = 2162124
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/highway/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	9 Apr 2023 07:53:53 -0000	1.1
+++ patches/patch-CMakeLists_txt	25 Feb 2024 14:58:37 -0000
@@ -4,14 +4,12 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -241,8 +241,8 @@ else()
-       # Not yet supported by GCC. When runtime dispatch is supported and
-       # implemented, we will remove v from the required flags. Until then, using
-       # clang for RISC-V will require the CPU to support the V extension (1.0).
--      list(APPEND HWY_FLAGS -march=rv64gcv1p0)
--      list(APPEND HWY_FLAGS -menable-experimental-extensions)
-+      #list(APPEND HWY_FLAGS -march=rv64gcv1p0)
-+      #list(APPEND HWY_FLAGS -menable-experimental-extensions)
+@@ -295,7 +295,7 @@ else()
+     if(HWY_CMAKE_RVV)
+       list(APPEND HWY_FLAGS -march=rv64gcv1p0)
+       if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+-        list(APPEND HWY_FLAGS -menable-experimental-extensions)
++        #list(APPEND HWY_FLAGS -menable-experimental-extensions)
+       endif()
      endif()
    endif()
- 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/highway/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST	4 Mar 2023 07:52:35 -0000	1.1.1.1
+++ pkg/PLIST	25 Feb 2024 14:58:37 -0000
@@ -13,13 +13,21 @@
 include/hwy/contrib/image/image.h
 include/hwy/contrib/math/
 include/hwy/contrib/math/math-inl.h
+include/hwy/contrib/matvec/
+include/hwy/contrib/matvec/matvec-inl.h
 include/hwy/contrib/sort/
+include/hwy/contrib/sort/order.h
 include/hwy/contrib/sort/shared-inl.h
 include/hwy/contrib/sort/sorting_networks-inl.h
 include/hwy/contrib/sort/traits-inl.h
 include/hwy/contrib/sort/traits128-inl.h
 include/hwy/contrib/sort/vqsort-inl.h
 include/hwy/contrib/sort/vqsort.h
+include/hwy/contrib/thread_pool/
+include/hwy/contrib/thread_pool/futex.h
+include/hwy/contrib/thread_pool/thread_pool.h
+include/hwy/contrib/unroller/
+include/hwy/contrib/unroller/unroller-inl.h
 include/hwy/detect_compiler_arch.h
 include/hwy/detect_targets.h
 include/hwy/foreach_target.h
@@ -31,10 +39,12 @@
 include/hwy/ops/arm_sve-inl.h
 include/hwy/ops/emu128-inl.h
 include/hwy/ops/generic_ops-inl.h
+include/hwy/ops/ppc_vsx-inl.h
 include/hwy/ops/rvv-inl.h
 include/hwy/ops/scalar-inl.h
 include/hwy/ops/set_macros-inl.h
 include/hwy/ops/shared-inl.h
+include/hwy/ops/tuple-inl.h
 include/hwy/ops/wasm_128-inl.h
 include/hwy/ops/x86_128-inl.h
 include/hwy/ops/x86_256-inl.h
@@ -42,11 +52,20 @@
 include/hwy/per_target.h
 include/hwy/print-inl.h
 include/hwy/print.h
+include/hwy/profiler.h
+include/hwy/robust_statistics.h
 include/hwy/targets.h
 include/hwy/tests/
 include/hwy/tests/hwy_gtest.h
 include/hwy/tests/test_util-inl.h
 include/hwy/tests/test_util.h
+include/hwy/timer-inl.h
+include/hwy/timer.h
+lib/cmake/
+lib/cmake/hwy/
+lib/cmake/hwy/hwy-config${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/hwy/hwy-config-version.cmake
+lib/cmake/hwy/hwy-config.cmake
 @lib lib/libhwy.so.${LIBhwy_VERSION}
 @lib lib/libhwy_contrib.so.${LIBhwy_contrib_VERSION}
 @lib lib/libhwy_test.so.${LIBhwy_test_VERSION}

• highway-1.1.0.diff (5K)