From 6ffcdbeec9eaaa6586c5e8a77de13d449acc55da Mon Sep 17 00:00:00 2001
From: Blyron <53337103+Blyron@users.noreply.github.com>
Date: Tue, 21 May 2024 13:35:07 +0200
Subject: [PATCH 1/3] Aaron/fix dt windows v2 (#7680)

* Fix OSM2ODR build

* Avoid remove to root in windows
---
 .../CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
index 42daea10d..d1bee7cb7 100644
--- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
+++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/OpenDriveToMap.cpp
@@ -363,7 +363,10 @@ void UOpenDriveToMap::GenerateTile(){
 
     UEditorLoadingAndSavingUtils::SaveDirtyPackages(true, true);
     UEditorLevelLibrary::SaveCurrentLevel();
+#if PLATFORM_LINUX
     RemoveFromRoot();
+#endif
+
   }
 }
 

From e2ccc3c5190049d2f8972207025039b7050a48f6 Mon Sep 17 00:00:00 2001
From: joel-mb <joel.moriana@gmail.com>
Date: Tue, 21 May 2024 15:05:12 +0200
Subject: [PATCH 2/3] revert patchelf version to 0.12 (#7681)

---
 Util/BuildTools/Setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index f68dd378f..64774d017 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -761,7 +761,7 @@ cp -p ${PROJ_SERVER_LIB} ${LIBCARLA_INSTALL_SERVER_FOLDER}/lib/
 # -- Get and compile patchelf --------------------------------------------------
 # ==============================================================================
 
-PATCHELF_VERSION=0.14
+PATCHELF_VERSION=0.12
 PATCHELF_REPO=https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz
 
 PATCHELF_TAR=${PATCHELF_VERSION}.tar.gz

From 7b2ff04496f4981d15c221abb3166b1851c6061a Mon Sep 17 00:00:00 2001
From: Aaron <samaniegoaaron112@gmail.com>
Date: Thu, 23 May 2024 14:29:09 +0200
Subject: [PATCH 3/3] Not tests V2X tick

---
 PythonAPI/test/smoke/test_sensor_tick_time.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PythonAPI/test/smoke/test_sensor_tick_time.py b/PythonAPI/test/smoke/test_sensor_tick_time.py
index a7d144610..b98c04007 100644
--- a/PythonAPI/test/smoke/test_sensor_tick_time.py
+++ b/PythonAPI/test/smoke/test_sensor_tick_time.py
@@ -38,7 +38,9 @@ class TestSensorTickTime(SyncSmokeTest):
       "sensor.camera.semantic_segmentation",
       "sensor.camera.dvs",
       "sensor.other.obstacle",
-      "sensor.camera.instance_segmentation"
+      "sensor.camera.instance_segmentation",
+      "sensor.other.v2x",
+      "sensor.other.v2x_custom"
     }
     spawned_sensors = []
     sensor_tick = 1.0
@@ -64,5 +66,3 @@ class TestSensorTickTime(SyncSmokeTest):
       self.assertEqual(sensor.num_ticks, num_sensor_ticks,
         "\n\n {} does not match tick count".format(sensor.bp_sensor.id))
       sensor.destroy()
-
-