CVS commit: pkgsrc/devel/snappy

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul 14 17:27:41 UTC 2017

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

Log Message:
Snappy v1.1.6:

This is a re-release of v1.1.5 with proper SONAME / SOVERSION values.

Snappy v1.1.5:

This release has broken SONAME / SOVERSION values. Users of snappy as a shared
library should avoid 1.1.5 and use 1.1.6 instead. SONAME / SOVERSION errors will
manifest as the dynamic library loader complaining that it cannot find snappy's
shared library file (libsnappy.so / libsnappy.dylib), or that the library it
found does not have the required version. 1.1.6 has the same code as 1.1.5, but
carries build configuration fixes for the issues above.

  * Add CMake build support. The autoconf build support is now deprecated, and
    will be removed in the next release.

  * Add AppVeyor configuration, for Windows CI coverage.

  * Small performance improvement on little-endian PowerPC.

  * Small performance improvement on LLVM with position-independent executables.

  * Fix a few issues with various build environments.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/snappy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/snappy/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/snappy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/snappy/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/snappy/patches/patch-snappy.cc \
    pkgsrc/devel/snappy/patches/patch-snappy__unittest.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.9 pkgsrc/devel/snappy/Makefile:1.10
--- pkgsrc/devel/snappy/Makefile:1.9    Sat Jun 24 18:57:28 2017
+++ pkgsrc/devel/snappy/Makefile        Fri Jul 14 17:27:40 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2017/06/24 18:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.10 2017/07/14 17:27:40 adam Exp $
 
-DISTNAME=      snappy-1.1.4
+DISTNAME=      snappy-1.1.6
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=google/}
 
@@ -9,13 +9,12 @@ HOMEPAGE=     http://google.github.io/snappy
 COMMENT=       General purpose data compression library
 LICENSE=       apache-2.0
 
-GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
+USE_CMAKE=             yes
 USE_LANGUAGES+=                c c++
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE+=   snappy.pc.in
 
+.include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/googletest/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/snappy/PLIST
diff -u pkgsrc/devel/snappy/PLIST:1.3 pkgsrc/devel/snappy/PLIST:1.4
--- pkgsrc/devel/snappy/PLIST:1.3       Sun Feb 26 08:41:17 2017
+++ pkgsrc/devel/snappy/PLIST   Fri Jul 14 17:27:40 2017
@@ -1,14 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2017/02/26 08:41:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/07/14 17:27:40 adam Exp $
 include/snappy-c.h
 include/snappy-sinksource.h
 include/snappy-stubs-public.h
 include/snappy.h
-lib/libsnappy.la
-lib/pkgconfig/snappy.pc
-share/doc/snappy/COPYING
-share/doc/snappy/ChangeLog
-share/doc/snappy/INSTALL
-share/doc/snappy/NEWS
-share/doc/snappy/README
-share/doc/snappy/format_description.txt
-share/doc/snappy/framing_format.txt
+lib/cmake/Snappy/SnappyTargets-noconfig.cmake
+lib/cmake/Snappy/SnappyTargets.cmake
+lib/cmake/SnappyConfig.cmake
+lib/cmake/SnappyConfigVersion.cmake
+lib/libsnappy.so
+lib/libsnappy.so.1
+lib/libsnappy.so.1.1.6

Index: pkgsrc/devel/snappy/distinfo
diff -u pkgsrc/devel/snappy/distinfo:1.7 pkgsrc/devel/snappy/distinfo:1.8
--- pkgsrc/devel/snappy/distinfo:1.7    Wed May 31 08:52:40 2017
+++ pkgsrc/devel/snappy/distinfo        Fri Jul 14 17:27:40 2017
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/05/31 08:52:40 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2017/07/14 17:27:40 adam Exp $
 
-SHA1 (snappy-1.1.4.tar.gz) = 0fac144661573c747ad612c01d03a89e0a2280c7
-RMD160 (snappy-1.1.4.tar.gz) = 58fe5003fdbf3f731d6414ea90550fd64cae40e3
-SHA512 (snappy-1.1.4.tar.gz) = 4f522f1d541e3f00d82ccaf6dda5c6ede28d4db19c53717003d8057261fe8630516ed6ff2a28615da032e0de9c6200b560ed5fce4f8714df9916d50d6a7c2178
-Size (snappy-1.1.4.tar.gz) = 1491767 bytes
-SHA1 (patch-snappy.cc) = c90f4893f0b1e3cb5b4507bdd13ac558dbfc8693
-SHA1 (patch-snappy__unittest.cc) = b761c7ea6490896ea5aabb425c5a18309e1d7e90
+SHA1 (snappy-1.1.6.tar.gz) = 8d428406c3145edf1d1096cc6eddb995e32e1655
+RMD160 (snappy-1.1.6.tar.gz) = 9b71dc2cb330dac502fda4565895cba4f02ae044
+SHA512 (snappy-1.1.6.tar.gz) = 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf
+Size (snappy-1.1.6.tar.gz) = 1128388 bytes
+SHA1 (patch-CMakeLists.txt) = 1ad499704436db4f1cd81b07c66d5a3b31f71c81

Added files:

Index: pkgsrc/devel/snappy/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/snappy/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Jul 14 17:27:41 2017
+++ pkgsrc/devel/snappy/patches/patch-CMakeLists.txt    Fri Jul 14 17:27:40 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2017/07/14 17:27:40 adam Exp $
+
+Correcly link against googletest libraries.
+
+--- CMakeLists.txt.orig        2017-07-14 08:22:42.000000000 +0000
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ ENDIF (HAVE_LIBQUICKLZ)
+ ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
+ TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
+ TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
+-                      ${GFLAGS_LIBRARIES})
++                      ${GTEST_BOTH_LIBRARIES})
+ TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
+                            ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
+