git: f24377b7b9eb - main - archivers/snappy: update to 1.2.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 06 Jun 2024 05:21:19 UTC
The branch main has been updated by vanilla:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f24377b7b9ebd842c9d458a04eb6c68dfa592fae
commit f24377b7b9ebd842c9d458a04eb6c68dfa592fae
Author: Vanilla I. Shu <vanilla@FreeBSD.org>
AuthorDate: 2024-06-06 03:03:23 +0000
Commit: Vanilla I. Shu <vanilla@FreeBSD.org>
CommitDate: 2024-06-06 05:21:12 +0000
archivers/snappy: update to 1.2.1
---
archivers/snappy/Makefile | 2 +-
archivers/snappy/distinfo | 6 ++---
archivers/snappy/files/patch-CMakeLists.txt | 40 +++++++++++------------------
3 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 9278973efcfd..4f722de84b77 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -1,5 +1,5 @@
PORTNAME= snappy
-DISTVERSION= 1.2.0
+DISTVERSION= 1.2.1
CATEGORIES= archivers
MAINTAINER= vanilla@FreeBSD.org
diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo
index d362e3372754..7202568365c9 100644
--- a/archivers/snappy/distinfo
+++ b/archivers/snappy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712399939
-SHA256 (google-snappy-1.2.0_GH0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e
-SIZE (google-snappy-1.2.0_GH0.tar.gz) = 1107265
+TIMESTAMP = 1717485290
+SHA256 (google-snappy-1.2.1_GH0.tar.gz) = 736aeb64d86566d2236ddffa2865ee5d7a82d26c9016b36218fcc27ea4f09f86
+SIZE (google-snappy-1.2.1_GH0.tar.gz) = 1108761
diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt
index 1359fddec816..be8f6d0055d1 100644
--- a/archivers/snappy/files/patch-CMakeLists.txt
+++ b/archivers/snappy/files/patch-CMakeLists.txt
@@ -1,27 +1,18 @@
---- CMakeLists.txt.orig 2024-04-04 19:04:38 UTC
+--- CMakeLists.txt.orig 2024-05-21 19:36:39 UTC
+++ CMakeLists.txt
-@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.1)
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- cmake_minimum_required(VERSION 3.1)
--project(Snappy VERSION 1.1.10 LANGUAGES C CXX)
-+project(Snappy VERSION 1.2.0 LANGUAGES C CXX)
-
- # C++ standard can be overridden when this is used as a sub-project.
- if(NOT CMAKE_CXX_STANDARD)
-@@ -83,8 +83,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+@@ -53,8 +53,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ add_definitions(-D_HAS_EXCEPTIONS=0)
# Disable RTTI.
-- string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+- string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") # devel/folly requires RTTI info, see https://github.com/facebook/folly/issues/1606
-+ string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
++ string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ endif()
- endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-
- # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ # Use -Wall for clang and gcc.
+ if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
@@ -248,8 +250,7 @@ configure_file(
"snappy-stubs-public.h.in"
"${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
@@ -32,7 +23,7 @@
PRIVATE
"snappy-internal.h"
"snappy-stubs-internal.h"
-@@ -270,20 +271,35 @@ target_sources(snappy
+@@ -270,20 +271,34 @@ target_sources(snappy
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
$<INSTALL_INTERFACE:include/snappy-stubs-public.h>
)
@@ -54,25 +45,24 @@
- set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif(BUILD_SHARED_LIBS)
+set_target_properties(snappy PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
+add_library(snappy-static STATIC)
+target_sources(snappy-static ${SNAPPY_SRCS})
+target_include_directories(snappy-static ${SNAPPY_INCS})
+set_target_properties(snappy-static
+ PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-+
+
+target_compile_definitions(snappy-static PRIVATE -DHAVE_CONFIG_H)
+
+if (MSVC)
-+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static)
++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy-static)
+else()
-+ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy)
++ set_target_properties(snappy-static PROPERTIES OUTPUT_NAME snappy)
+endif()
+
if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
add_library(snappy_test_support "")
target_sources(snappy_test_support
-@@ -399,7 +415,7 @@ if(SNAPPY_INSTALL)
+@@ -399,7 +414,7 @@ if(SNAPPY_INSTALL)
include(GNUInstallDirs)
if(SNAPPY_INSTALL)