pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/snappy Snappy v1.1.6:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2bfd6a2c6bc
branches:  trunk
changeset: 365370:f2bfd6a2c6bc
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jul 14 17:27:40 2017 +0000

description:
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.

diffstat:

 devel/snappy/Makefile                          |  11 +++++------
 devel/snappy/PLIST                             |  18 ++++++++----------
 devel/snappy/distinfo                          |  13 ++++++-------
 devel/snappy/patches/patch-CMakeLists.txt      |  15 +++++++++++++++
 devel/snappy/patches/patch-snappy.cc           |  15 ---------------
 devel/snappy/patches/patch-snappy__unittest.cc |  26 --------------------------
 6 files changed, 34 insertions(+), 64 deletions(-)

diffs (141 lines):

diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/Makefile
--- a/devel/snappy/Makefile     Fri Jul 14 17:04:29 2017 +0000
+++ b/devel/snappy/Makefile     Fri Jul 14 17:27:40 2017 +0000
@@ -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 @@
 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"
diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/PLIST
--- a/devel/snappy/PLIST        Fri Jul 14 17:04:29 2017 +0000
+++ b/devel/snappy/PLIST        Fri Jul 14 17:27:40 2017 +0000
@@ -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
diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/distinfo
--- a/devel/snappy/distinfo     Fri Jul 14 17:04:29 2017 +0000
+++ b/devel/snappy/distinfo     Fri Jul 14 17:27:40 2017 +0000
@@ -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
diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/snappy/patches/patch-CMakeLists.txt Fri Jul 14 17:27:40 2017 +0000
@@ -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})
+ 
diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/patches/patch-snappy.cc
--- a/devel/snappy/patches/patch-snappy.cc      Fri Jul 14 17:04:29 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-snappy.cc,v 1.1 2017/05/31 08:52:41 jperkin Exp $
-
-Fix SSE2 include, patch from upstream.
-
---- snappy.cc.orig     1980-01-01 08:00:00.000000000 +0000
-+++ snappy.cc
-@@ -30,7 +30,7 @@
- #include "snappy-internal.h"
- #include "snappy-sinksource.h"
- 
--#if defined(__x86_64__) || defined(_M_X64)
-+#ifdef __SSE2__
- #include <emmintrin.h>
- #endif
- #include <stdio.h>
diff -r a053e558e095 -r f2bfd6a2c6bc devel/snappy/patches/patch-snappy__unittest.cc
--- a/devel/snappy/patches/patch-snappy__unittest.cc    Fri Jul 14 17:04:29 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-snappy__unittest.cc,v 1.1 2017/02/26 08:41:17 adam Exp $
-
-Depending on the definition of LZF_STATE_ARG, lzf can grow an extra arg.
-Accommodate.
-
---- snappy_unittest.cc.orig    1980-01-01 08:00:00.000000000 +0000
-+++ snappy_unittest.cc
-@@ -219,10 +219,17 @@ static bool Compress(const char* input, 
- 
- #ifdef LZF_VERSION
-     case LIBLZF: {
-+#  ifdef LZF_STATE_ARG
-+      LZF_STATE htab;
-+#  endif
-       int destlen = lzf_compress(input,
-                                  input_size,
-                                  string_as_array(compressed),
--                                 input_size);
-+                                 input_size
-+#  ifdef LZF_STATE_ARG
-+                               , htab
-+#  endif
-+                               );
-       if (destlen == 0) {
-         // lzf *can* cause lots of blowup when compressing, so they
-         // recommend to limit outsize to insize, and just not compress



Home | Main Index | Thread Index | Old Index