From 1465f13d88ad9149d5c42e54850afc77da912fe7 Mon Sep 17 00:00:00 2001
From: Thad House <thadhouse1@gmail.com>
Date: Wed, 17 Jan 2024 21:01:38 -0800
Subject: [PATCH 1/3] Set DependentLoadFlags on shared windows binaries

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index da862cb..376d1b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -210,6 +210,10 @@ if (project.platform == "linux-athena") {
             def args = defaultCmakeArgs
             if (buildType.contains("Shared")) {
                 args = args + '-DBUILD_SHARED_LIBS=ON' + '-DOPENCV_DEBUG_POSTFIX=d'
+
+                if (project.platform.contains('windows')) {
+                    args = args + '-DCMAKE_SHARED_LINKER_FLAGS=/DEPENDENTLOADFLAG:0x1100'
+                }
             } else {
                 args = args + '-DBUILD_SHARED_LIBS=OFF'
             }

From 1e02c7b2696b83f3e3fa455e143235fcf29622f1 Mon Sep 17 00:00:00 2001
From: Thad House <thadhouse1@gmail.com>
Date: Wed, 17 Jan 2024 21:04:15 -0800
Subject: [PATCH 2/3] Bump path

---
 publish.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/publish.gradle b/publish.gradle
index eaaeda5..8739c1a 100644
--- a/publish.gradle
+++ b/publish.gradle
@@ -13,7 +13,7 @@ publishing {
     }
 }
 
-def pubVersion = "${project.ext.version}-2"
+def pubVersion = "${project.ext.version}-3"
 
 def outputsFolder = file("$project.buildDir/outputs")
 

From 38f97100398f58e5a1b49ebf97c620ae7f7489bd Mon Sep 17 00:00:00 2001
From: Thad House <thadhouse1@gmail.com>
Date: Wed, 17 Jan 2024 21:09:02 -0800
Subject: [PATCH 3/3] Switch to 2024 roborio compiler part 2

---
 .github/workflows/main.yml      | 2 +-
 arm-frc-gnueabi.toolchain.cmake | 2 +-
 build.gradle                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0e60371..bafd5d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2023-22.04
+          - container: wpilib/roborio-cross-ubuntu:2024-22.04
             artifact-name: Athena
             build-options: "-Pplatform=linux-athena"
           - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
diff --git a/arm-frc-gnueabi.toolchain.cmake b/arm-frc-gnueabi.toolchain.cmake
index ff431c6..28aeb42 100644
--- a/arm-frc-gnueabi.toolchain.cmake
+++ b/arm-frc-gnueabi.toolchain.cmake
@@ -1,5 +1,5 @@
 set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
-set(GNU_MACHINE "arm-frc2023-linux-gnueabi" CACHE STRING "GNU compiler triple")
+set(GNU_MACHINE "arm-frc2024-linux-gnueabi" CACHE STRING "GNU compiler triple")
 set(SOFTFP yes)
 set(ARM_LINUX_SYSROOT /usr/local/arm-nilrt-linux-gnueabi/sysroot)
 include("${CMAKE_CURRENT_LIST_DIR}/opencv/platforms/linux/arm.toolchain.cmake")
diff --git a/build.gradle b/build.gradle
index 376d1b8..28184ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,8 +183,8 @@ def stripExe = 'strip'
 def objCopyExe = 'objcopy'
 
 if (project.platform == "linux-athena") {
-    stripExe = 'arm-frc2023-linux-gnueabi-strip'
-    objCopyExe = 'arm-frc2023-linux-gnueabi-objcopy'
+    stripExe = 'arm-frc2024-linux-gnueabi-strip'
+    objCopyExe = 'arm-frc2024-linux-gnueabi-objcopy'
 } else if (project.platform == "linux-arm32") {
     stripExe = 'armv6-bullseye-linux-gnueabihf-strip'
     objCopyExe = 'armv6-bullseye-linux-gnueabihf-objcopy'