diff --git a/manifest/armv7l/m/minizip.filelist b/manifest/armv7l/m/minizip.filelist index 7b373f8b28..b729d96cea 100644 --- a/manifest/armv7l/m/minizip.filelist +++ b/manifest/armv7l/m/minizip.filelist @@ -1,4 +1,4 @@ -# Total size: 319363 +# Total size: 372550 /usr/local/bin/miniunzip /usr/local/bin/minizip /usr/local/include/minizip/crypt.h diff --git a/manifest/armv7l/z/zlib.filelist b/manifest/armv7l/z/zlib.filelist index af4f1f623e..934ebd0243 100644 --- a/manifest/armv7l/z/zlib.filelist +++ b/manifest/armv7l/z/zlib.filelist @@ -1,8 +1,22 @@ -# Total size: 193581 +# Total size: 1529976 /usr/local/include/zconf.h /usr/local/include/zlib.h +/usr/local/lib/cmake/zlib/ZLIB-shared-release.cmake +/usr/local/lib/cmake/zlib/ZLIB-shared.cmake +/usr/local/lib/cmake/zlib/ZLIB-static-release.cmake +/usr/local/lib/cmake/zlib/ZLIB-static.cmake +/usr/local/lib/cmake/zlib/ZLIBConfig.cmake +/usr/local/lib/cmake/zlib/ZLIBConfigVersion.cmake +/usr/local/lib/libz.a /usr/local/lib/libz.so /usr/local/lib/libz.so.1 -/usr/local/lib/libz.so.1.3.1 +/usr/local/lib/libz.so.1.3.2 /usr/local/lib/pkgconfig/zlib.pc +/usr/local/share/doc/zlib/zlib/LICENSE +/usr/local/share/doc/zlib/zlib/algorithm.txt +/usr/local/share/doc/zlib/zlib/crc-doc.1.0.pdf +/usr/local/share/doc/zlib/zlib/rfc1950.txt +/usr/local/share/doc/zlib/zlib/rfc1951.txt +/usr/local/share/doc/zlib/zlib/rfc1952.txt +/usr/local/share/doc/zlib/zlib/txtvsbin.txt /usr/local/share/man/man3/zlib.3.zst diff --git a/manifest/i686/m/minizip.filelist b/manifest/i686/m/minizip.filelist index a850ed2f28..a0719ff85e 100644 --- a/manifest/i686/m/minizip.filelist +++ b/manifest/i686/m/minizip.filelist @@ -1,4 +1,4 @@ -# Total size: 355293 +# Total size: 424960 /usr/local/bin/miniunzip /usr/local/bin/minizip /usr/local/include/minizip/crypt.h diff --git a/manifest/i686/z/zlib.filelist b/manifest/i686/z/zlib.filelist index e9935ee40d..0a038f8bb5 100644 --- a/manifest/i686/z/zlib.filelist +++ b/manifest/i686/z/zlib.filelist @@ -1,8 +1,22 @@ -# Total size: 221641 +# Total size: 1549080 /usr/local/include/zconf.h /usr/local/include/zlib.h +/usr/local/lib/cmake/zlib/ZLIB-shared-release.cmake +/usr/local/lib/cmake/zlib/ZLIB-shared.cmake +/usr/local/lib/cmake/zlib/ZLIB-static-release.cmake +/usr/local/lib/cmake/zlib/ZLIB-static.cmake +/usr/local/lib/cmake/zlib/ZLIBConfig.cmake +/usr/local/lib/cmake/zlib/ZLIBConfigVersion.cmake +/usr/local/lib/libz.a /usr/local/lib/libz.so /usr/local/lib/libz.so.1 -/usr/local/lib/libz.so.1.3.1 +/usr/local/lib/libz.so.1.3.2 /usr/local/lib/pkgconfig/zlib.pc +/usr/local/share/doc/zlib/zlib/LICENSE +/usr/local/share/doc/zlib/zlib/algorithm.txt +/usr/local/share/doc/zlib/zlib/crc-doc.1.0.pdf +/usr/local/share/doc/zlib/zlib/rfc1950.txt +/usr/local/share/doc/zlib/zlib/rfc1951.txt +/usr/local/share/doc/zlib/zlib/rfc1952.txt +/usr/local/share/doc/zlib/zlib/txtvsbin.txt /usr/local/share/man/man3/zlib.3.zst diff --git a/manifest/x86_64/m/minizip.filelist b/manifest/x86_64/m/minizip.filelist index 4eee85529f..0a4a372304 100644 --- a/manifest/x86_64/m/minizip.filelist +++ b/manifest/x86_64/m/minizip.filelist @@ -1,4 +1,4 @@ -# Total size: 355351 +# Total size: 424830 /usr/local/bin/miniunzip /usr/local/bin/minizip /usr/local/include/minizip/crypt.h diff --git a/manifest/x86_64/z/zlib.filelist b/manifest/x86_64/z/zlib.filelist index 610872da0a..b5787ccf3e 100644 --- a/manifest/x86_64/z/zlib.filelist +++ b/manifest/x86_64/z/zlib.filelist @@ -1,8 +1,22 @@ -# Total size: 230201 +# Total size: 1588676 /usr/local/include/zconf.h /usr/local/include/zlib.h +/usr/local/lib64/cmake/zlib/ZLIB-shared-release.cmake +/usr/local/lib64/cmake/zlib/ZLIB-shared.cmake +/usr/local/lib64/cmake/zlib/ZLIB-static-release.cmake +/usr/local/lib64/cmake/zlib/ZLIB-static.cmake +/usr/local/lib64/cmake/zlib/ZLIBConfig.cmake +/usr/local/lib64/cmake/zlib/ZLIBConfigVersion.cmake +/usr/local/lib64/libz.a /usr/local/lib64/libz.so /usr/local/lib64/libz.so.1 -/usr/local/lib64/libz.so.1.3.1 +/usr/local/lib64/libz.so.1.3.2 /usr/local/lib64/pkgconfig/zlib.pc +/usr/local/share/doc/zlib/zlib/LICENSE +/usr/local/share/doc/zlib/zlib/algorithm.txt +/usr/local/share/doc/zlib/zlib/crc-doc.1.0.pdf +/usr/local/share/doc/zlib/zlib/rfc1950.txt +/usr/local/share/doc/zlib/zlib/rfc1951.txt +/usr/local/share/doc/zlib/zlib/rfc1952.txt +/usr/local/share/doc/zlib/zlib/txtvsbin.txt /usr/local/share/man/man3/zlib.3.zst diff --git a/packages/minizip.rb b/packages/minizip.rb index 0418bd0709..f6a8770c7a 100644 --- a/packages/minizip.rb +++ b/packages/minizip.rb @@ -4,7 +4,7 @@ Package.load_package("#{__dir__}/zlib.rb") class Minizip < Package description 'Minizip is a simple package to zip/unzip files, from zlib.' homepage Zlib.homepage - version '1.3.1' + version '1.3.2' # When upgrading minizip, be sure to upgrade zlib in tandem. puts "#{self} version differs from Zlib version #{Zlib.version.split('-').first}".orange if version != Zlib.version.split('-').first license Zlib.license @@ -14,13 +14,14 @@ class Minizip < Package binary_compression 'tar.zst' binary_sha256({ - aarch64: 'd905ac78dcf4be301c0b03cd68b1d98fdfd4607c50a6e118ecd823708691640a', - armv7l: 'd905ac78dcf4be301c0b03cd68b1d98fdfd4607c50a6e118ecd823708691640a', - i686: '42fddacd0c45d8a290068b369bb4037dae00356b7037b7a05f7f13984535aa9f', - x86_64: 'fbdfaeb7561751925637c326da3e6a008cb65ce4918aff2151596d52058fa614' + aarch64: '1dd507a336eee780e3919360cd434165251a2d86f7b11561357660903e8278de', + armv7l: '1dd507a336eee780e3919360cd434165251a2d86f7b11561357660903e8278de', + i686: '34ea7026b146354b7f8adcbbd10cfd3b477f954ad7c151edd5382dcafe76b8bf', + x86_64: 'b1d8049921c59764d2173b0f83d73ba1328030442f2bf94ee55cdaee8457b76e' }) - depends_on 'zlib' # R + depends_on 'glibc' => :library + depends_on 'zlib' => :library def self.build Dir.chdir 'contrib/minizip' do diff --git a/packages/zlib.rb b/packages/zlib.rb index 5c024ced61..f49571ccca 100644 --- a/packages/zlib.rb +++ b/packages/zlib.rb @@ -3,24 +3,24 @@ require 'buildsystems/cmake' class Zlib < CMake description 'zlib is a massively spiffy yet delicately unobtrusive compression library.' homepage 'https://www.zlib.net' - version '1.3.1-3' # Do not use @_ver here, it will break the installer. + version '1.3.2' # Do not use @_ver here, it will break the installer. # When upgrading zlib, be sure to upgrade minizip in tandem. # The following breaks the installer script. # puts "#{self} version differs from Minizip version #{Minizip.version}".orange if @_ver != Minizip.version license 'zlib' compatibility 'all' - source_url "https://www.zlib.net/zlib-#{version.split('-').first}.tar.gz" - source_sha256 '9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23' + source_url "https://www.zlib.net/zlib-#{version}.tar.gz" + source_sha256 'bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16' binary_compression 'tar.zst' binary_sha256({ - aarch64: '91195628001afc8a237774386e6ca494fa820f073985355544a0bb177389d7aa', - armv7l: '91195628001afc8a237774386e6ca494fa820f073985355544a0bb177389d7aa', - i686: '463a48ec367bc9920178643139a3eabe3c648ed513f35c18c5e28ea5040f664b', - x86_64: 'dde89b4ba95675c8e3fa91123f6c5b35712571970b5ddcae6f3d25d25162b1b2' + aarch64: '26aa5e640e2da1feb28f5b18e5897f1a5124dcdc2091a126836b520ab210312c', + armv7l: '26aa5e640e2da1feb28f5b18e5897f1a5124dcdc2091a126836b520ab210312c', + i686: 'dd1167ab9dec26ae6429cfe3035c9ae8569b51add890b387b677ec661c5174bd', + x86_64: 'eb8dcb63a7b08dcedb52e8aa19a100ac4c0c45e0b1b3945d45538485cb6093f3' }) - depends_on 'glibc' # R + depends_on 'glibc' => :library cmake_options "#{CREW_CMAKE_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} -Wno-dev" @@ -30,10 +30,4 @@ class Zlib < CMake system "sed -i 's,CMAKE_INSTALL_PREFIX}/lib,CMAKE_INSTALL_PREFIX}/#{ARCH_LIB},g' CMakeLists.txt" system "sed -i 's,CMAKE_INSTALL_PREFIX}/share/pkgconfig,CMAKE_INSTALL_PREFIX}/#{ARCH_LIB}/pkgconfig,g' CMakeLists.txt" end - - def self.install - system "DESTDIR=#{CREW_DEST_DIR} #{CREW_NINJA} -C builddir install" - # Remove static library. - FileUtils.rm "#{CREW_DEST_LIB_PREFIX}/libz.a" - end end diff --git a/tools/automatically_updatable_packages/minizip b/tools/automatically_updatable_packages/minizip new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/automatically_updatable_packages/zlib b/tools/automatically_updatable_packages/zlib new file mode 100644 index 0000000000..e69de29bb2