git: 62740dc1077c - main - archivers/brotli: update from 1.0.9 to 1.1.0 (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 09 Sep 2023 19:42:49 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=62740dc1077c3c403e74ec6cae3a8b437ddb57d6
commit 62740dc1077c3c403e74ec6cae3a8b437ddb57d6
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-09-09 19:40:56 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-09-09 19:40:56 +0000
archivers/brotli: update from 1.0.9 to 1.1.0 (+)
PR: 272005
Reviewed by: diizzy
Tested by: diizzy
---
archivers/brotli/Makefile | 24 +++++++++-------
archivers/brotli/distinfo | 8 ++++--
archivers/brotli/files/extra-patch-static-libs | 40 ++++++++++++++++++++++++++
archivers/brotli/pkg-plist | 19 +++++++-----
4 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile
index 3794b2433cd6..defd206fb49d 100644
--- a/archivers/brotli/Makefile
+++ b/archivers/brotli/Makefile
@@ -1,9 +1,12 @@
PORTNAME= brotli
-PORTVERSION= 1.0.9
DISTVERSIONPREFIX= v
+DISTVERSION= 1.1.0
PORTEPOCH= 1
CATEGORIES= archivers devel
+PATCH_SITES= https://github.com/google/${PORTNAME}/commit/
+PATCHFILES= 741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch:-p1
+
MAINTAINER= osa@FreeBSD.org
COMMENT= Generic-purpose lossless compression algorithm
WWW= https://github.com/google/brotli
@@ -11,20 +14,21 @@ WWW= https://github.com/google/brotli
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= cmake:testing cpe pathfix pkgconfig
+CPE_VENDOR= google
+USE_LDCONFIG= yes
+
USE_GITHUB= yes
GH_ACCOUNT= google
-USES= autoreconf:build compiler:c++0x cpe gmake libtool pkgconfig
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CPE_VENDOR= google
+PLIST_SUB= SHLIBVER=${DISTVERSION:R}
-INSTALL_TARGET= install-strip
-PLIST_SUB= SHLIBVER=${PORTVERSION}
+CMAKE_OFF= BUILD_TESTING
+CMAKE_ARGS= -DSHARE_INSTALL_PREFIX=share
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= STATIC
+OPTIONS_SUB= yes
-pre-configure:
- (cd ${WRKSRC} && ./bootstrap)
+STATIC_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-static-libs
.include <bsd.port.mk>
diff --git a/archivers/brotli/distinfo b/archivers/brotli/distinfo
index e6404d22d341..43c045965617 100644
--- a/archivers/brotli/distinfo
+++ b/archivers/brotli/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1598538126
-SHA256 (google-brotli-v1.0.9_GH0.tar.gz) = f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
-SIZE (google-brotli-v1.0.9_GH0.tar.gz) = 486984
+TIMESTAMP = 1694245655
+SHA256 (google-brotli-v1.1.0_GH0.tar.gz) = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
+SIZE (google-brotli-v1.1.0_GH0.tar.gz) = 511969
+SHA256 (741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch) = 78301ce0852ee92cdcdc1d2b6b8466804d6da3742c13159654d769a0dc2b5c35
+SIZE (741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch) = 1022
diff --git a/archivers/brotli/files/extra-patch-static-libs b/archivers/brotli/files/extra-patch-static-libs
new file mode 100644
index 000000000000..857fb4515bdf
--- /dev/null
+++ b/archivers/brotli/files/extra-patch-static-libs
@@ -0,0 +1,40 @@
+--- CMakeLists.txt.orig 2023-08-21 13:36:24 UTC
++++ CMakeLists.txt
+@@ -122,12 +122,15 @@ endif()
+
+ file(GLOB_RECURSE BROTLI_COMMON_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/common/*.c)
+ add_library(brotlicommon ${BROTLI_COMMON_SOURCES})
++add_library(brotlicommonstatic STATIC ${BROTLI_COMMON_SOURCES})
+
+ file(GLOB_RECURSE BROTLI_DEC_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/dec/*.c)
+ add_library(brotlidec ${BROTLI_DEC_SOURCES})
++add_library(brotlidecstatic STATIC ${BROTLI_DEC_SOURCES})
+
+ file(GLOB_RECURSE BROTLI_ENC_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/enc/*.c)
+ add_library(brotlienc ${BROTLI_ENC_SOURCES})
++add_library(brotliencstatic STATIC ${BROTLI_ENC_SOURCES})
+
+ # Older CMake versions does not understand INCLUDE_DIRECTORIES property.
+ include_directories(${BROTLI_INCLUDE_DIRS})
+@@ -152,6 +155,10 @@ foreach(lib ${BROTLI_LIBRARIES_CORE})
+ set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>")
+ endforeach()
+
++set_property(TARGET brotlicommonstatic PROPERTY OUTPUT_NAME brotlicommon)
++set_property(TARGET brotlidecstatic PROPERTY OUTPUT_NAME brotlidec)
++set_property(TARGET brotliencstatic PROPERTY OUTPUT_NAME brotlienc)
++
+ if(NOT BROTLI_EMSCRIPTEN)
+ target_link_libraries(brotlidec brotlicommon)
+ target_link_libraries(brotlienc brotlicommon)
+@@ -185,7 +192,9 @@ if(NOT BROTLI_BUNDLED_MODE)
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ )
+-
++ install(TARGETS brotlicommonstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++ install(TARGETS brotlidecstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++ install(TARGETS brotliencstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ install(
+ DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
diff --git a/archivers/brotli/pkg-plist b/archivers/brotli/pkg-plist
index e6ea0095172c..965739e0ce4e 100644
--- a/archivers/brotli/pkg-plist
+++ b/archivers/brotli/pkg-plist
@@ -2,20 +2,25 @@ bin/brotli
include/brotli/decode.h
include/brotli/encode.h
include/brotli/port.h
+include/brotli/shared_dictionary.h
include/brotli/types.h
-lib/libbrotlicommon.a
+%%STATIC%%lib/libbrotlicommon.a
lib/libbrotlicommon.so
lib/libbrotlicommon.so.1
-lib/libbrotlicommon.so.%%SHLIBVER%%
-lib/libbrotlidec.a
+lib/libbrotlicommon.so.%%SHLIBVER%%.0
+%%STATIC%%lib/libbrotlidec.a
lib/libbrotlidec.so
lib/libbrotlidec.so.1
-lib/libbrotlidec.so.%%SHLIBVER%%
-lib/libbrotlienc.a
+lib/libbrotlidec.so.%%SHLIBVER%%.0
+%%STATIC%%lib/libbrotlienc.a
lib/libbrotlienc.so
lib/libbrotlienc.so.1
-lib/libbrotlienc.so.%%SHLIBVER%%
+lib/libbrotlienc.so.%%SHLIBVER%%.0
libdata/pkgconfig/libbrotlicommon.pc
libdata/pkgconfig/libbrotlidec.pc
libdata/pkgconfig/libbrotlienc.pc
-%%PORTDOCS%%%%DOCSDIR%%/README
+share/man/man1/brotli.1.gz
+share/man/man3/constants.h.3.gz
+share/man/man3/decode.h.3.gz
+share/man/man3/encode.h.3.gz
+share/man/man3/types.h.3.gz