* [gentoo-commits] repo/gentoo:master commit in: dev-libs/miniz/, dev-libs/miniz/files/
@ 2020-12-16 20:16 Dennis Lamm
0 siblings, 0 replies; 3+ messages in thread
From: Dennis Lamm @ 2020-12-16 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 4182909b88f655ad63ef80baa2df44964ac4f522
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 20:03:31 2020 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 20:16:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4182909b
dev-libs/miniz: export cmake build targets
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
dev-libs/miniz/files/Config.cmake.in | 1 +
.../miniz-2.1.0-export-cmake-build-targets.patch | 179 +++++++++++++++++++++
dev-libs/miniz/files/miniz.pc.in | 13 ++
dev-libs/miniz/miniz-2.1.0-r1.ebuild | 38 +++++
dev-libs/miniz/miniz-9999.ebuild | 41 +++++
5 files changed, 272 insertions(+)
diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in
new file mode 100644
index 00000000000..0865ae96100
--- /dev/null
+++ b/dev-libs/miniz/files/Config.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
new file mode 100644
index 00000000000..6f842922270
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -0,0 +1,179 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,15 @@
+-PROJECT(miniz C)
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.12)
++
++project(miniz)
++
++include(GNUInstallDirs)
++
++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})
++
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+ # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+ # differentiation between debug and release builds.
+@@ -8,45 +18,122 @@
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++option(BUILD_EXAMPLES "Build examples" ON)
++option(BUILD_SHARED_LIBS "Build shared library instead of static" ON)
++
++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
++include(GenerateExportHeader)
++
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
++add_library(${PROJECT_NAME} ${miniz_SOURCE})
++generate_export_header(${PROJECT_NAME})
++
++if(NOT BUILD_SHARED_LIBS)
++string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
++set_target_properties(${PROJECT_NAME}
++ PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
++else()
++set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
++endif()
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION})
++
++file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
++
++target_compile_definitions(${PROJECT_NAME}
++ PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
++# pkg-config file
++configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY)
+
+-set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+-set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+-set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+-set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
+-set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
+-set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
+-set(MINIZ_TESTER_SRC_LIST
+- "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
+- "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
++install(FILES
++ ${CMAKE_BINARY_DIR}/miniz.pc
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY
++ INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${MINIZ_API_VERSION})
++set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
++ COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
++)
++
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ # users can use <miniz.h> or <miniz/miniz.h>
++ INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
++)
++
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++ VERSION ${MINIZ_VERSION}
++ COMPATIBILITY AnyNewerVersion
++)
++
++export(EXPORT ${PROJECT_NAME}Targets
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
++ NAMESPACE ${PROJECT_NAME}::
++)
++configure_file(Config.cmake.in
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++ @ONLY
++)
++
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++install(EXPORT ${PROJECT_NAME}Targets
++ FILE
++ ${PROJECT_NAME}Targets.cmake
++ NAMESPACE
++ ${PROJECT_NAME}::
++ DESTINATION
++ ${ConfigPackageLocation}
++)
++install(
++ FILES
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++ DESTINATION
++ ${ConfigPackageLocation}
++ COMPONENT
++ Devel
++)
++
++if(BUILD_EXAMPLES)
++ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
++ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
++ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
++ set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
++ set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
++ set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
++ set(MINIZ_TESTER_SRC_LIST
++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
+
+-add_executable(example1 ${EXAMPLE1_SRC_LIST})
+-target_link_libraries(example1 miniz)
+-add_executable(example2 ${EXAMPLE2_SRC_LIST})
+-target_link_libraries(example2 miniz)
+-add_executable(example3 ${EXAMPLE3_SRC_LIST})
+-target_link_libraries(example3 miniz)
+-add_executable(example4 ${EXAMPLE4_SRC_LIST})
+-target_link_libraries(example4 miniz)
+-add_executable(example5 ${EXAMPLE5_SRC_LIST})
+-target_link_libraries(example5 miniz)
+-add_executable(example6 ${EXAMPLE6_SRC_LIST})
+-target_link_libraries(example6 miniz)
+-if(${UNIX})
+- target_link_libraries(example6 m)
+-endif()
++ add_executable(example1 ${EXAMPLE1_SRC_LIST})
++ target_link_libraries(example1 miniz)
++ add_executable(example2 ${EXAMPLE2_SRC_LIST})
++ target_link_libraries(example2 miniz)
++ add_executable(example3 ${EXAMPLE3_SRC_LIST})
++ target_link_libraries(example3 miniz)
++ add_executable(example4 ${EXAMPLE4_SRC_LIST})
++ target_link_libraries(example4 miniz)
++ add_executable(example5 ${EXAMPLE5_SRC_LIST})
++ target_link_libraries(example5 miniz)
++ add_executable(example6 ${EXAMPLE6_SRC_LIST})
++ target_link_libraries(example6 miniz)
++ if(${UNIX})
++ target_link_libraries(example6 m)
++ endif()
+
+-# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+-# target_link_libraries(miniz_tester miniz)
++ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
++ # target_link_libraries(miniz_tester miniz)
++endif(BUILD_EXAMPLES)
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
+- )
+-file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
++set(INCLUDE_INSTALL_DIR "include")
++
++install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
diff --git a/dev-libs/miniz/files/miniz.pc.in b/dev-libs/miniz/files/miniz.pc.in
new file mode 100644
index 00000000000..51128735847
--- /dev/null
+++ b/dev-libs/miniz/files/miniz.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @MINIZ_VERSION@
+URL: @PROJECT_HOMEPAGE_URL@
+
+Requires:
+Libs: -L${libdir} -lminiz
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/dev-libs/miniz/miniz-2.1.0-r1.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
new file mode 100644
index 00000000000..cc26fba366c
--- /dev/null
+++ b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( ChangeLog.md LICENSE readme.md )
+
+PATCHES=(
+ "${FILESDIR}/${P}-export-cmake-build-targets.patch"
+)
+
+src_prepare() {
+ cp "${FILESDIR}/Config.cmake.in" .
+ cp "${FILESDIR}/miniz.pc.in" .
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild
new file mode 100644
index 00000000000..7bdf95f3cf8
--- /dev/null
+++ b/dev-libs/miniz/miniz-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI=""
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/richgel999/miniz.git"
+else
+ SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples static-libs"
+
+DOCS=( ChangeLog.md LICENSE readme.md )
+
+src_prepare() {
+ sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/miniz/, dev-libs/miniz/files/
@ 2021-02-05 2:06 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-02-05 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 37f0e16ff077f94d6e4de1f5481af94d5ca0ce36
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Jan 13 22:20:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 02:06:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f0e16f
dev-libs/miniz: don't set visibility to hidden
Needed by prusaslicer and symbols such as mz_zip_zero_struct
Bug: https://bugs.gentoo.org/761541
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch | 4 +---
dev-libs/miniz/{miniz-2.1.0-r1.ebuild => miniz-2.1.0-r2.ebuild} | 0
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
index 6f842922270..c1fb1a52215 100644
--- a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -18,7 +18,7 @@
if(CMAKE_BUILD_TYPE STREQUAL "")
# CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
# differentiation between debug and release builds.
-@@ -8,45 +18,122 @@
+@@ -8,45 +18,120 @@
CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
endif ()
@@ -39,8 +39,6 @@
+string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
+set_target_properties(${PROJECT_NAME}
+ PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
-+else()
-+set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
+endif()
+
+set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
diff --git a/dev-libs/miniz/miniz-2.1.0-r1.ebuild b/dev-libs/miniz/miniz-2.1.0-r2.ebuild
similarity index 100%
rename from dev-libs/miniz/miniz-2.1.0-r1.ebuild
rename to dev-libs/miniz/miniz-2.1.0-r2.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/miniz/, dev-libs/miniz/files/
@ 2024-12-23 15:46 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2024-12-23 15:46 UTC (permalink / raw
To: gentoo-commits
commit: 13a1e4b83db3af598c4c284a357cb228d733aa26
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 15:40:01 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 15:46:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a1e4b8
dev-libs/miniz: drop 2.2.0-r1, 3.0.1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-libs/miniz/Manifest | 2 --
dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch | 18 ------------------
dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch | 22 ----------------------
dev-libs/miniz/miniz-2.2.0-r1.ebuild | 23 -----------------------
dev-libs/miniz/miniz-3.0.1.ebuild | 16 ----------------
5 files changed, 81 deletions(-)
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index 636a018f5d56..28eb6e87b498 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,3 +1 @@
-DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111
-DIST miniz-3.0.1.tar.gz 115742 BLAKE2B 4727e55bf2ad4cf716677e6135912df61b9081f2a3a2d6a13efc77ff64a1ec8e736c089330106a81f613dac3840bc09f3aea93f6b432d832f14a6b12ba534d70 SHA512 c1cf028ceb6c12abc83ffb636753d9470155e055d2e834ab23c1c1bc9ee2ef7c7fec689cb92e3496336f850e1d1675489b0450b84e4c7e68d7066142d8df76b6
DIST miniz-3.0.2.tar.gz 115766 BLAKE2B 57260dc5d2f382f85fb7648d4e9fb9fcca63689cdd75f27b3cf84266b112e04031cc6b5f298e3155d4b8fd635704c713572c8ed76b5a8a2f0adb737c63051f1d SHA512 426054403121f84a2ac365f7545b35fb217b41061aebaffce483568d3d374d453ab87987c599a85f1f745e0ec7144a3181ed9b100f354e2823f165ba286b0611
diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch b/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch
deleted file mode 100644
index e0379baf49e3..000000000000
--- a/dev-libs/miniz/files/miniz-2.2.0-fixincdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 37ea28133d9abea3926248c9517676be9b558ca7 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sat, 4 Jun 2022 09:31:06 +0100
-Subject: [PATCH 2/2] build: Set pkgconfig includedir to miniz directory
-
-Allows users to include <miniz.h> instead of <miniz/miniz.h> which
-seems to be the intended behaviour.
---- a/miniz.pc.in
-+++ b/miniz.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
- libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/miniz
-
- Name: @PROJECT_NAME@
- Description: @PROJECT_DESCRIPTION@
diff --git a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch b/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch
deleted file mode 100644
index 37f8c7737819..000000000000
--- a/dev-libs/miniz/files/miniz-2.2.0-fixpcpath.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9cd715b3b1f5accc2e7cd0b167808c1a47a08938 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sat, 4 Jun 2022 09:22:37 +0100
-Subject: [PATCH 1/2] build: Install .pc file in correct directory
-
-/usr/share/pkgconfig should be used for architecture independent
-libraries (e.g. data or scripts), while an architecture dependent
-directory like /usr/lib64/pkgconfig should be used for native
-binaries.
-
-Co-authored-by: Sam James <sam@gentoo.org>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,7 +173,7 @@ if(NOT BUILD_HEADER_ONLY)
- if(INSTALL_PROJECT)
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc
-- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- endif()
- endif()
-
diff --git a/dev-libs/miniz/miniz-2.2.0-r1.ebuild b/dev-libs/miniz/miniz-2.2.0-r1.ebuild
deleted file mode 100644
index af58c8669669..000000000000
--- a/dev-libs/miniz/miniz-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A lossless, high performance data compression library"
-HOMEPAGE="https://github.com/richgel999/miniz"
-SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
-
-PATCHES=(
- # https://bugs.gentoo.org/849578
- # https://github.com/richgel999/miniz/pull/239
- "${FILESDIR}"/${PN}-2.2.0-fixpcpath.patch
- "${FILESDIR}"/${PN}-2.2.0-fixincdir.patch
-)
-
-DOCS=( ChangeLog.md readme.md )
diff --git a/dev-libs/miniz/miniz-3.0.1.ebuild b/dev-libs/miniz/miniz-3.0.1.ebuild
deleted file mode 100644
index 0824c6fd4634..000000000000
--- a/dev-libs/miniz/miniz-3.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A lossless, high performance data compression library"
-HOMEPAGE="https://github.com/richgel999/miniz"
-SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-
-DOCS=( ChangeLog.md readme.md )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-23 15:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-23 15:46 [gentoo-commits] repo/gentoo:master commit in: dev-libs/miniz/, dev-libs/miniz/files/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2021-02-05 2:06 Sam James
2020-12-16 20:16 Dennis Lamm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox