Skip to content

Commit cbd4801

Browse files
authored
Merge pull request #197233 from Homebrew/libheif-fix
libheif: apply upstream patch
2 parents e48f8a1 + 83a7d19 commit cbd4801

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

Formula/lib/libheif.rb

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ class Libheif < Formula
66
license "LGPL-3.0-only"
77

88
bottle do
9-
sha256 cellar: :any, arm64_sequoia: "0a5ad4df9f462b5c9d22a6a6cfc44e5c4651d2259c7e1338fc3ca01f48006209"
10-
sha256 cellar: :any, arm64_sonoma: "330cb73eb691eb4f29ade318eef836cdaac55b721412216bb0224fd54e8fe951"
11-
sha256 cellar: :any, arm64_ventura: "edffd6e1d566686da0f58408936236f0bb77d8645327c694940a52f884187148"
12-
sha256 cellar: :any, sonoma: "3571171fa732956fca7310beb740276cca5142ca63fbdb002756e0a2794b5066"
13-
sha256 cellar: :any, ventura: "6bb98d90781d18072179d2e3737ab31db51097dab85a5b3b5c70bd43e1f4bfb3"
14-
sha256 cellar: :any_skip_relocation, x86_64_linux: "6fccf3ad6c45fc538ae62cc2a87aa73110ebad794917770cb381c72a3535e9b1"
9+
rebuild 1
10+
sha256 cellar: :any, arm64_sequoia: "49ea2b6b26a9c6850bbd09c5478316a0533a99c2559af83658beb01da42df9b0"
11+
sha256 cellar: :any, arm64_sonoma: "dc70477bb1daae813245cbab42474216aadb2384710fd45b1ef04557ae7e8010"
12+
sha256 cellar: :any, arm64_ventura: "7edaf722b52739c798f14be2d926bb5a44bbcca17ee442bef882469dfe1fc918"
13+
sha256 cellar: :any, sonoma: "e4225e4404b37f238b38f5d6baaf19181b971826aef5cfad119412f63a99d358"
14+
sha256 cellar: :any, ventura: "a01a8cdee32b9d024db53c5d037e7f6cea662bd41166095401c0fb075605551c"
15+
sha256 cellar: :any_skip_relocation, x86_64_linux: "4e31a49f56504d7f499793ae18e9d224326bd7555aa62af73cbc535e81819773"
1516
end
1617

1718
depends_on "cmake" => :build
@@ -26,6 +27,13 @@ class Libheif < Formula
2627
depends_on "webp"
2728
depends_on "x265"
2829

30+
# Fix to api error for 'cannot assign to non-static data member'
31+
# apply upstream patch and should check for removal on next release
32+
patch do
33+
url "https://github.com/strukturag/libheif/commit/3dd7019ff579c038cba96353390cd41edfda927e.patch?full_index=1"
34+
sha256 "9397a8b1b92f311eb1f9bf5c1bae4f5244a406556fd0ce91b3caed7a91daa0d0"
35+
end
36+
2937
def install
3038
args = %W[
3139
-DCMAKE_INSTALL_RPATH=#{rpath}
@@ -40,9 +48,6 @@ def install
4048
pkgshare.install "examples/example.heic"
4149
pkgshare.install "examples/example.avif"
4250

43-
# In order to avoid duplicated symbol error when build static library
44-
inreplace "examples/heif_info.cc", "fourcc_to_string", "example_fourcc_to_string"
45-
4651
system "cmake", "-S", ".", "-B", "static", *args, *std_cmake_args, "-DBUILD_SHARED_LIBS=OFF"
4752
system "cmake", "--build", "static"
4853
lib.install "static/libheif/libheif.a"

0 commit comments

Comments
 (0)