From 9b8b1b579c4326a1713b85504afda683f1e315e7 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 5 Nov 2022 16:32:10 +1100
Subject: [PATCH] Patch OpenJPEG to include uclouvain/openjpeg#1423

---
 winbuild/build_prepare.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 5277b84f81c..1f85cd1ea9a 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -323,6 +323,11 @@ def cmd_msbuild(
         "filename": "openjpeg-2.5.0.tar.gz",
         "dir": "openjpeg-2.5.0",
         "license": "LICENSE",
+        "patch": {
+            r"src\lib\openjp2\ht_dec.c": {
+                "#ifdef OPJ_COMPILER_MSVC\n    return (OPJ_UINT32)__popcnt(val);": "#if defined(OPJ_COMPILER_MSVC) && (defined(_M_IX86) || defined(_M_AMD64))\n    return (OPJ_UINT32)__popcnt(val);",
+            }
+        },
         "build": [
             cmd_cmake(("-DBUILD_CODEC:BOOL=OFF", "-DBUILD_SHARED_LIBS:BOOL=OFF")),
             cmd_nmake(target="clean"),