Cleanup patches

patch/ros-noetic-moveit-core.win.patch

@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1aa2450ff..8eec58cbc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -24,10 +24,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+@@ -24,17 +24,13 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE Release)
  endif()
 
@@ -13,6 +13,15 @@ index 1aa2450ff..8eec58cbc 100644
  find_package(Boost REQUIRED system filesystem date_time thread iostreams regex ${EXTRA_BOOST_COMPONENTS})
  find_package(Eigen3 REQUIRED)
 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
+
+ # TODO: Move collision detection into separate packages
+-find_package(Bullet 2.87)
++find_package(Bullet)
+
+ # TODO(j-petit): Version check can be dropped when Xenial reaches end-of-life
+ if(BULLET_FOUND)
+
 @@ -56,6 +52,12 @@ foreach(_lib ${LIBFCL_PC_LIBRARIES})
    list(APPEND LIBFCL_LIBRARIES ${_lib_${_lib}})
  endforeach()

patch/ros-noetic-plotjuggler.patch

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37fc096e..f9d574e7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,14 +222,14 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/paho.mqtt.c/CMakeLists.txt")
+     add_subdirectory( plugins/DataStreamMQTT )
+ endif()
+
+-if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/liblsl/CMakeLists.txt")
+-    SET(LSL_ENABLE_TESTING FALSE CACHE BOOL "Build tests and run" FORCE)
+-    SET(LSL_ENABLE_CPACK FALSE CACHE BOOL "Enable CPack" FORCE)
+-    SET(LSL_BUILD_STATIC TRUE CACHE BOOL "Build static library" FORCE)
+-    SET(LSL_BUILD_SHARED FALSE CACHE BOOL "Build shared library" FORCE)
+-    add_subdirectory( 3rdparty/liblsl )
+-    add_subdirectory( plugins/DataStreamLSL )
+-endif()
++#if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/liblsl/CMakeLists.txt")
++#    SET(LSL_ENABLE_TESTING FALSE CACHE BOOL "Build tests and run" FORCE)
++#    SET(LSL_ENABLE_CPACK FALSE CACHE BOOL "Enable CPack" FORCE)
++#    SET(LSL_BUILD_STATIC TRUE CACHE BOOL "Build static library" FORCE)
++#    SET(LSL_BUILD_SHARED FALSE CACHE BOOL "Build shared library" FORCE)
++#    add_subdirectory( 3rdparty/liblsl )
++#    add_subdirectory( plugins/DataStreamLSL )
++#endif()
+
+ add_subdirectory( src )
+
+

vinca_osx.yaml

@@ -8,7 +8,7 @@ conda_index:
 
 build_number: 3
 
-skip_all_deps: false
+skip_all_deps: true
 
 packages_skip_by_deps:
   # - rviz
@@ -19,51 +19,51 @@ packages_remove_from_deps:
   - stage
 
 skip_existing:
-  - https://conda.anaconda.org/robostack/
+  # - https://conda.anaconda.org/robostack/
 
 packages_select_by_deps:
   ##
   #  TODO OSX
   ##
+  - plotjuggler
   - plotjuggler_ros
 
   ##
   # DONE OSX
   ##
-  - catkin
-  - desktop
-  - desktop_full
-  - slam_karto
-  - rviz
-  - class_loader
-  - robot
-  - executive_smach
-  - geometry_tutorials
-  - interactive_marker_tutorials
-  - joint_state_publisher_gui
-  - nodelet_core
-  - robot_state_publisher
-  - diagnostic_analysis
-  - diagnostic_common_diagnostics
-  - libfranka
-  - franka_visualization
-  - ros_control
-  - ros_controllers
-  - rviz_visual_tools
-  - perception
-  - perception_pcl
-  - joy
-  - imu_tools
-  - velodyne
-  - rosbridge_suite
-  - robot_localization
-  - plotjuggler
-  - urg_node
-  - teb_local_planner
-  - moveit
-  - slam_toolbox
-  - turtlebot3
-  - cnpy
+  # - catkin
+  # - desktop
+  # - desktop_full
+  # - slam_karto
+  # - rviz
+  # - class_loader
+  # - robot
+  # - executive_smach
+  # - geometry_tutorials
+  # - interactive_marker_tutorials
+  # - joint_state_publisher_gui
+  # - nodelet_core
+  # - robot_state_publisher
+  # - diagnostic_analysis
+  # - diagnostic_common_diagnostics
+  # - libfranka
+  # - franka_visualization
+  # - ros_control
+  # - ros_controllers
+  # - rviz_visual_tools
+  # - perception
+  # - perception_pcl
+  # - joy
+  # - imu_tools
+  # - velodyne
+  # - rosbridge_suite
+  # - robot_localization
+  # - urg_node
+  # - teb_local_planner
+  # - moveit
+  # - slam_toolbox
+  # - turtlebot3
+  # - cnpy
 
   ##
   # NOT RELEASED ON NOETIC...