From feb6d8bc80d82dc2123bf8e8200dbc3af42f9bc2 Mon Sep 17 00:00:00 2001 From: Evgenii Kliuchnikov Date: Mon, 21 Aug 2023 03:34:13 -0700 Subject: [PATCH] prepare for 1.1.0rc PiperOrigin-RevId: 558736892 --- CHANGELOG.md | 2 ++ c/common/version.h | 22 +++++++++++++++++----- scripts/libbrotlidec.pc.in | 2 +- scripts/libbrotlienc.pc.in | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b53e7ad..91e5005 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## [1.1.0] - 2023-08-28 + ### Added - decoder: `BrotliDecoderAttachDictionary` - decoder: `BrotliDecoderOnFinish` callback behind `BROTLI_REPORTING` diff --git a/c/common/version.h b/c/common/version.h index 0939eb8..8098040 100644 --- a/c/common/version.h +++ b/c/common/version.h @@ -18,8 +18,8 @@ BrotliEncoderVersion methods. */ #define BROTLI_VERSION_MAJOR 1 -#define BROTLI_VERSION_MINOR 0 -#define BROTLI_VERSION_PATCH 9 +#define BROTLI_VERSION_MINOR 1 +#define BROTLI_VERSION_PATCH 0 #define BROTLI_VERSION BROTLI_MAKE_HEX_VERSION( \ BROTLI_VERSION_MAJOR, BROTLI_VERSION_MINOR, BROTLI_VERSION_PATCH) @@ -32,8 +32,20 @@ - interfaces not changed -> current:revision+1:age */ -#define BROTLI_ABI_CURRENT 1 -#define BROTLI_ABI_REVISION 9 -#define BROTLI_ABI_AGE 0 +#define BROTLI_ABI_CURRENT 2 +#define BROTLI_ABI_REVISION 0 +#define BROTLI_ABI_AGE 1 + +#if BROTLI_VERSION_MAJOR != (BROTLI_ABI_CURRENT - BROTLI_ABI_AGE) +#error ABI/API version inconsistency +#endif + +#if BROTLI_VERSION_MINOR != BROTLI_ABI_AGE +#error ABI/API version inconsistency +#endif + +#if BROTLI_VERSION_PATCH != BROTLI_ABI_REVISION +#error ABI/API version inconsistency +#endif #endif /* BROTLI_COMMON_VERSION_H_ */ diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in index 6f8ef2e..ecb8f46 100644 --- a/scripts/libbrotlidec.pc.in +++ b/scripts/libbrotlidec.pc.in @@ -8,5 +8,5 @@ URL: https://github.com/google/brotli Description: Brotli decoder library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lbrotlidec -Requires.private: libbrotlicommon >= 1.0.2 +Requires.private: libbrotlicommon >= 1.1.0 Cflags: -I${includedir} diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in index 2098afe..5bedb2f 100644 --- a/scripts/libbrotlienc.pc.in +++ b/scripts/libbrotlienc.pc.in @@ -8,5 +8,5 @@ URL: https://github.com/google/brotli Description: Brotli encoder library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lbrotlienc -Requires.private: libbrotlicommon >= 1.0.2 +Requires.private: libbrotlicommon >= 1.1.0 Cflags: -I${includedir}