Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ode 0.16.5 #167158

Merged
merged 6 commits into from
Mar 26, 2024
Merged

ode 0.16.5 #167158

Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/autobump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,7 @@ ocp
ocrmypdf
octave
octomap
ode
odpi
oh-my-posh
oha
Expand Down
2 changes: 1 addition & 1 deletion Formula/d/dartsim.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Dartsim < Formula
url "https://github.com/dartsim/dart/archive/refs/tags/v6.13.2.tar.gz"
sha256 "02699a8f807276231c80ffc5dbc3f66dc1c3612364340c91bcad63a837c01576"
license "BSD-2-Clause"
revision 1
revision 2

bottle do
sha256 arm64_sonoma: "7e58ee7403fa8282bab3d7bcfe4a881b596454b2627fde5debb2140b13a28b2e"
Expand Down
57 changes: 12 additions & 45 deletions Formula/o/ode.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Ode < Formula

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / Linux

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 14-x86_64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 14-arm64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 13-x86_64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 13-arm64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 12-x86_64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)

Check notice on line 1 in Formula/o/ode.rb

View workflow job for this annotation

GitHub Actions / macOS 12-arm64

Installed previously built bottle for ode from

:1a02ded5cc4 (Merge 686e30053d83fa3c237097a4a479fc090288c429 into aafc190af8848f3c92a19f89cfecd26b47c0b501, 2024-03-26)
desc "Simulating articulated rigid body dynamics"
homepage "https://www.ode.org/"
url "https://bitbucket.org/odedevs/ode/downloads/ode-0.16.4.tar.gz"
sha256 "71037b8281c6c86b0a55729f90d5db697abe4cbec1d8118157e00d48ec253467"
url "https://bitbucket.org/odedevs/ode/downloads/ode-0.16.5.tar.gz"
sha256 "ba875edd164570958795eeaa70f14853bfc34cc9871f8adde8da47e12bd54679"
license any_of: ["LGPL-2.1-or-later", "BSD-3-Clause"]
head "https://bitbucket.org/odedevs/ode.git", branch: "master"

Expand All @@ -18,27 +18,21 @@
sha256 cellar: :any_skip_relocation, x86_64_linux: "26dc057f117efea645ebf883369d7d48082b6a87a40443ad95e2d40f26d2ff48"
end

depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
depends_on "pkg-config" => :build
depends_on "cmake" => :build
depends_on "libccd"

# Fix -flat_namespace being used on Big Sur and later.
# We patch `libtool.m4` and not `configure` because we call `./bootstrap`.
patch :DATA
on_linux do
depends_on "mesa"
depends_on "mesa-glu"
end

def install
inreplace "bootstrap", "libtoolize", "glibtoolize"
system "./bootstrap"
args = []
args << "-DOPENGL_INCLUDE_DIR=#{Formula["mesa"].include}" if OS.linux?

system "./configure", "--prefix=#{prefix}",
"--enable-libccd",
"--enable-shared",
"--disable-static",
"--enable-double-precision"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

several configuration options were changed by this pull request; was there a reason for this? I think this has affected some downstream packages

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment in the new PR about the rationale.

system "make"
system "make", "install"
system "cmake", "-S", ".", "-B", "build", *args, *std_cmake_args
system "cmake", "--build", "build"
system "cmake", "--install", "build"
end

test do
Expand All @@ -56,30 +50,3 @@
system "./test"
end
end

__END__
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 10ab284..bfc1d56 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1067,16 +1067,11 @@ _LT_EOF
_lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]][[,.]]*)
+ darwin*)
+ case ${MACOSX_DEPLOYMENT_TARGET},$host in
+ 10.[[012]],*|,*powerpc*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- 10.*)
+ *)
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
2 changes: 1 addition & 1 deletion Formula/o/ompl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Ompl < Formula
url "https://github.com/ompl/ompl/archive/refs/tags/1.6.0.tar.gz"
sha256 "f03daa95d2bbf1c21e91a38786242c245f4740f16aa9e9adbf7c7e0236e3c625"
license "BSD-3-Clause"
revision 4
revision 5
head "https://github.com/ompl/ompl.git", branch: "main"

# We check the first-party download page because the "latest" GitHub release
Expand Down
Loading