diff --git a/rpi/patches/jpegio/apply-patch.sh b/rpi/patches/jpegio/apply-patch.sh index 1a4f381..9498ca7 100755 --- a/rpi/patches/jpegio/apply-patch.sh +++ b/rpi/patches/jpegio/apply-patch.sh @@ -21,6 +21,12 @@ cd "$JPEGIO_DIR" echo "Applying ARM64 patch to jpegio..." +# Fix CRLF line endings (jpegio uses Windows line endings) +if file setup.py | grep -q CRLF; then + echo " Converting CRLF to LF..." + sed -i 's/\r$//' setup.py +fi + # Strategy 1: Try the standard patch file if [ -f "$PATCH_FILE" ]; then echo " Trying patch file..." diff --git a/rpi/patches/jpegio/arm64.patch b/rpi/patches/jpegio/arm64.patch index 129d4e1..cbc5d6b 100644 --- a/rpi/patches/jpegio/arm64.patch +++ b/rpi/patches/jpegio/arm64.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -69,12 +69,12 @@ +@@ -64,7 +64,7 @@ elif sys.platform == 'darwin': # macOS largs.append('-mmacosx-version-min=10.9') if arch == 'x64': @@ -9,6 +9,9 @@ elif sys.platform == 'linux': cargs.extend(['-w', '-fPIC']) +@@ -68,7 +68,7 @@ elif sys.platform == 'linux': + cargs.extend(['-w', '-fPIC']) + if arch == 'x64': - cargs.append('-m64') + pass # ARM64: removed x86-specific -m64 flag