#1231: don't build or bundle opencv on 32-bit windows since it crashes..

git-svn-id: https://xpra.org/svn/Xpra/trunk@18290 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/setup.py

@@ -191,7 +191,7 @@ def is_RH():
 vpx_ENABLED             = DEFAULT and pkg_config_version("1.4", "vpx")
 enc_ffmpeg_ENABLED      = False
 #opencv currently broken on 32-bit windows (crashes on load):
-webcam_ENABLED          = DEFAULT and not OSX
+webcam_ENABLED          = DEFAULT and not OSX and (not WIN32 or BITS==64)
 v4l2_ENABLED            = DEFAULT and (not WIN32 and not OSX and not FREEBSD)
 #ffmpeg 3.1 or later is required
 dec_avcodec2_ENABLED    = DEFAULT and pkg_config_version("57", "libavcodec")
@@ -1412,6 +1412,8 @@ def add_service_exe(script, icon, base_name):
 
     if webcam_ENABLED:
         external_includes.append("cv2")
+    else:
+        remove_packages("cv2")
 
     if opengl_ENABLED or nvenc_ENABLED or nvfbc_ENABLED:
         #we need numpy for opengl or as a fallback for the Cython xor module