Re: [PR PATCH] [Updated] [WIP]New package: miniz-2.1.0

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages miniz
https://github.com/void-linux/void-packages/pull/17972

[WIP]New package: miniz-2.1.0
Signed-off-by: Nathan Owens <ndowens04@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/17972.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-miniz-17972.patch --]
[-- Type: text/x-diff, Size: 3320 bytes --]

From d526d83dc143338484953ec3f7e614b1867c90c6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 1 Jan 2020 13:22:56 -0600
Subject: [PATCH] New package: miniz-2.1.0

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 common/shlibs                       |  1 +
 srcpkgs/miniz-devel                 |  1 +
 srcpkgs/miniz/patches/library.patch | 30 +++++++++++++++++++++++++++++
 srcpkgs/miniz/template              | 26 +++++++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 120000 srcpkgs/miniz-devel
 create mode 100644 srcpkgs/miniz/patches/library.patch
 create mode 100644 srcpkgs/miniz/template

diff --git a/common/shlibs b/common/shlibs
index 611abc88b12..4e4a58a3c88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3709,3 +3709,4 @@ libnvpair.so.1 zfs-0.8.2_1
 libjsonnet.so.0 jsonnet-0.14.0_2
 libjsonnet++.so.0 jsonnet-0.14.0_2
 libigdgmm.so.12 intel-gmmlib-19.3.4_1
+libminiz.so.2 miniz-2.1.0_1
diff --git a/srcpkgs/miniz-devel b/srcpkgs/miniz-devel
new file mode 120000
index 00000000000..0c4557f455c
--- /dev/null
+++ b/srcpkgs/miniz-devel
@@ -0,0 +1 @@
+miniz
\ No newline at end of file
diff --git a/srcpkgs/miniz/patches/library.patch b/srcpkgs/miniz/patches/library.patch
new file mode 100644
index 00000000000..dacd969d050
--- /dev/null
+++ b/srcpkgs/miniz/patches/library.patch
@@ -0,0 +1,30 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -1,4 +1,11 @@
+ PROJECT(miniz C)
++
++set(MINIZ_API_VERSION 2)
++set(MINIZ_MINOR_VERSION 1)
++set(MINIZ_PATCH_VERSION 0)
++set(MINIZ_VERSION
++    ${MINIZ_API_VERSION}.${MINIZ_MINOR_VERSION}.${MINIZ_PATCH_VERSION})
++
+ cmake_minimum_required(VERSION 2.8)
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+   # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+@@ -12,5 +19,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
+
+-add_library(miniz ${miniz_SOURCE})
++add_library(objlibs OBJECT ${miniz_SOURCE})
++add_library(miniz_static STATIC $<TARGET_OBJECTS:objlibs>)
++add_library(miniz SHARED $<TARGET_OBJECTS:objlibs>)
++add_compile_options(-fPIC)
++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION})
++
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++
+ target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
diff --git a/srcpkgs/miniz/template b/srcpkgs/miniz/template
new file mode 100644
index 00000000000..b925a6d94c4
--- /dev/null
+++ b/srcpkgs/miniz/template
@@ -0,0 +1,26 @@
+# Template file for 'miniz'
+pkgname=miniz
+version=2.1.0
+revision=1
+build_style=cmake
+short_desc="Single C source file zlib-replacement library"
+maintainer="Nathan Owens <ndowens04@gmail.com>"
+license="MIT"
+homepage="https://github.com/richgel999/miniz"
+distfiles="https://github.com/richgel999/miniz/archive/${version}.tar.gz"
+checksum=95f9b23c92219ad2670389a23a4ed5723b7329c82c3d933b7047673ecdfc1fea
+
+post_install() {
+	vinstall build/libminiz_static.a 644 usr/lib libminiz.a
+	vlicense LICENSE
+}
+
+miniz-devel_package() {
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}