From c9ac6938788ee1708e7c900f8f78e9037aea1ca1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jul 2022 15:07:44 +0100 Subject: gentoo auto-resync : 29:07:2022 - 15:07:44 --- dev-libs/miniz/Manifest | 3 - dev-libs/miniz/files/Config.cmake.in | 1 - .../miniz-2.1.0-export-cmake-build-targets.patch | 177 --------------------- dev-libs/miniz/files/miniz.pc.in | 13 -- 4 files changed, 194 deletions(-) delete mode 100644 dev-libs/miniz/files/Config.cmake.in delete mode 100644 dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch delete mode 100644 dev-libs/miniz/files/miniz.pc.in (limited to 'dev-libs/miniz') diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest index 408feb2602b3..48caf3e1e760 100644 --- a/dev-libs/miniz/Manifest +++ b/dev-libs/miniz/Manifest @@ -1,8 +1,5 @@ -AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de -AUX miniz-2.1.0-export-cmake-build-targets.patch 6510 BLAKE2B 1622c34af849f7b8818463759f205f71e7b64ba52ecc4cb8a552c457577c95cdea5beb94d5f6ffc986960e5a071b00adb54eda7cd1b34a5aeb692f359d989a2f SHA512 b36377b8d19a8b1d8099e0645d90e9f5778a4947de9da0d0bf04eb344a2ab24a1f84e8410115159e59bdb5569268761944409caecb6bb860aff5f42a57b3d9b1 AUX miniz-2.2.0-fixincdir.patch 641 BLAKE2B e98354c7898ecff64ee65bdf42229f29315a59e5e10403104fceaf484bee6ede44ed265e50b767bc80ba622140a15ecf8467e1ca43ed7d74f2fa0d0285f5a6de SHA512 17a0f183aa7257e1eb5a8ba044e3e37f7a5903489883c4655b7976996aa85cde9c7d4c25c1487db3fa30cefe0c5adc72641f21185e9eded2d9890a086c485d05 AUX miniz-2.2.0-fixpcpath.patch 768 BLAKE2B 63f3b6be8be1266b6f3e2db16c0ed42ffefec7b6575a107745775bc1f7c47c463febd6e58e331962b7b2a8aea52379fee1bb6de9fa3921ae470760eb4f0ec9e7 SHA512 049e384397075954a6f581bc8d888e0130a02fda864a79d60f199c77c3305ea5d4bdcd41779985f273fda583e2e9009137eee6133b962041b85b1b08a1d9509c -AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed DIST miniz-2.2.0.tar.gz 113592 BLAKE2B 110a71712396fb22075818f681d2e691b8b361e6c8eb786485f9fd3a1e00fcfc95bae4d470b8b1644a1e9674e69617abdba70e337f318969096db222f7a4c3d2 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 EBUILD miniz-2.2.0-r1.ebuild 616 BLAKE2B 3c4e5256988703cd3b45362c7cb126a0e780bdc3b05907d9439aba5aaa04467803cfdda2f8c707d59a1293cf83a0c1eb81e88bf2260a727c84ce3fc0eabe6b3a SHA512 83599912f92cdaeac2a9c79ff406c6406f990d28e0c1dc66e283f935bd3434265c8d1edf1d8127047f747d912c754dfd475a0191eb9dfbb9ef605769272249eb MISC metadata.xml 1119 BLAKE2B 1524ab132d535eadc17d6897113e61c1f4fe85a693a2f1c7241293e11d7751cb1aa708b227a3afe5c269e6e6cc5d9d4981ef8394cacca00f30b1442a738d90f2 SHA512 8704444d82aa2b7a091b06e6ccf872c477ad9515e860c41f939d628b5b0a7742b8343a50c6e4be202acd9c8cbc98450e7a90ce951a625282dae0beb54420e278 diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in deleted file mode 100644 index 0865ae961005..000000000000 --- a/dev-libs/miniz/files/Config.cmake.in +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index c1fb1a52215d..000000000000 --- a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- 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,120 @@ - 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) -+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 $<$:_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 or -+ 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 deleted file mode 100644 index 51128735847c..000000000000 --- a/dev-libs/miniz/files/miniz.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -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 -- cgit v1.2.3