From nobody Sun Apr 07 10:14:33 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VC7PP3Rxqz5GTvZ; Sun, 7 Apr 2024 10:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VC7PP2yj9z4tGx; Sun, 7 Apr 2024 10:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712484873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BtySrPAjLh2OjUia8tetYVHXFBTzGolKbb6UAy5jnM=; b=wZX9JR6bB0CWtIGVVaHnKvYv5gv+ciondrTkEVu5BsCSAzYFXBozErI0o1d7TDopZ2B92i Q8IDbAmgbay9/CmYJxeNpQuIbWsJuSrtjEExJKsEB0Ocr9bdCffxGJ5Xy5aGtS+KtSXSKI 1tXX6re/4wxv2llhG4K/yrio8Sg7O/1I9tDxATdyT7uBP84oGwTt90tQf1iuzEx22r6Dmb 6pWb+193EeGcbTvFuG1LxwYOuWLgvUksVTybKyQHqmDgeTGtMLJ7PJVIW3YM/GWB0kVvBa Xk7+v4e5ilGGfCk14AOyon48/D85epm5jiokEK24Mw5ewrTQWUwc32jmXuzz6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712484873; a=rsa-sha256; cv=none; b=UF6X+5y48PGmoNIlHJ8Dtft2x9x4gSeqrdod3HBM5uv8cb8jH11npbZqfQLz1tQvXBN1Pg 6oP4Di8On8rqtdeLXRVxMI41RFmXGY7R1bHpK9bcw8N5PCkl2Pzt+FRUOQo4bqM0dwOTAL 6C7yZQrBJcnvV5VEwSWhjOr5jCL4CcxUhPxOxT1jLJnwPsIBXjNARa2LMpZnBbijibTtee jzYfnM7iYomhW+flTGw4LEkv5/Z2CYbQgHHBNdF+uId0cfUmvEmYGXWWInXEv/QX6v+xjx Qcr2xjrhbvahPscEEJ3w9GDZLLrsorxKVjm5tOUCpjCDPxKRRKgzRRspMBI9Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712484873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BtySrPAjLh2OjUia8tetYVHXFBTzGolKbb6UAy5jnM=; b=RLiuypwk2Ep3KDQ8JyNQiiTOySdhKWvrDZblTiD9aoo0JYcnE4lSECx5MKyg5aht81BrmY 61vh6fxdUuJGgNNq0QFNmbZbobd4iryfECZh7s09Aj+lZCucslxl//1ovkhTopYuH/44zS Hby+u4KjP77WexHHOQuQtjqtWK+BXpyEY47uUhDW1AQZQ+JfYCG2dgNfGwwjEl3k0wVvxn 91gvflAxaCo+3mixUNR9B/BMSUtpab68iobgcYbxfm+BiwfVbnlTp3m60NNsFiPJ4Z7EZN 5DkEptGGhv862z6Y6WHK69XhlVSXLOW6tQ1OEr1CerSSwSz6Roq0BisSdkIGRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VC7PP2V49zNZ1; Sun, 7 Apr 2024 10:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 437AEXcF049034; Sun, 7 Apr 2024 10:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 437AEXrL049031; Sun, 7 Apr 2024 10:14:33 GMT (envelope-from git) Date: Sun, 7 Apr 2024 10:14:33 GMT Message-Id: <202404071014.437AEXrL049031@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: fa01e117e24f - main - archivers/snappy: update to 1.2.0. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa01e117e24fed6cf7b52d90a8d82b4bee06fe21 Auto-Submitted: auto-generated The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa01e117e24fed6cf7b52d90a8d82b4bee06fe21 commit fa01e117e24fed6cf7b52d90a8d82b4bee06fe21 Author: Vanilla I. Shu AuthorDate: 2024-04-07 10:14:06 +0000 Commit: Vanilla I. Shu CommitDate: 2024-04-07 10:14:25 +0000 archivers/snappy: update to 1.2.0. --- archivers/snappy/Makefile | 2 +- archivers/snappy/distinfo | 6 +++--- archivers/snappy/files/patch-CMakeLists.txt | 19 ++++++++++++++----- archivers/snappy/files/patch-snappy-internal.h | 4 ++-- archivers/snappy/files/patch-snappy.cc | 11 ----------- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index 7b682e6b0a00..010babcbf1f4 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,5 +1,5 @@ PORTNAME= snappy -PORTVERSION= 1.1.10 +PORTVERSION= 1.2.0 PORTREVISION= 0 CATEGORIES= archivers diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo index ff2ca326920c..d362e3372754 100644 --- a/archivers/snappy/distinfo +++ b/archivers/snappy/distinfo @@ -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 diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt index 68d48af31447..1359fddec816 100644 --- a/archivers/snappy/files/patch-CMakeLists.txt +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -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 $ $ ) @@ -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) diff --git a/archivers/snappy/files/patch-snappy-internal.h b/archivers/snappy/files/patch-snappy-internal.h index c00d2397a50c..e58727a30725 100644 --- a/archivers/snappy/files/patch-snappy-internal.h +++ b/archivers/snappy/files/patch-snappy-internal.h @@ -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(dst), val); } diff --git a/archivers/snappy/files/patch-snappy.cc b/archivers/snappy/files/patch-snappy.cc deleted file mode 100644 index f97971659540..000000000000 --- a/archivers/snappy/files/patch-snappy.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- snappy.cc.orig 2023-03-12 08:04:09 UTC -+++ snappy.cc -@@ -1290,7 +1290,7 @@ std::pair 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);