CVS commit: pkgsrc/devel/snappy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 28 18:46:09 UTC 2021

Modified Files:
        pkgsrc/devel/snappy: Makefile distinfo
Added Files:
        pkgsrc/devel/snappy/patches: patch-snappy.cc
Removed Files:
        pkgsrc/devel/snappy/patches: patch-CMakeLists.txt

Log Message:
snappy: update to 1.1.9.

    Performance improvements.
    Google Test and Google Benchmark are now bundled in third_party/.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/snappy/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/snappy/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/snappy/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/snappy/patches/patch-snappy.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/snappy/Makefile
diff -u pkgsrc/devel/snappy/Makefile:1.15 pkgsrc/devel/snappy/Makefile:1.16
--- pkgsrc/devel/snappy/Makefile:1.15   Sun Jun 27 11:45:54 2021
+++ pkgsrc/devel/snappy/Makefile        Mon Jun 28 18:46:09 2021
@@ -1,32 +1,21 @@
-# $NetBSD: Makefile,v 1.15 2021/06/27 11:45:54 tnn Exp $
+# $NetBSD: Makefile,v 1.16 2021/06/28 18:46:09 wiz Exp $
 
-GITHUB_TAG=    ${PKGVERSION_NOREV}
-DISTNAME=      snappy-1.1.8
-PKGREVISION=   1
+DISTNAME=      snappy-1.1.9
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    agc%NetBSD.org@localhost
 HOMEPAGE=      https://google.github.io/snappy/
 COMMENT=       General purpose data compression library
 LICENSE=       apache-2.0
 
-
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
-TEST_TARGET=           test
-TEST_ENV+=             LD_LIBRARY_PATH=${WRKSRC}
-
-CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
-
-.include "../../mk/bsd.prefs.mk"
 
-.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
-CMAKE_ARGS+=   -DSNAPPY_BUILD_TESTS=ON
-.include "../../devel/googletest/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DSNAPPY_BUILD_TESTS=OFF
-.endif
+CMAKE_ARGS+=           -DSNAPPY_BUILD_TESTS:BOOL=OFF
+CMAKE_ARGS+=           -DSNAPPY_BUILD_BENCHMARKS:BOOL=OFF
+CMAKE_ARGS+=           -DBUILD_SHARED_LIBS=ON
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/snappy/distinfo
diff -u pkgsrc/devel/snappy/distinfo:1.11 pkgsrc/devel/snappy/distinfo:1.12
--- pkgsrc/devel/snappy/distinfo:1.11   Thu Jan 16 10:44:25 2020
+++ pkgsrc/devel/snappy/distinfo        Mon Jun 28 18:46:09 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2020/01/16 10:44:25 adam Exp $
+$NetBSD: distinfo,v 1.12 2021/06/28 18:46:09 wiz Exp $
 
-SHA1 (snappy-1.1.8.tar.gz) = 1eeb144e7b564dd726136c97f869b453d2fb7924
-RMD160 (snappy-1.1.8.tar.gz) = a4a8766720094b1eba919a617dfeb91e0bf9b8c2
-SHA512 (snappy-1.1.8.tar.gz) = efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
-Size (snappy-1.1.8.tar.gz) = 1096137 bytes
-SHA1 (patch-CMakeLists.txt) = 3cd605de3252208a61ee5c39a628ac89f26d93a2
+SHA1 (snappy-1.1.9.tar.gz) = 83f767c2bc1b0d9114273b883771491ae2bf6f4f
+RMD160 (snappy-1.1.9.tar.gz) = d95b57af803607c75de084968a3029e9609fca29
+SHA512 (snappy-1.1.9.tar.gz) = f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
+Size (snappy-1.1.9.tar.gz) = 1102382 bytes
+SHA1 (patch-snappy.cc) = fd4860a363193dce2af697ee7a87740a74c21e05

Added files:

Index: pkgsrc/devel/snappy/patches/patch-snappy.cc
diff -u /dev/null pkgsrc/devel/snappy/patches/patch-snappy.cc:1.3
--- /dev/null   Mon Jun 28 18:46:09 2021
+++ pkgsrc/devel/snappy/patches/patch-snappy.cc Mon Jun 28 18:46:09 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-snappy.cc,v 1.3 2021/06/28 18:46:09 wiz Exp $
+
+Build fix for 1.1.9 from
+https://github.com/google/snappy/pull/128/commits/0c716d435abe65250100c2caea0e5126ac4e14bd
+
+--- snappy.cc.orig     2021-05-04 22:53:34.000000000 +0000
++++ snappy.cc
+@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* 
+ }
+ 
+ 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