opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

archivers/snappy: sync with upstream 

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2024-04-15 21:06:47 +02:00
parent 3e02d2b4f1
commit 8a7dad5beb
7 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archivers/snappy/Makefile
View File

@ -1,6 +1,5 @@
PORTNAME= snappy
PORTVERSION= 1.1.10
PORTREVISION= 0
DISTVERSION= 1.2.0
CATEGORIES= archivers
MAINTAINER= vanilla@FreeBSD.org
@ -8,22 +7,27 @@ COMMENT= Fast compressor/decompressor library
WWW= https://google.github.io/snappy/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake compiler:c++11-lang cpe
USE_LDCONFIG= yes
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_OFF= SNAPPY_BUILD_TESTS SNAPPY_BUILD_BENCHMARKS
CMAKE_BUILD_TYPE= Release
CPE_VENDOR= google
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= google
PLIST_SUB+= PORTVERSION=${PORTVERSION}
SUB_FILES+= snappy.pc
SUB_LIST+= PORTVERSION=${PORTVERSION}
PIE_UNSAFE= yes
PLIST_SUB= DISTVERSION=${DISTVERSION}
SUB_FILES= snappy.pc
SUB_LIST= DISTVERSION=${DISTVERSION}
CMAKE_OFF= SNAPPY_BUILD_BENCHMARKS \
SNAPPY_BUILD_TESTS
CMAKE_ON= BUILD_SHARED_LIBS
post-install:
@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${PORTVERSION}
@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${DISTVERSION}
${INSTALL_DATA} ${WRKDIR}/snappy.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig
.include <bsd.port.mk>

6
archivers/snappy/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1678607829
SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312
TIMESTAMP = 1712399939
SHA256 (google-snappy-1.2.0_GH0.tar.gz) = 9b8f10fbb5e3bc112f2e5e64f813cb73faea42ec9c533a5023b5ae08aedef42e
SIZE (google-snappy-1.2.0_GH0.tar.gz) = 1107265

19
archivers/snappy/files/patch-CMakeLists.txt
View File

@ -1,6 +1,15 @@
--- CMakeLists.txt.orig 2023-03-08 23:44:00 UTC
--- CMakeLists.txt.orig 2024-04-04 19:04:38 UTC
+++ CMakeLists.txt
@@ -78,8 +78,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
@@ -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")
# Disable RTTI.
@ -13,7 +22,7 @@
endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
@@ -235,8 +237,7 @@ configure_file(
@@ -248,8 +250,7 @@ configure_file(
"snappy-stubs-public.h.in"
"${PROJECT_BINARY_DIR}/snappy-stubs-public.h")
@ -23,7 +32,7 @@
PRIVATE
"snappy-internal.h"
"snappy-stubs-internal.h"
@@ -257,20 +258,35 @@ target_sources(snappy
@@ -270,20 +271,35 @@ target_sources(snappy
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/snappy-stubs-public.h>
$<INSTALL_INTERFACE:include/snappy-stubs-public.h>
)
@ -63,7 +72,7 @@
if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
add_library(snappy_test_support "")
target_sources(snappy_test_support
@@ -381,7 +397,7 @@ endif(SNAPPY_FUZZING_BUILD)
@@ -399,7 +415,7 @@ if(SNAPPY_INSTALL)
include(GNUInstallDirs)
if(SNAPPY_INSTALL)

4
archivers/snappy/files/patch-snappy-internal.h
View File

@ -1,6 +1,6 @@
--- snappy-internal.h.orig 2023-04-13 12:38:13 UTC
--- snappy-internal.h.orig 2024-04-04 19:04:38 UTC
+++ snappy-internal.h
@@ -102,6 +102,15 @@ inline void V128_StoreU(V128* dst, V128 val) {
@@ -104,6 +104,15 @@ inline void V128_StoreU(V128* dst, V128 val) {
vst1q_u8(reinterpret_cast<uint8_t*>(dst), val);
}

11
archivers/snappy/files/patch-snappy.cc
View File

@ -1,11 +0,0 @@
--- snappy.cc.orig 2023-03-12 08:04:09 UTC
+++ snappy.cc
@@ -1290,7 +1290,7 @@ std::pair<const uint8_t*, ptrdiff_t> DecompressBranchl
DeferMemCopy(&deferred_src, &deferred_length, from, len);
}
} while (ip < ip_limit_min_slop &&
- (op + deferred_length) < op_limit_min_slop);
+ (op + deferred_length) < (size_t)op_limit_min_slop);
exit:
ip--;
assert(ip <= ip_limit);

2
archivers/snappy/files/snappy.pc.in
View File

@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: snappy
Description: A fast compression/decompression library
Version: %%PORTVERSION%%
Version: %%DISTVERSION%%
Libs: -L${libdir} -lsnappy
Cflags: -I${includedir}

2
archivers/snappy/pkg-plist
View File

@ -9,5 +9,5 @@ lib/cmake/Snappy/SnappyTargets.cmake
lib/libsnappy.a
lib/libsnappy.so
lib/libsnappy.so.1
lib/libsnappy.so.%%PORTVERSION%%
lib/libsnappy.so.%%DISTVERSION%%
libdata/pkgconfig/snappy.pc