From b9b224bfbda3e58a8ed18199aec193e76e854983 Mon Sep 17 00:00:00 2001
From: Francesco Romano <fraromano@google.com>
Date: Thu, 1 Dec 2022 01:56:06 -0800
Subject: [PATCH] Remove qhull patching as upstream has been updated.

PiperOrigin-RevId: 492136751
Change-Id: Ifc149c761a6c6cf3f32011ecb8af3523f39e8f00
---
 cmake/MujocoDependencies.cmake | 16 +-----
 cmake/qhull_fix_testing.patch  | 92 ----------------------------------
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 cmake/qhull_fix_testing.patch

diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
index 99e4a7ac..368c022e 100644
--- a/cmake/MujocoDependencies.cmake
+++ b/cmake/MujocoDependencies.cmake
@@ -35,7 +35,7 @@ set(MUJOCO_DEP_VERSION_ccd
     CACHE STRING "Version of `ccd` to be fetched."
 )
 set(MUJOCO_DEP_VERSION_qhull
-    3df027b91202cf179f3fba3c46eebe65bbac3790
+    0c8fc90d2037588024d9964515c1e684f6007ecc
     CACHE STRING "Version of `qhull` to be fetched."
 )
 set(MUJOCO_DEP_VERSION_Eigen3
@@ -99,10 +99,7 @@ if(NOT TARGET lodepng)
   endif()
 endif()
 
-# TODO(fraromano) We fetch qhull before the other libraries as it needs to go before until https://github.com/qhull/qhull/pull/111 is merged.
 set(QHULL_ENABLE_TESTING OFF)
-# We need Git to apply the patch using git apply.
-find_package(Git REQUIRED)
 
 findorfetch(
   USE_SYSTEM_PACKAGE
@@ -117,17 +114,6 @@ findorfetch(
   ${MUJOCO_DEP_VERSION_qhull}
   TARGETS
   qhull
-  # TODO(fraromano) Remove when https://github.com/qhull/qhull/pull/112 is merged.
-  # Do not fail if patch fails. This will happen the second time we run CMake as the sources will be already patched.
-  PATCH_COMMAND
-  "${GIT_EXECUTABLE}"
-  "apply"
-  "-q"
-  "${PROJECT_SOURCE_DIR}/cmake/qhull_fix_testing.patch"
-  "||"
-  "${CMAKE_COMMAND}"
-  "-E"
-  "true"
   EXCLUDE_FROM_ALL
 )
 # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories.
diff --git a/cmake/qhull_fix_testing.patch b/cmake/qhull_fix_testing.patch
deleted file mode 100644
index 9236cbd3..00000000
--- a/cmake/qhull_fix_testing.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 2bf2d1f5151d0d36cd17dea03129bd9a825384c5 Mon Sep 17 00:00:00 2001
-From: Francesco Romano <francesco.romano.1987@gmail.com>
-Date: Fri, 6 May 2022 11:30:44 +0100
-Subject: [PATCH] Add option to disable testing
-
----
- CMakeLists.txt | 55 ++++++++++++++++++++++++++------------------------
- 1 file changed, 29 insertions(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd95ad0..6ff1c98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -113,6 +113,7 @@ cmake_dependent_option(LINK_APPS_SHARED "Use shared library for linking applicat
-     "BUILD_SHARED_LIBS;BUILD_STATIC_LIBS"
-     ${BUILD_SHARED_LIBS}
- )
-+option(QHULL_ENABLE_TESTING "Build and run tests" ON)
- 
- if(INCLUDE_INSTALL_DIR)
- else()
-@@ -147,6 +148,7 @@ message(STATUS "Build Type (CMAKE_BUILD_TYPE):             ${CMAKE_BUILD_TYPE}")
- message(STATUS "Build static libraries:                    ${BUILD_STATIC_LIBS}")
- message(STATUS "Build shared library:                      ${BUILD_SHARED_LIBS}")
- message(STATUS "Use shared library for linking apps:       ${LINK_APPS_SHARED}")
-+message(STATUS "Build tests:                               ${QHULL_ENABLE_TESTING}")
- message(STATUS "To override these options, add -D{OPTION_NAME}=... to the cmake command")
- message(STATUS "  Build the debug targets                  -DCMAKE_BUILD_TYPE=Debug")
- message(STATUS)
-@@ -636,32 +638,33 @@ set_target_properties(user_egp PROPERTIES
- # ---------------------------------------
- # Define test
- # ---------------------------------------
--
--enable_testing()
--add_test(NAME testqset
--   COMMAND ./testqset 10000)
--add_test(NAME testqset_r
--   COMMAND ./testqset_r 10000)
--add_test(NAME smoketest
--   COMMAND sh -c "./rbox D4 | ./qhull Tv")
--add_test(NAME rbox-10-qhull
--   COMMAND sh -c "./rbox 10 | ./qhull Tv")
--add_test(NAME rbox-10-qconvex
--   COMMAND sh -c "./rbox 10 | ./qconvex Tv")
--add_test(NAME rbox-10-qdelaunay
--   COMMAND sh -c "./rbox 10 | ./qdelaunay Tv")
--add_test(NAME rbox-10-qhalf
--   COMMAND sh -c "./rbox 10 | ./qconvex FQ FV n Tv | ./qhalf Tv")
--add_test(NAME rbox-10-qvoronoi
--   COMMAND sh -c "./rbox 10 | ./qvoronoi Tv")
--add_test(NAME user_eg
--   COMMAND sh -c "./user_eg")
--add_test(NAME user_eg2
--   COMMAND sh -c "./user_eg2")
--   
--if(${BUILD_STATIC_LIBS})
--    add_test(NAME user_eg3
--       COMMAND sh -c "./user_eg3 rbox '10 D2' '2 D2' qhull 's p' facets")
-+if (QHULL_ENABLE_TESTING)
-+    enable_testing()
-+    add_test(NAME testqset
-+       COMMAND ./testqset 10000)
-+    add_test(NAME testqset_r
-+       COMMAND ./testqset_r 10000)
-+    add_test(NAME smoketest
-+       COMMAND sh -c "./rbox D4 | ./qhull Tv")
-+    add_test(NAME rbox-10-qhull
-+       COMMAND sh -c "./rbox 10 | ./qhull Tv")
-+    add_test(NAME rbox-10-qconvex
-+       COMMAND sh -c "./rbox 10 | ./qconvex Tv")
-+    add_test(NAME rbox-10-qdelaunay
-+       COMMAND sh -c "./rbox 10 | ./qdelaunay Tv")
-+    add_test(NAME rbox-10-qhalf
-+       COMMAND sh -c "./rbox 10 | ./qconvex FQ FV n Tv | ./qhalf Tv")
-+    add_test(NAME rbox-10-qvoronoi
-+       COMMAND sh -c "./rbox 10 | ./qvoronoi Tv")
-+    add_test(NAME user_eg
-+       COMMAND sh -c "./user_eg")
-+    add_test(NAME user_eg2
-+       COMMAND sh -c "./user_eg2")
-+
-+    if(${BUILD_STATIC_LIBS})
-+        add_test(NAME user_eg3
-+           COMMAND sh -c "./user_eg3 rbox '10 D2' '2 D2' qhull 's p' facets")
-+     endif()
- endif()
- 
- # ---------------------------------------
--- 
-2.36.0.512.ge40c2bad7a-goog
-