Merge branch 'main' of github.com:koush/scrypted

koush · May 4, 2024 · 0163a80 · 0163a80
2 parents ab157b1 + 905a9ae
commit 0163a80
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/install/docker/install-nvidia-graphics.sh b/install/docker/install-nvidia-graphics.sh
@@ -1,6 +1,9 @@
 if [ "$(uname -m)" = "x86_64" ]
 then
-    export CUDA_VERSION=12-4
+    # uncomment to require cuda 12, but everything currently targets 11.
+    # stuff that targets 11 will work with 12 though. 
+    # export CUDA_VERSION=12-4
+    export CUDA_VERSION=11-8
     echo "Installing NVIDIA graphics packages."
     apt update -q \
         && apt install wget \

diff --git a/plugins/opencv/src/requirements.txt b/plugins/opencv/src/requirements.txt
@@ -1,9 +1,13 @@
 # plugin
 numpy>=1.16.2
-# pillow for anything not intel linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+
 imutils>=0.5.0
-# opencv-python is not available on armhf
+
 # locked to version because 4.8.0.76 is broken.
-opencv-python==4.8.0.74; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64'
+# todo: check newer versions.
+opencv-python==4.8.0.74
+
+# pillow-simd is available on x64 linux
+# pillow-simd confirmed not building with arm64 linux or apple silicon
+Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
+pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'
diff --git a/plugins/openvino/src/requirements.txt b/plugins/openvino/src/requirements.txt
@@ -3,5 +3,5 @@ openvino==2024.0.0
 
 # pillow-simd is available on x64 linux
 # pillow-simd confirmed not building with arm64 linux or apple silicon
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
+pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'
diff --git a/plugins/python-codecs/src/requirements.txt b/plugins/python-codecs/src/requirements.txt
@@ -5,5 +5,5 @@ av>=10.0.0
 
 # in case pyvips fails to load, use a pillow fallback.
 # pillow for anything not intel linux, pillow-simd is available on x64 linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
+pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'
diff --git a/plugins/tensorflow-lite/src/requirements.txt b/plugins/tensorflow-lite/src/requirements.txt
@@ -2,6 +2,7 @@
 pycoral~=2.0
 tflite-runtime==2.5.0.post1
 
-# pillow for anything not intel linux, pillow-simd is available on x64 linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+# pillow-simd is available on x64 linux
+# pillow-simd confirmed not building with arm64 linux or apple silicon
+Pillow>=5.4.1; 'linux' not in sys_platform or platform_machine != 'x86_64'
+pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'