From eb0c9fd3ce930b8bcc5d9733c9d5374035e00965 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sat, 21 Mar 2020 13:05:24 +0000 Subject: [PATCH 1/2] www/h2o: update to 2.2.6 --- www/h2o/Makefile | 3 +-- www/h2o/distinfo | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 7b37b584d662..c872598dbc12 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,7 +1,6 @@ # $NetBSD: Makefile,v 1.20 2020/01/18 21:51:07 jperkin Exp $ -DISTNAME= h2o-2.2.5 -PKGREVISION= 3 +DISTNAME= h2o-2.2.6 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=h2o/} GITHUB_TAG= v${PKGVERSION_NOREV} diff --git a/www/h2o/distinfo b/www/h2o/distinfo index 9b410a33bccb..23ec3505c2d8 100644 --- a/www/h2o/distinfo +++ b/www/h2o/distinfo @@ -1,6 +1,6 @@ $NetBSD: distinfo,v 1.11 2018/06/24 09:17:03 adam Exp $ -SHA1 (h2o-2.2.5.tar.gz) = 188cd4792d28cd7c88a572f6a92949c6aaef5693 -RMD160 (h2o-2.2.5.tar.gz) = 4036c8ec4042fd3d9191aa38cff0754072b9067f -SHA512 (h2o-2.2.5.tar.gz) = 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2 -Size (h2o-2.2.5.tar.gz) = 16257295 bytes +SHA1 (h2o-2.2.6.tar.gz) = 5cc09af1baf35938a86d7cfafe8a0b876ff2ee81 +RMD160 (h2o-2.2.6.tar.gz) = bf99a74257ccb4c9efbd7e11ce7aab2a7af01a95 +SHA512 (h2o-2.2.6.tar.gz) = f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20 +Size (h2o-2.2.6.tar.gz) = 16257760 bytes From 9d10cd70842a7a81eb38121afac65f7d60d025c0 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sat, 21 Mar 2020 13:40:31 +0000 Subject: [PATCH 2/2] h2o: build .so instead of .a --- www/h2o/Makefile | 3 ++- www/h2o/PLIST | 8 ++++++-- www/h2o/distinfo | 1 + www/h2o/patches/patch-wslay-link | 29 +++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 www/h2o/patches/patch-wslay-link diff --git a/www/h2o/Makefile b/www/h2o/Makefile index c872598dbc12..808984e17f11 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2020/01/18 21:51:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2019/08/11 13:24:20 wiz Exp $ DISTNAME= h2o-2.2.6 CATEGORIES= www @@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE+= libh2o.pc.in CMAKE_ARGS+= -DWITH_BUNDLED_SSL=off # TODO: make it an option CMAKE_ARGS+= -DWITH_MRUBY=off +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=on SUBST_CLASSES+= interp SUBST_STAGE.interp= post-extract diff --git a/www/h2o/PLIST b/www/h2o/PLIST index 26f8b15e2841..17b17a8819ba 100644 --- a/www/h2o/PLIST +++ b/www/h2o/PLIST @@ -33,8 +33,12 @@ include/h2o/tunnel.h include/h2o/url.h include/h2o/version.h include/h2o/websocket.h -lib/libh2o-evloop.a -lib/libh2o.a +lib/libh2o-evloop.so +lib/libh2o-evloop.so.0.13 +lib/libh2o-evloop.so.0.13.6 +lib/libh2o.so +lib/libh2o.so.0.13 +lib/libh2o.so.0.13.6 lib/pkgconfig/libh2o-evloop.pc lib/pkgconfig/libh2o.pc share/doc/h2o/assets/8mbps100msec-nginx195-h2o150.png diff --git a/www/h2o/distinfo b/www/h2o/distinfo index 23ec3505c2d8..71fc0e46f549 100644 --- a/www/h2o/distinfo +++ b/www/h2o/distinfo @@ -4,3 +4,4 @@ SHA1 (h2o-2.2.6.tar.gz) = 5cc09af1baf35938a86d7cfafe8a0b876ff2ee81 RMD160 (h2o-2.2.6.tar.gz) = bf99a74257ccb4c9efbd7e11ce7aab2a7af01a95 SHA512 (h2o-2.2.6.tar.gz) = f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20 Size (h2o-2.2.6.tar.gz) = 16257760 bytes +SHA1 (patch-wslay-link) = c4d3995bf69b52e0a60c284f0425d40ead20154b diff --git a/www/h2o/patches/patch-wslay-link b/www/h2o/patches/patch-wslay-link new file mode 100644 index 000000000000..0dbd6c75f621 --- /dev/null +++ b/www/h2o/patches/patch-wslay-link @@ -0,0 +1,29 @@ +Via https://github.com/h2o/h2o/pull/2196 which was merged upstream +so presumably this patch can be removed when 2.3.0 comes out. + +--- CMakeLists.txt 2018-05-31 13:57:10.000000000 +0000 ++++ CMakeLists.txt 2020-03-21 11:01:30.722972610 +0000 +@@ -386,13 +386,21 @@ + OUTPUT_NAME h2o + VERSION ${LIBRARY_VERSION} + SOVERSION ${LIBRARY_SOVERSION}) +-TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++IF (WSLAY_FOUND) ++ TARGET_LINK_LIBRARIES(libh2o ${WSLAY_LIBRARIES} ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++ELSE () ++ TARGET_LINK_LIBRARIES(libh2o ${LIBUV_LIBRARIES} ${EXTRA_LIBS}) ++ENDIF (WSLAY_FOUND) + SET_TARGET_PROPERTIES(libh2o-evloop PROPERTIES + OUTPUT_NAME h2o-evloop + COMPILE_FLAGS "-DH2O_USE_LIBUV=0" + VERSION ${LIBRARY_VERSION} + SOVERSION ${LIBRARY_SOVERSION}) +-TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) ++IF (WSLAY_FOUND) ++ TARGET_LINK_LIBRARIES(libh2o-evloop ${WSLAY_LIBRARIES} ${EXTRA_LIBS}) ++ELSE () ++ TARGET_LINK_LIBRARIES(libh2o-evloop ${EXTRA_LIBS}) ++ENDIF (WSLAY_FOUND) + + IF (OPENSSL_FOUND) + TARGET_INCLUDE_DIRECTORIES(libh2o PUBLIC ${OPENSSL_INCLUDE_DIR})