First cmake update victim, reported by Mark Patruck, Thanks! Please find
below a minizip update diff.
- Switch from nmoinvaz/minizip (dead) to zlib-ng/minizip-ng.
- Enable LZMA support
Build test with the following consumer:
- emulators/mupen64plus/core
- geo/spatialite/libspatialite
- net/wireshark
- geo/spatialite/librasterlite2
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/archivers/minizip/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 23 Oct 2020 16:22:32 -0000 1.3
+++ Makefile 7 Oct 2021 19:46:44 -0000
@@ -2,28 +2,30 @@
COMMENT = zip manipulation library
-GH_ACCOUNT = nmoinvaz
-GH_PROJECT = minizip
-GH_TAGNAME = 2.10.1
+GH_ACCOUNT = zlib-ng
+GH_PROJECT = minizip-ng
+GH_TAGNAME = 3.0.3
-SHARED_LIBS += minizip 0.1 #2.5
-CATEGORIES = archivers
+PKGNAME = minizip-${GH_TAGNAME}
-# zlib
-PERMIT_PACKAGE =Yes
+SHARED_LIBS += minizip 1.0 # 3
-MODULES = devel/cmake
+CATEGORIES = archivers
-# tries to fetch zstd source during build
-# bundled lzma is patched
-CONFIGURE_ARGS =-DMZ_LZMA=OFF \
- -DMZ_BUILD_TEST=ON \
- -DMZ_BUILD_UNIT_TEST=ON
+WANTLIB += bz2 c crypto iconv lzma ssl z zstd
+
+# zlib
+PERMIT_PACKAGE = Yes
-LIB_DEPENDS = converters/libiconv \
- archivers/zstd \
- archivers/bzip2
+MODULES = devel/cmake
-WANTLIB += bz2 c iconv z zstd
+CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON \
+ -DMZ_BUILD_TEST=ON \
+ -DMZ_BUILD_UNIT_TEST=ON
+
+LIB_DEPENDS = archivers/bzip2 \
+ archivers/xz \
+ archivers/zstd \
+ converters/libiconv
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/archivers/minizip/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 23 Oct 2020 16:20:20 -0000 1.2
+++ distinfo 7 Oct 2021 19:46:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (minizip-2.10.1.tar.gz) = NPnPKO6Nkzg11Hb1Dcu54/7Va0i/vNoaVhzg06/+pmM=
-SIZE (minizip-2.10.1.tar.gz) = 771312
+SHA256 (minizip-ng-3.0.3.tar.gz) = Xx3Q04rb6XhcucTm5Hc4wQnXOgr6huWMQCXOPizFBO0=
+SIZE (minizip-ng-3.0.3.tar.gz) = 638966
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/archivers/minizip/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 23 Oct 2020 16:20:20 -0000 1.2
+++ patches/patch-CMakeLists_txt 7 Oct 2021 19:46:44 -0000
@@ -1,55 +1,24 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/10/23 16:20:20 landry Exp $
install headers in include/minizip to avoid conflicts with libzip
-disable -Os
-use pkg-config to detect zstd
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -59,7 +59,7 @@ include(FeatureSummary)
+@@ -81,7 +81,7 @@ include(FeatureSummary)
- set(INSTALL_BIN_DIR ${CMAKE_INSTALL_FULL_BINDIR} CACHE PATH "Installation
directory for executables")
- set(INSTALL_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "Installation
directory for libraries")
--set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation
directory for headers")
-+set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/minizip CACHE PATH
"Installation directory for headers")
- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation
directory for manual pages")
+ set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation
directory for executables")
+ set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation
directory for libraries")
+-set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation
directory for headers")
++set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip CACHE PATH
"Installation directory for headers")
+ set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation
directory for manual pages")
set(STDLIB_DEF)
-@@ -115,7 +115,8 @@ endif()
- # Check if zstd installation is present
- if(MZ_ZSTD)
- if(NOT ZSTD_FORCE_FETCH)
-- find_package(ZSTD QUIET)
-+ find_package(PkgConfig)
-+ pkg_check_modules(ZSTD libzstd)
- endif()
- if(ZSTD_FOUND AND NOT ZSTD_FORCE_FETCH)
- message(STATUS "Using ZSTD")
-@@ -249,8 +250,7 @@ else()
- $<$<CONFIG:Release>:/Os>)
- else()
- add_compile_options(
-- $<$<CONFIG:Debug>:-g>
-- $<$<CONFIG:Release>:-Os>)
-+ $<$<CONFIG:Debug>:-g>)
- endif()
- endif()
-
-@@ -295,7 +295,6 @@ endif()
+@@ -449,7 +449,6 @@ endif()
# Unix specific
if(UNIX)
- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
- list(APPEND MINIZIP_SRC "mz_os_posix.c" "mz_strm_os_posix.c")
-
- if((MZ_PKCRYPT OR MZ_WZAES) AND NOT (MZ_OPENSSL AND OPENSSL_FOUND))
-@@ -681,7 +680,7 @@ set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cm
- set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig"
- CACHE PATH "Installation directory for pkgconfig (.pc) files")
+ list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
--add_library(${PROJECT_NAME}
-+add_library(${PROJECT_NAME} SHARED
- ${MINIZIP_SRC} ${MINIZIP_PUBLIC_HEADERS}
- ${BRG_SRC} ${BRG_PUBLIC_HEADERS}
- ${BZIP2_SRC} ${BZIP2_PUBLIC_HEADERS}
+ if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
Index: patches/patch-minizip_pc_cmakein
===================================================================
RCS file: patches/patch-minizip_pc_cmakein
diff -N patches/patch-minizip_pc_cmakein
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-minizip_pc_cmakein 7 Oct 2021 19:46:44 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: minizip.pc.cmakein
+--- minizip.pc.cmakein.orig
++++ minizip.pc.cmakein
+@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+ sharedlibdir=@CMAKE_INSTALL_FULL_LIBDIR@
+-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/minizip
+
+ Name: @PROJECT_NAME@
+ Description: Minizip zip file manipulation library
Index: patches/patch-mz_crypt_brg_c
===================================================================
RCS file: patches/patch-mz_crypt_brg_c
diff -N patches/patch-mz_crypt_brg_c
--- patches/patch-mz_crypt_brg_c 6 Oct 2020 16:48:54 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-mz_crypt_brg_c,v 1.1.1.1 2020/10/06 16:48:54 landry Exp $
-
-Index: mz_crypt_brg.c
---- mz_crypt_brg.c.orig
-+++ mz_crypt_brg.c
-@@ -31,6 +31,7 @@
- /***************************************************************************/
-
- #if defined(HAVE_ARC4RANDOM_BUF)
-+#include <stdlib.h>
- int32_t mz_crypt_rand(uint8_t *buf, int32_t size) {
- if (size < 0)
- return 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/archivers/minizip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Oct 2020 16:22:33 -0000 1.3
+++ pkg/PLIST 7 Oct 2021 19:46:44 -0000
@@ -9,6 +9,7 @@ include/minizip/mz_os.h
include/minizip/mz_strm.h
include/minizip/mz_strm_buf.h
include/minizip/mz_strm_bzip.h
+include/minizip/mz_strm_lzma.h
include/minizip/mz_strm_mem.h
include/minizip/mz_strm_os.h
include/minizip/mz_strm_pkcrypt.h
