diff --git a/build.gradle b/build.gradle index a37054604..30ccc581e 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ ext { openCVversion = "4.8.0-2" joglVersion = "2.4.0-rc-20200307" javalinVersion = "5.6.2" - photonGlDriverLibVersion = "dev-v2023.1.0-9-g75fc678" + libcameraDriverVersion = "dev-v2023.1.0-10-g2693ec0" rknnVersion = "dev-v2024.0.0-64-gc0836a6" frcYear = "2024" mrcalVersion = "dev-v2024.0.0-18-gb903a09"; diff --git a/photon-core/build.gradle b/photon-core/build.gradle index 159064db0..88d11c24a 100644 --- a/photon-core/build.gradle +++ b/photon-core/build.gradle @@ -39,8 +39,8 @@ dependencies { implementation "org.xerial:sqlite-jdbc:3.41.0.0" implementation "org.photonvision:rknn_jni-jni:$rknnVersion:linuxarm64" implementation "org.photonvision:rknn_jni-java:$rknnVersion" - implementation "org.photonvision:photon-libcamera-gl-driver-jni:$photonGlDriverLibVersion:linuxarm64" - implementation "org.photonvision:photon-libcamera-gl-driver-java:$photonGlDriverLibVersion" + implementation "org.photonvision:photon-libcamera-gl-driver-jni:$libcameraDriverVersion:linuxarm64" + implementation "org.photonvision:photon-libcamera-gl-driver-java:$libcameraDriverVersion" implementation "org.photonvision:photon-mrcal-java:$mrcalVersion" diff --git a/scripts/install.sh b/scripts/install.sh index fe845d87c..528956394 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -120,18 +120,6 @@ then fi echo "JRE installation complete." -if [ "$ARCH" == "aarch64" ] -then - if package_is_installed libopencv-core4.6 - then - echo "libopencv-core4.6 already installed" - else - # libphotonlibcamera.so on raspberry pi has dep on libopencv_core - echo "Installing libopencv-core4.6 on aarch64" - apt-get install --yes libopencv-core4.6 - fi -fi - echo "Installing additional math packages" apt-get install --yes libcholmod3 liblapack3 libsuitesparseconfig5