Skip to content

Commit f7e02ca

Browse files
authored
Merge pull request Homebrew#251834 from Homebrew/opencascade-no-freeimage
opencascade: remove `freeimage` support
2 parents 38ac967 + 1791ae0 commit f7e02ca

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

Formula/o/opencascade.rb

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
class Opencascade < Formula
22
desc "3D modeling and numerical simulation software for CAD/CAM/CAE"
33
homepage "https://dev.opencascade.org/"
4-
url "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_9_2;sf=tgz"
5-
version "7.9.2"
6-
sha256 "e9f69bde521e718f10f1896e5bea070fbd5dfb205d8da422f5be2d521db666c5"
4+
url "https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_9_2.tar.gz"
5+
sha256 "3cd080d3fc33ba0c6c157e110afe3e015859524c4694dbb09812ec9d61595639"
76
license "LGPL-2.1-only"
87

98
# The first-party download page (https://dev.opencascade.org/release)
@@ -22,18 +21,18 @@ class Opencascade < Formula
2221
no_autobump! because: :incompatible_version_format
2322

2423
bottle do
25-
sha256 cellar: :any, arm64_tahoe: "4660451ad938efaa9866c11e26feaf6477e9ffc2ed465ec0e9c9ee3e883aa1c7"
26-
sha256 cellar: :any, arm64_sequoia: "909aa33f35f20ba42068fcc35030389f878f6fa71dafa481148bcc40a1224922"
27-
sha256 cellar: :any, arm64_sonoma: "192f5b9934455b54a1e4d90b7bfa4b0f983aea39ceae5f75ff49e09d519ccb01"
28-
sha256 cellar: :any, sonoma: "94081fbc6d9504ef3fd83ca3d76cdd86ca3808d009b68c6e33a6920bb724c314"
29-
sha256 cellar: :any_skip_relocation, x86_64_linux: "3878643a038002cd189e57aff2dd2424159cc46b8126ae16b08c2d40df707926"
24+
rebuild 1
25+
sha256 cellar: :any, arm64_tahoe: "05c90efe2139c4c46c4f53536e554d356765281b824301ca21f62d5264fa1473"
26+
sha256 cellar: :any, arm64_sequoia: "450ba8e8785c1348a3a7254d20847de69a237b39c1dc6bdb50218e1c3e306380"
27+
sha256 cellar: :any, arm64_sonoma: "39160ae92917d9be76d9c79056a8bfdc41b3d129eada5474be5538d98c9db912"
28+
sha256 cellar: :any, sonoma: "90aab756f98430cf0d80a62e9ef3725117900a4784080039c821166d2f621e0f"
29+
sha256 cellar: :any_skip_relocation, x86_64_linux: "d0a579da97350eb4843ed2a1d77c106ea74329a2b8d4e9e74bbbd150896d2e32"
3030
end
3131

3232
depends_on "cmake" => [:build, :test]
3333
depends_on "doxygen" => :build
3434
depends_on "rapidjson" => :build
3535
depends_on "fontconfig"
36-
depends_on "freeimage"
3736
depends_on "freetype"
3837
depends_on "tbb"
3938
depends_on "tcl-tk@8" # TCL 9 issue: https://tracker.dev.opencascade.org/view.php?id=33725
@@ -44,20 +43,20 @@ class Opencascade < Formula
4443
end
4544

4645
def install
47-
# Fix incorrect version
48-
inreplace "adm/cmake/version.cmake", "set (OCC_VERSION_MAINTENANCE 1 )", "set (OCC_VERSION_MAINTENANCE 2 )"
46+
# FreeImage has multiple CVEs and has been dropped by distros like Arch Linux
47+
# Ref: https://archlinux.org/todo/drop-freeimage/
48+
odie "FreeImage should not be a dependency!" if deps.map(&:name).include?("freeimage")
4949

5050
tcltk = Formula["tcl-tk@8"]
5151
libtcl = tcltk.opt_lib/shared_library("libtcl#{tcltk.version.major_minor}")
5252
libtk = tcltk.opt_lib/shared_library("libtk#{tcltk.version.major_minor}")
5353

5454
system "cmake", "-S", ".", "-B", "build",
55-
"-DUSE_FREEIMAGE=ON",
55+
"-DUSE_FREEIMAGE=OFF",
5656
"-DUSE_RAPIDJSON=ON",
5757
"-DUSE_TBB=ON",
5858
"-DINSTALL_DOC_Overview=ON",
5959
"-DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF",
60-
"-D3RDPARTY_FREEIMAGE_DIR=#{Formula["freeimage"].opt_prefix}",
6160
"-D3RDPARTY_FREETYPE_DIR=#{Formula["freetype"].opt_prefix}",
6261
"-D3RDPARTY_RAPIDJSON_DIR=#{Formula["rapidjson"].opt_prefix}",
6362
"-D3RDPARTY_RAPIDJSON_INCLUDE_DIR=#{Formula["rapidjson"].opt_include}",

0 commit comments

Comments
 (0)