Merge branch 'release/1.10.x'

direct/src/dist/commands.py

@@ -94,6 +94,7 @@ PACKAGE_DATA_DIRS = {
         ('cefpython3/Chromium Embedded Framework.framework/Resources', 'Chromium Embedded Framework.framework/Resources', {}),
         ('cefpython3/Chromium Embedded Framework.framework/Chromium Embedded Framework', '', {'PKG_DATA_MAKE_EXECUTABLE'}),
     ],
+    'pytz': [('pytz/zoneinfo/*', 'zoneinfo', ())],
 }
 
 # Some dependencies have extra directories that need to be scanned for DLLs.

dtool/src/prc/encryptStreamBuf.cxx

@@ -95,6 +95,10 @@ EncryptStreamBuf::
 ~EncryptStreamBuf() {
   close_read();
   close_write();
+
+#ifdef PHAVE_IOSTREAM
+  delete[] eback();
+#endif
 }
 
 /**

makepanda/makepandacore.py

@@ -1345,6 +1345,8 @@ def GetThirdpartyDir():
             THIRDPARTYDIR = base + "/linux-libs-arm/"
         elif (target_arch in ("x86_64", "amd64")):
             THIRDPARTYDIR = base + "/linux-libs-x64/"
+        elif target_arch == "aarch64":
+            THIRDPARTYDIR = base + "/linux-libs-aarch64/"
         else:
             THIRDPARTYDIR = base + "/linux-libs-a/"
 
@@ -1353,6 +1355,8 @@ def GetThirdpartyDir():
             THIRDPARTYDIR = base + "/freebsd-libs-arm/"
         elif (target_arch in ("x86_64", "amd64")):
             THIRDPARTYDIR = base + "/freebsd-libs-x64/"
+        elif target_arch == "aarch64":
+            THIRDPARTYDIR = base + "/freebsd-libs-aarch64/"
         else:
             THIRDPARTYDIR = base + "/freebsd-libs-a/"
 

panda/src/display/graphicsWindow.cxx

@@ -354,9 +354,9 @@ disable_pointer_mode(int device) {
 }*/
 
 /**
- * Returns the MouseData associated with the nth input device's pointer.  This
- * is deprecated; use get_pointer_device().get_pointer() instead, or for raw
- * mice, use the InputDeviceManager interface.
+ * Returns the MouseData associated with the nth input device's pointer.
+ * Using this to access raw mice (with an index other than 0) is deprecated,
+ * see the InputDeviceManager interface instead.
  */
 MouseData GraphicsWindow::
 get_pointer(int device) const {