From fbdefbe06a3192dc58bae27aec46a168a17d4017 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Fri, 8 Nov 2024 09:42:52 -0800
Subject: [PATCH] python-codecs: remove pillow simd

---
 plugins/python-codecs/.vscode/launch.json   | 13 +----------
 plugins/python-codecs/.vscode/settings.json | 25 ++++++---------------
 plugins/python-codecs/package-lock.json     |  4 ++--
 plugins/python-codecs/package.json          |  2 +-
 plugins/python-codecs/src/requirements.txt  |  5 +----
 5 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/plugins/python-codecs/.vscode/launch.json b/plugins/python-codecs/.vscode/launch.json
index c2c6e1f4a..3aee1b0ba 100644
--- a/plugins/python-codecs/.vscode/launch.json
+++ b/plugins/python-codecs/.vscode/launch.json
@@ -21,21 +21,10 @@
                 },
                 {
                     "localRoot": "${workspaceFolder}/src",
-                    "remoteRoot": "${config:scrypted.pythonRemoteRoot}"
+                    "remoteRoot": "."
                 },
 
             ]
-        },
-        {
-            "name": "Python: Test",
-            "type": "debugpy",
-            "request": "launch",
-            "program": "${workspaceFolder}/src/test.py",
-            "console": "internalConsole",
-            "justMyCode": true,
-            "env": {
-                "GST_PLUGIN_PATH": "/opt/homebrew/lib/gstreamer-1.0"
-            }
         }
     ]
 }
\ No newline at end of file
diff --git a/plugins/python-codecs/.vscode/settings.json b/plugins/python-codecs/.vscode/settings.json
index bb391aee8..e9e0c170d 100644
--- a/plugins/python-codecs/.vscode/settings.json
+++ b/plugins/python-codecs/.vscode/settings.json
@@ -1,31 +1,20 @@
 
 {
     // docker installation
-    // "scrypted.debugHost": "scrypted-server",
-    // "scrypted.serverRoot": "/server",
-
-    // lxc installation
-    // "scrypted.debugHost": "scrypted-server",
-    // "scrypted.serverRoot": "/root/.scrypted",
-
-    // windows installation
-    // "scrypted.debugHost": "koushik-windows",
-    // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
+    "scrypted.debugHost": "scrypted-nvr",
+    "scrypted.serverRoot": "/server",
 
     // pi local installation
     // "scrypted.debugHost": "192.168.2.119",
     // "scrypted.serverRoot": "/home/pi/.scrypted",
 
     // local checkout
-    "scrypted.debugHost": "127.0.0.1",
-    "scrypted.serverRoot": "/Users/koush/.scrypted",
+    // "scrypted.debugHost": "127.0.0.1",
+    // "scrypted.serverRoot": "/Users/koush/.scrypted",
+    // "scrypted.debugHost": "koushik-winvm",
+    // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
 
-    "scrypted.pythonRemoteRoot": "${config:scrypted.serverRoot}/volume/plugin.zip",
     "python.analysis.extraPaths": [
         "./node_modules/@scrypted/sdk/types/scrypted_python"
-    ],
-    "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter"
-    },
-    "python.formatting.provider": "none"
+    ]
 }
\ No newline at end of file
diff --git a/plugins/python-codecs/package-lock.json b/plugins/python-codecs/package-lock.json
index e434e2a64..f01c25772 100644
--- a/plugins/python-codecs/package-lock.json
+++ b/plugins/python-codecs/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.96",
+   "version": "0.1.97",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/python-codecs",
-         "version": "0.1.96",
+         "version": "0.1.97",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }
diff --git a/plugins/python-codecs/package.json b/plugins/python-codecs/package.json
index b078b7736..da0f7e10e 100644
--- a/plugins/python-codecs/package.json
+++ b/plugins/python-codecs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.96",
+   "version": "0.1.97",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",
diff --git a/plugins/python-codecs/src/requirements.txt b/plugins/python-codecs/src/requirements.txt
index 35484d9bb..2f7cf13f2 100644
--- a/plugins/python-codecs/src/requirements.txt
+++ b/plugins/python-codecs/src/requirements.txt
@@ -3,7 +3,4 @@ numpy>=1.16.2
 
 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; 'linux' not in sys_platform or platform_machine != 'x86_64'
-pillow-simd; 'linux' in sys_platform and platform_machine == 'x86_64'
+Pillow>=5.4.1