commit e01636677b596995c40ed5f5fc6185b74fd53f60 Author: Tim Biermann <tbier@posteo.de> Date: Fri Mar 10 16:30:54 2023 +0100 snappy: 1.1.9 -> 1.1.10 diff --git a/snappy/.footprint b/snappy/.footprint index 58523d895..3762b1588 100644 --- a/snappy/.footprint +++ b/snappy/.footprint @@ -12,7 +12,7 @@ drwxr-xr-x root/root usr/lib/cmake/Snappy/ -rw-r--r-- root/root usr/lib/cmake/Snappy/SnappyTargets-release.cmake -rw-r--r-- root/root usr/lib/cmake/Snappy/SnappyTargets.cmake lrwxrwxrwx root/root usr/lib/libsnappy.so -> libsnappy.so.1 -lrwxrwxrwx root/root usr/lib/libsnappy.so.1 -> libsnappy.so.1.1.9 --rwxr-xr-x root/root usr/lib/libsnappy.so.1.1.9 +lrwxrwxrwx root/root usr/lib/libsnappy.so.1 -> libsnappy.so.1.1.10 +-rwxr-xr-x root/root usr/lib/libsnappy.so.1.1.10 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/snappy.pc diff --git a/snappy/.signature b/snappy/.signature index 604f12f8b..e8371c882 100644 --- a/snappy/.signature +++ b/snappy/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YTrt7hBoEBgXLRxBdbQFK63OwrsMMC0xNc//Gndv9VQ1IICKUxApl+qIDHe5u7ed0MgAxq8mX3oC+NcCvBgIw8= -SHA256 (Pkgfile) = 69c9f921cd9e5ceb256fed07c88e8672d59fd3021c0ee36e49e9689d45ed7d77 -SHA256 (.footprint) = a8acb3c1a1ebe35b1b5bfe6bc6917e8fbd654cfbbf0520d626ddcf5262650da9 -SHA256 (snappy-1.1.9.tar.gz) = 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 +RWSE3ohX2g5d/S87Uv/k25m1Zo3MTur0KmaqeakKDIGAt13bxqF2XOOstRpBPhU/iYgSXu/1VdTgNICMx97/OZS2A6DbLRigdgU= +SHA256 (Pkgfile) = 0702f22448b4ef9872e65fe825c89954b6d1a5d04559c39d3f17c20b611b6049 +SHA256 (.footprint) = 4e6caf096a0a3890f9fed498418de3635acfb1fdb7239bd17bff22934bd70eee +SHA256 (snappy-1.1.10.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90 SHA256 (snappy-thirdparty.patch) = c9599e8a4880e7205c74aaadad153c5426853d11ffb7c8a6862d3e291353de7d -SHA256 (snappy-inline.patch) = e8c2d80a6425f9bdf4faf0bd24fdb5f5c55633d9c8775a3bc37ee518b944fae3 SHA256 (snappy-do-not-disable-rtti.patch) = 0934868ea57a9d9cb3f55b5a2bf0c66f53ec130bd1e1bb3f83f200e6cf3af557 diff --git a/snappy/Pkgfile b/snappy/Pkgfile index f0bcd7d7f..a289854a6 100644 --- a/snappy/Pkgfile +++ b/snappy/Pkgfile @@ -1,27 +1,19 @@ # Description: A fast compressor/decompressor library # URL: https://google.github.io/snappy/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: cmake name=snappy -version=1.1.9 +version=1.1.10 release=1 source=(https://github.com/google/snappy/archive/$version/$name-$version.tar.gz snappy-thirdparty.patch - snappy-inline.patch snappy-do-not-disable-rtti.patch) build() { - prt-get isinst ninja && PKGMK_SNAPPY+=' -G Ninja' - patch -d $name-$version -p1 -i $SRC/snappy-thirdparty.patch - patch -d $name-$version -p1 -i $SRC/snappy-inline.patch patch -d $name-$version -p1 -i $SRC/snappy-do-not-disable-rtti.patch - # compile without assertions - CXXFLAGS+=\ -DNDEBUG - - cmake -S $name-$version -B build $PKGMK_SNAPPY \ + cmake -S $name-$version -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ @@ -49,6 +41,6 @@ Version: ${version} Cflags: -I\${includedir} Libs: -L\${libdir} -lsnappy EOF - + install -Dm644 snappy.pc $PKG/usr/lib/pkgconfig/snappy.pc } diff --git a/snappy/snappy-inline.patch b/snappy/snappy-inline.patch deleted file mode 100644 index 46ed42534..000000000 --- a/snappy/snappy-inline.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r fd16c2ca3237 snappy.cc ---- a/snappy.cc Sat May 15 15:06:59 2021 +0200 -+++ b/snappy.cc Sat May 15 15:07:31 2021 +0200 -@@ -1014,7 +1014,7 @@ - } - - SNAPPY_ATTRIBUTE_ALWAYS_INLINE --size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { -+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { - const uint8_t*& ip = *ip_p; - // This section is crucial for the throughput of the decompression loop. - // The latency of an iteration is fundamentally constrained by the