PyOpenGL-accelerate 3.1.7 requires numpy to load

Xpra-org · Jun 15, 2023 · e0040a4 · e0040a4
1 parent 2522da7
commit e0040a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/packaging/MacOS/make-app.sh b/packaging/MacOS/make-app.sh
@@ -294,8 +294,6 @@ if [ "$STRIP_OPENGL" == "1" ]; then
 	done
 	popd
 fi
-echo " * remove numpy"
-rm -fr $LIBDIR/python/numpy
 pushd $LIBDIR/python
 echo " * zipping OpenGL"
 zip --move -q -r site-packages.zip OpenGL

diff --git a/setup.py b/setup.py
@@ -1831,7 +1831,8 @@ def addconf(name, dst_name=None):
         remove_packages("xpra.platform.win32", "xpra.platform.xposix")
         #to support GStreamer 1.x we need this:
         modules += ["importlib", "mimetypes"]
-        external_excludes.append("numpy")
+        #for PyOpenGL:
+        add_packages("numpy.core._methods", "numpy.lib.format")
     else:
         add_packages("xpra.platform.xposix")
         remove_packages("xpra.platform.win32", "xpra.platform.darwin")