aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Towner <jwtowner@users.noreply.github.com>2021-02-26 13:15:50 -0800
committerGitHub <noreply@github.com>2021-02-26 13:15:50 -0800
commitb5e6d68c2097255b7453b0b6ddbbeba2ae48b348 (patch)
treef4867bda46ccdf7234335265b41a507d2cfe6818
parente3e1b64d2aaec22b713f9f1cf2f32e59a4b7c401 (diff)
downloadvcpkg-b5e6d68c2097255b7453b0b6ddbbeba2ae48b348.tar.gz
vcpkg-b5e6d68c2097255b7453b0b6ddbbeba2ae48b348.zip
[brotli] add iOS support (#16397)
* [brotli] add iOS support This commit adds support for iOS by modifying the CMakeLists.txt file to specify the BUNDLE DESTINATION parameter during install, which is required for iOS builds. * [brotli] update control file * [brotli] update versions
-rw-r--r--ports/brotli/CONTROL1
-rw-r--r--ports/brotli/fix-ios.patch12
-rw-r--r--ports/brotli/portfile.cmake1
-rw-r--r--versions/b-/brotli.json5
-rw-r--r--versions/baseline.json2
5 files changed, 20 insertions, 1 deletions
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL
index ce085e32f..93d890444 100644
--- a/ports/brotli/CONTROL
+++ b/ports/brotli/CONTROL
@@ -1,4 +1,5 @@
Source: brotli
Version: 1.0.9
+Port-Version: 1
Homepage: https://github.com/google/brotli
Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/fix-ios.patch b/ports/brotli/fix-ios.patch
new file mode 100644
index 000000000..b3dee6aa0
--- /dev/null
+++ b/ports/brotli/fix-ios.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcd9024..a717b87 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,7 @@ if(NOT BROTLI_BUNDLED_MODE)
+ install(
+ TARGETS brotli
+ RUNTIME DESTINATION tools/brotli
++ BUNDLE DESTINATION tools/brotli
+ CONFIGURATIONS Release
+ )
+
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
index 6d28f2650..9c1e3037d 100644
--- a/ports/brotli/portfile.cmake
+++ b/ports/brotli/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
install.patch
fix-arm-uwp.patch
pkgconfig.patch
+ fix-ios.patch
)
vcpkg_configure_cmake(
diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json
index 16c653fcd..248f9d41b 100644
--- a/versions/b-/brotli.json
+++ b/versions/b-/brotli.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8f55fe158d8bd753a6e6908164e03ae4f0b73cea",
+ "version-string": "1.0.9",
+ "port-version": 1
+ },
+ {
"git-tree": "4aaf6f174ede5bc58872943a5e32d96c5e0d45da",
"version-string": "1.0.9",
"port-version": 0
diff --git a/versions/baseline.json b/versions/baseline.json
index 57d938f03..6062b122b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1014,7 +1014,7 @@
},
"brotli": {
"baseline": "1.0.9",
- "port-version": 0
+ "port-version": 1
},
"brpc": {
"baseline": "0.9.7",