ogre2.2: patches for M1 arm processors (#1823)

* ogre2.2: add patches * ogre2.2: revision bump * ogre2.2: fix rpath and add test * gz-rendering6: fix rpath and add test * gz-rendering6: revision bump * update bottle. Signed-off-by: Ian Chen <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]> Co-authored-by: OSRF Build Bot <[email protected]>
osrf · Sep 21, 2023 · 2323963 · 2323963
1 parent d83e5da
commit 2323963
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 9 deletions.
diff --git a/Formula/ignition-rendering6.rb b/Formula/ignition-rendering6.rb
@@ -4,19 +4,22 @@ class IgnitionRendering6 < Formula
   url "https://osrf-distributions.s3.amazonaws.com/ign-rendering/releases/ignition-rendering6-6.6.1.tar.bz2"
   sha256 "b7f3a85d51028dca06b8e4e5ab2ef61c54b2791787566e8ea002cbd3c92be80a"
   license "Apache-2.0"
+  revision 1
 
   head "https://github.com/gazebosim/gz-rendering.git", branch: "ign-rendering6"
 
   bottle do
     root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 ventura:  "171316235ff45dc8144a82b446065219ac7657396daafc1b65b540429d4a44f5"
-    sha256 monterey: "959b2d7750264423382ca53e53f8dda1ec6cfa5e0ad08fa7ec695259d6dd9606"
-    sha256 big_sur:  "93e0295b2f7874b2260ed0176097955f382356b3235fa9399960d81875ffdb63"
+    sha256 ventura:  "ac880da52d6a5d9c04e97c24fdfa8fb7865b6fb98ece7ccdb2a63967bcd5b922"
+    sha256 monterey: "068ced8bf3e04ffca0c6c7a438fbebe696531764f1d23b80a2f4e1fadb425506"
+    sha256 big_sur:  "3c5272e66bd15daf82d87ad0499165bf7ea655289a7966944721f2aa1023826f"
   end
 
   depends_on "cmake" => [:build, :test]
   depends_on "pkg-config" => [:build, :test]
 
+  depends_on "gz-plugin2" => :test
+
   depends_on "freeimage"
   depends_on "ignition-cmake2"
   depends_on "ignition-common4"
@@ -27,9 +30,13 @@ class IgnitionRendering6 < Formula
   depends_on "ogre2.2"
 
   def install
+    rpaths = [
+      rpath,
+      rpath(source: lib/"ign-rendering-6/engine-plugins", target: lib),
+    ]
     cmake_args = std_cmake_args
     cmake_args << "-DBUILD_TESTING=OFF"
-    cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}"
+    cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpaths.join(";")}"
 
     mkdir "build" do
       system "cmake", "..", *cmake_args
@@ -38,6 +45,20 @@ def install
   end
 
   test do
+    # test plugins in subfolders
+    ["ogre", "ogre2"].each do |engine|
+      p = lib/"ign-rendering-6/engine-plugins/libignition-rendering-#{engine}.dylib"
+      # Use gz-plugin --info command to check plugin linking
+      cmd = Formula["gz-plugin2"].opt_libexec/"gz/plugin2/gz-plugin"
+      args = ["--info", "--plugin"] << p
+      # print command and check return code
+      system cmd, *args
+      # check that library was loaded properly
+      _, stderr = system_command(cmd, args: args)
+      error_string = "Error while loading the library"
+      assert stderr.exclude?(error_string), error_string
+    end
+    # build against API
     github_actions = ENV["HOMEBREW_GITHUB_ACTIONS"].present?
     (testpath/"test.cpp").write <<-EOS
       #include <ignition/rendering/RenderEngine.hh>

diff --git a/Formula/ogre2.2.rb b/Formula/ogre2.2.rb
@@ -5,19 +5,19 @@ class Ogre22 < Formula
   version "2.2.6+20211021~312bf40"
   sha256 "b9dbd84ef0c1731d0d1abc55499532358b9a9e5f0b3dc2b8e02ba76db0a112fd"
   license "MIT"
-  revision 1
+  revision 2
 
   head "https://github.com/OGRECave/ogre-next.git", branch: "v2-2"
 
   bottle do
     root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
-    sha256 cellar: :any, ventura:  "e86e1900eaf778ede73fe10159721535cefaa1799f66038977468e111bc9ca34"
-    sha256 cellar: :any, monterey: "5cc89ae2a97c6e642f0fe9bbd3587ddeb8544dc278595cc602172fd7890e7e98"
-    sha256 cellar: :any, big_sur:  "fae5da6d6bb34344f04e4f78f162f3872124e915fbd50d883e6509c6f1640cbd"
-    sha256 cellar: :any, catalina: "222487899f723c60367694395875898f742cd2247e54eaa348f99fcb023c6ebc"
+    sha256 cellar: :any, ventura:  "39ee442113fbe0e76dd71f6cd9b90fb3cbb16de3a771c32d6fe12a0a4679dbdc"
+    sha256 cellar: :any, monterey: "0bd7b3f41e27834ff7ac6ae7c0711e18cb64bb0d1795903e98335e8618e3eb22"
+    sha256 cellar: :any, big_sur:  "7d348ad79b4dc945b7305523d0826bb42d42747c921433fe792f4fe68d2e5191"
   end
 
   depends_on "cmake" => :build
+  depends_on "gz-plugin2" => :test
   depends_on "pkg-config" => :test
   depends_on "doxygen"
   depends_on "freeimage"
@@ -45,8 +45,26 @@ class Ogre22 < Formula
   #  sha256 "8fe5beab9e50dfe1f0164e8dbffd20a79f5e9afe79802ab0ce29d8d83e4e0fe8"
   # end
 
+  patch do
+    # fix for m1 arch -- adapted from OGRECave/ogre-next@ff01338
+    url "https://gist.githubusercontent.com/iche033/5685dcbb3efc14bb263718a91039bab8/raw/dd3ccbefda8abf1b9ff7b5a4898e3e63cbe06b4b/ogre2.2-m1-platform.patch"
+    sha256 "edacb1992550c78e746d9bd545c8f5b278c2f987533349a0db56d7b13ebab480"
+  end
+
+  # fix for m1 arch -- adapted from OGRECave/ogre-next@23d8261
+  patch do
+    url "https://github.com/OGRECave/ogre-next/commit/23d82616a785f6aa26f58d5bf38a7114e2c00f88.patch?full_index=1"
+    sha256 "ade27e55e7be5510f5eeb95f17c9ba90e61575ad610cc35f24179d061b1756a1"
+  end
+
   def install
+    rpaths = [
+      rpath,
+      rpath(source: lib/"OGRE-2.2", target: lib),
+      rpath(source: lib/"OGRE-2.2/OGRE", target: lib),
+    ]
     cmake_args = [
+      "-DCMAKE_INSTALL_RPATH=#{rpaths.join(";")}",
       "-DOGRE_LIB_DIRECTORY=lib/OGRE-2.2",
       "-DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF",
       "-DOGRE_FULL_RPATH:BOOL=FALSE",
@@ -108,6 +126,20 @@ def install
   end
 
   test do
+    # test plugins in subfolders
+    ["libOgreMain", "libOgreOverlay", "libOgreSceneFormat", "OGRE/RenderSystem_Metal"].each do |plugin|
+      p = lib/"OGRE-2.2/#{plugin}.dylib"
+      # Use gz-plugin --info command to check plugin linking
+      cmd = Formula["gz-plugin2"].opt_libexec/"gz/plugin2/gz-plugin"
+      args = ["--info", "--plugin"] << p
+      # print command and check return code
+      system cmd, *args
+      # check that library was loaded properly
+      _, stderr = system_command(cmd, args: args)
+      error_string = "Error while loading the library"
+      assert stderr.exclude?(error_string), error_string
+    end
+    # build against API
     (testpath/"test.cpp").write <<-EOS
       #include <Ogre.h>
       int main()