Bump libcamera to fix picam v1, remove duplicate opencv (#1263)

This commit is contained in:
Matt
2024-05-10 12:09:01 -04:00
committed by GitHub
parent 00c2a25730
commit 560f379109
3 changed files with 3 additions and 15 deletions

View File

@@ -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";

View File

@@ -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"

View File

@@ -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