From fafd1ed6705bc2ec533b7828917314dbe41f8cc1 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 8 Jan 2025 16:01:21 +1000 Subject: [PATCH] Full local linux-64 rebuild --- patch/dependencies.yaml | 2 + patch/ros-noetic-euslisp.patch | 44 +++++++++++++++++++ patch/ros-noetic-jsk-interactive-marker.patch | 24 ++++++++++ patch/ros-noetic-jsk-rviz-plugins.patch | 18 ++------ pixi.lock | 12 ++--- pixi.toml | 2 +- vinca_linux_64.yaml | 2 + vinca_linux_aarch64.yaml | 2 + vinca_osx.yaml | 2 + vinca_osx_arm64.yaml | 2 + vinca_win.yaml | 2 + 11 files changed, 90 insertions(+), 22 deletions(-) create mode 100644 patch/ros-noetic-euslisp.patch create mode 100644 patch/ros-noetic-jsk-interactive-marker.patch diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 03165ae12..8d34af42f 100644 --- 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 new file mode 100644 index 000000000..63193ca3a --- /dev/null +++ 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 new file mode 100644 index 000000000..580099ddf --- /dev/null +++ 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 + #include + #include ++#include ++ + #include + #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 index f9e71dbc3..ba6ad2316 100644 --- 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 #include -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 - - #include -+#include - - #include - #include 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 index f1a231595..561785cf3 100644 --- a/pixi.lock +++ b/pixi.lock @@ -88,7 +88,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/68/6e/264c50ce2a31473a9fdbf4fa66ca9b2b17c7455b31ef585462343818bd6c/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 + - pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf linux-aarch64: - conda: https://repo.prefix.dev/conda-forge/linux-aarch64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda @@ -170,7 +170,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/3c/d2/b79b7d695e2f21da020bd44c782490578f300dd44f0a4c57a92575758a76/ruamel.yaml.clib-0.2.12-cp311-cp311-manylinux2014_aarch64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 + - pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf osx-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -242,7 +242,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/20/84/80203abff8ea4993a87d823a5f632e4d92831ef75d404c9fc78d0176d2b5/ruamel.yaml.clib-0.2.12.tar.gz - - pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 + - pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf osx-arm64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -314,7 +314,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/fb/8f/683c6ad562f558cbc4f7c029abcd9599148c51c54b5ef0f24f2638da9fbb/ruamel.yaml.clib-0.2.12-cp311-cp311-macosx_13_0_arm64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 + - pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf win-64: - conda: https://repo.prefix.dev/conda-forge/noarch/anaconda-client-1.12.3-pyhd8ed1ab_1.conda - conda: https://repo.prefix.dev/conda-forge/noarch/attrs-24.3.0-pyh71513ae_0.conda @@ -394,7 +394,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/1c/e2/772f8cff8172a612823755035073b00753613c24af0ed6d3bae215021608/rospkg-1.5.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/35/79/5e2cffa1c77432f11cd93a5351f30732c997a239d3a3090856a72d6d8ba7/ruamel.yaml-0.17.40-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b4/4f/b52f634c9548a9291a70dfce26ca7ebce388235c93588a1068028ea23fcc/ruamel.yaml.clib-0.2.12-cp311-cp311-win_amd64.whl - - pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 + - pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf default: channels: - url: https://repo.prefix.dev/conda-forge/ @@ -2802,7 +2802,7 @@ packages: purls: [] size: 754247 timestamp: 1731710681163 -- pypi: git+https://github.com/RoboStack/vinca.git@71fd33aafd53729f6140811fa2535b34f929e034 +- pypi: git+https://github.com/RoboStack/vinca.git@c47948cdec7d20d480342161751a34e92a3b0eaf name: vinca version: 0.0.2 requires_dist: diff --git a/pixi.toml b/pixi.toml index c141f9d54..cbbabc58b 100644 --- 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 index d18bd039b..11386c842 100644 --- 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 index b09f3f974..9e91e8946 100644 --- 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 index f05b83d83..983f8ac60 100644 --- 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 index 17e3c5b6b..fb182aa8f 100644 --- 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 index 130b3606b..c84d382bb 100644 --- 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/