Full local linux-64 rebuild

RoboStack · Jan 8, 2025 · fafd1ed · fafd1ed
1 parent 10ffa72
commit fafd1ed
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 22 deletions.
diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -1,3 +1,5 @@
+euslisp:
+  add_host: ["${{ 'xorg-libx11' if linux }}"]
 qt_gui_cpp:
   add_build: ["pyqt-builder", "pyqt5-sip", "sip 6.7.*"]
   add_host: ["${{ 'setuptools 69.*' if win }}", "sip 6.7.*"]

diff --git a/patch/ros-noetic-euslisp.patch b/patch/ros-noetic-euslisp.patch
@@ -0,0 +1,44 @@
+diff --git a/lisp/Makefile.Linux64 b/lisp/Makefile.Linux64
+index e12ed082..ce35ee40 100644
+--- a/lisp/Makefile.Linux64
++++ b/lisp/Makefile.Linux64
+@@ -50,7 +50,7 @@ CFLAGS= $(WFLAGS) -fPIC -D$(MACHINE) -DLinux -D_REENTRANT -DVERSION=\"$(VERSION)
+ 	-DLIB6 $(ALIGN_FUNCTIONS) \
+         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
+ 	-DGCC $(GCC3) \
+-	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/include
++	    -I$(PREFIX)/include -I$(PREFIX)/X11R6/include -I$(EUSDIR)/include
+
+ CC=gcc
+
+@@ -68,7 +68,7 @@ CC=gcc
+
+ # Linux
+ RAWLIB=-ldl -lm -lpthread -lc
+-XLIB= -L/usr/X11R6/lib -lX11
++XLIB= -L$(PREFIX)/lib -lX11
+
+ # specify directories where euslisp's libraries are located.
+ EUSRPATH=-R$(ADLIBDIR)
+diff --git a/lisp/Makefile.LinuxARM b/lisp/Makefile.LinuxARM
+index e49262b3..b9290d8c 100644
+--- a/lisp/Makefile.LinuxARM
++++ b/lisp/Makefile.LinuxARM
+@@ -72,7 +72,7 @@ CFLAGS=$(WFLAGS) -D$(MACHINE) -DLinux -DARM -D_REENTRANT -DVERSION=\"$(VERSION)\
+ 	-DLIB6 $(ALIGN_FUNCTIONS) $(ADD_CFLAGS) \
+         $(DEBUG) $(CPU_OPTIMIZE) $(THREAD) -D$(XVERSION) \
+ 	-DGCC $(GCC3) \
+-	        -I/usr/include -I/usr/X11R6/include -I$(EUSDIR)/include
++	      -I$(PREFIX)/include -I$(PREFIX)/X11R6/include -I$(EUSDIR)/include
+
+ # Use gcc for C-compiling on SunOS4. Sun's cc is ok on Solaris.
+ # /usr/ucb/cc cannot compile because of its incapability of recognizing
+@@ -94,7 +94,7 @@ LD=gcc
+
+ # Linux
+ RAWLIB=-ldl -lm -lpthread -lc
+-XLIB= -L/usr/X11R6/lib -lX11
++XLIB= -L$(PREFIX)/lib -lX11
+
+ # specify directories where euslisp's libraries are located.
+ EUSLIB= -Xlinker -R$(ADLIBDIR):$(EUSDIR)/lib/LinuxARM -L$(ADLIBDIR)
diff --git a/patch/ros-noetic-jsk-interactive-marker.patch b/patch/ros-noetic-jsk-interactive-marker.patch
@@ -0,0 +1,24 @@
+diff --git a/src/interactive_marker_utils.cpp b/src/interactive_marker_utils.cpp
+index cb709057..eb4a35d5 100644
+--- a/src/interactive_marker_utils.cpp
++++ b/src/interactive_marker_utils.cpp
+@@ -2,6 +2,8 @@
+ #include <boost/filesystem/operations.hpp>
+ #include <iostream>
+ #include <stdlib.h>
++#include <filesystem>
++
+ #include <ros/package.h>
+ #include "urdf_parser/urdf_parser.h"
+
+@@ -570,8 +572,8 @@ namespace im_utils {
+ 	try{
+ 	  std::string search_path = std::string(gazebo_model_path, current, found - current);
+ 	  current = found + 1;
+-	  recursive_directory_iterator iter = recursive_directory_iterator(search_path);
+-	  recursive_directory_iterator end = recursive_directory_iterator();
++	  std::filesystem::recursive_directory_iterator iter = std::filesystem::recursive_directory_iterator(search_path);
++	  std::filesystem::recursive_directory_iterator end = std::filesystem::recursive_directory_iterator();
+ 	  for (; iter != end; ++iter) {
+ 	    if (is_regular_file(*iter)) {
+ 	      int locate = iter->path().string().find( path, 0 );
diff --git a/patch/ros-noetic-jsk-rviz-plugins.patch b/patch/ros-noetic-jsk-rviz-plugins.patch
@@ -2,14 +2,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 310db0bd..a23f2288 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -64,12 +64,8 @@ include_directories(src ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})
+@@ -80,12 +80,8 @@ include_directories(src ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})
  ## CATKIN_DEPENDS: catkin_packages dependent projects also need
  ## DEPENDS: system dependencies of this project that dependent projects also need
 
--if(rviz_QT_VERSION VERSION_LESS "5")
+-if(USE_VISUALIZATION AND rviz_QT_VERSION VERSION_LESS "5")
 -  find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
 -  include(${QT_USE_FILE})
--else()
+-elseif(USE_VISUALIZATION)
 -  find_package(Qt5Widgets REQUIRED)
 -endif()
 +find_package(Qt5 COMPONENTS Widgets REQUIRED)
@@ -50,18 +50,6 @@ index 60f21549..9962aa0d 100644
  #include "facing_visualizer.h"
  #include <rviz/uniform_string_stream.h>
  #include <rviz/render_panel.h>
-diff --git a/src/overlay_diagnostic_display.h b/src/overlay_diagnostic_display.h
-index 01cc7fc0..61fe680d 100644
---- a/src/overlay_diagnostic_display.h
-+++ b/src/overlay_diagnostic_display.h
-@@ -42,6 +42,7 @@
- #include <OGRE/OgreMaterial.h>
-
- #include <QPainter>
-+#include <QPainterPath>
-
- #include <rviz/properties/ros_topic_property.h>
- #include <rviz/properties/editable_enum_property.h>
 diff --git a/src/overlay_utils.cpp b/src/overlay_utils.cpp
 index 73525c43..494e2bdf 100644
 --- a/src/overlay_utils.cpp

diff --git a/pixi.lock b/pixi.lock
diff --git a/pixi.toml b/pixi.toml
@@ -27,7 +27,7 @@ git = "*"
 
 [feature.beta.pypi-dependencies]
 # This is tipically the latest commit on rattler-build-humble branch
-vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "71fd33aafd53729f6140811fa2535b34f929e034" }
+vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "c47948cdec7d20d480342161751a34e92a3b0eaf" }
 # Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
 # (and regenerate the pixi.lock) once you push the modified commit to the repo
 #vinca = { path = "../vinca", editable = true }

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -29,6 +29,8 @@ packages_remove_from_deps:
   - kobuki-ftdi # needs too many patches for ftdi & usb
   - openni2-camera
   - libpointmatcher
+  - roseus
+  - jskeus
 
 build_in_own_azure_stage:
   - ros-noetic-jsk-pcl-ros-utils

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -25,6 +25,8 @@ packages_skip_by_deps:
 packages_remove_from_deps:
   - stage-ros
   - stage
+  - roseus
+  - jskeus
 
 skip_existing:
   # - https://conda.anaconda.org/robostack/

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -26,6 +26,8 @@ packages_skip_by_deps:
 packages_remove_from_deps:
   - stage-ros
   - stage
+  - roseus
+  - jskeus
 
 skip_existing:
   # - https://conda.anaconda.org/robostack/

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -25,6 +25,8 @@ packages_skip_by_deps:
 packages_remove_from_deps:
   - stage-ros
   - stage
+  - roseus
+  - jskeus
 
 skip_existing:
   # - https://conda.anaconda.org/robostack/

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -28,6 +28,8 @@ packages_remove_from_deps:
   # - image_view
   - stage-ros
   - stage
+  - roseus
+  - jskeus
 
 skip_existing:
   - https://conda.anaconda.org/robostack-staging/