brotli: bump to 1.1.0

packages/brotli/CMakeLists.txt.patch

@@ -1,12 +0,0 @@
-diff -u -r ../brotli-1.0.4/CMakeLists.txt ./CMakeLists.txt
---- ../brotli-1.0.4/CMakeLists.txt	2018-03-29 08:37:07.000000000 +0000
-+++ ./CMakeLists.txt	2018-05-27 12:33:42.384489726 +0000
-@@ -183,7 +183,7 @@
- 
- # Build the brotli executable
- add_executable(brotli ${BROTLI_CLI_C})
--target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC})
-+target_link_libraries(brotli ${BROTLI_LIBRARIES})
- 
- # Installation
- if(NOT BROTLI_BUNDLED_MODE)

packages/brotli/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/google/brotli
 TERMUX_PKG_DESCRIPTION="lossless compression algorithm and format (command line utility)"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.0.9
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.1.0
 TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+TERMUX_PKG_SHA256=e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BREAKS="brotli-dev"
 TERMUX_PKG_REPLACES="brotli-dev"
@@ -16,12 +15,12 @@ termux_step_post_get_source() {
 	# after SOVERSION is changed.
 	local _SOVERSION=1
 
-	local _ABI_VERSION=$(sed -En 's/^#define BROTLI_ABI_VERSION (0x[0-9a-fA-F]+)$/\1/p' \
-			c/common/version.h)
-	local _ABI_CURRENT=$(( _ABI_VERSION >> 24 ))
-	local _ABI_AGE=$(( _ABI_VERSION & 4095 ))
+	local _ABI_CURRENT=$(grep -E '^#define\s+BROTLI_ABI_CURRENT\s+' \
+			c/common/version.h | awk '{ print $3 }')
+	local _ABI_AGE=$(grep -E '^#define\s+BROTLI_ABI_AGE\s+' \
+			c/common/version.h | awk '{ print $3 }')
 	local v=$(( _ABI_CURRENT - _ABI_AGE ))
-	if [ ! "${_ABI_VERSION}" ] || [ "${v}" != "${_SOVERSION}" ]; then
+	if [ ! "${_ABI_CURRENT}" ] || [ ! "${_ABI_AGE}" ] || [ "${v}" != "${_SOVERSION}" ]; then
 		termux_error_exit "SOVERSION guard check failed."
 	fi
 }

packages/brotli/pkg-config.patch

@@ -1,47 +0,0 @@
-From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
-From: Evgenii Kliuchnikov <eustas.ru@gmail.com>
-Date: Wed, 2 Sep 2020 10:49:49 +0200
-Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
-
-This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
----
- scripts/libbrotlicommon.pc.in | 2 +-
- scripts/libbrotlidec.pc.in    | 2 +-
- scripts/libbrotlienc.pc.in    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
-index 10ca969e..2a8cf7a3 100644
---- a/scripts/libbrotlicommon.pc.in
-+++ b/scripts/libbrotlicommon.pc.in
-@@ -7,5 +7,5 @@ Name: libbrotlicommon
- URL: https://github.com/google/brotli
- Description: Brotli common dictionary library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlicommon
-+Libs: -L${libdir} -lbrotlicommon
- Cflags: -I${includedir}
-diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
-index e7c3124f..6f8ef2e4 100644
---- a/scripts/libbrotlidec.pc.in
-+++ b/scripts/libbrotlidec.pc.in
-@@ -7,6 +7,6 @@ Name: libbrotlidec
- URL: https://github.com/google/brotli
- Description: Brotli decoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlidec
-+Libs: -L${libdir} -lbrotlidec
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}
-diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
-index 4dd0811b..2098afe2 100644
---- a/scripts/libbrotlienc.pc.in
-+++ b/scripts/libbrotlienc.pc.in
-@@ -7,6 +7,6 @@ Name: libbrotlienc
- URL: https://github.com/google/brotli
- Description: Brotli encoder library
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -R${libdir} -lbrotlienc
-+Libs: -L${libdir} -lbrotlienc
- Requires.private: libbrotlicommon >= 1.0.2
- Cflags: -I${includedir}