From 87a1be4d4e5b5af19b1b6174992e179357ae3aad Mon Sep 17 00:00:00 2001
From: LD <laurent.deru@gmail.com>
Date: Mon, 6 Jan 2020 09:57:34 +0100
Subject: [PATCH 1/7] makepackage: Add warning in macOS installer about change
 of installdir

Closes #830
---
 makepanda/makepackage.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py
index ec78a5277e..b79a4430d7 100755
--- a/makepanda/makepackage.py
+++ b/makepanda/makepackage.py
@@ -730,6 +730,10 @@ def MakeInstallerOSX(version, runtime=False, python_versions=[], installdir=None
     dist.write('    <title>Panda3D SDK %s</title>\n' % (version))
     dist.write('    <options customize="always" allow-external-scripts="no" rootVolumeOnly="false"/>\n')
     dist.write('    <license language="en" mime-type="text/plain">%s</license>\n' % ReadFile("doc/LICENSE"))
+    dist.write('    <readme language="en" mime-type="text/plain">')
+    dist.write('WARNING: From Panda3D version 1.10.5 onwards, the default installation has been changed from /Developer/Panda3D to /Library/Developer/Panda3D\n')
+    dist.write('This installation script will remove any existing installation in /Developer and if possible create a symbolic link towards /Library/Developer/Panda3D\n')
+    dist.write('    </readme>')
     dist.write('    <script>\n')
     dist.write('    function isPythonVersionInstalled(version) {\n')
     dist.write('        return system.files.fileExistsAtPath("/usr/bin/python" + version)\n')

From b78f0b0881c3ed135cc3008cd32783990143225d Mon Sep 17 00:00:00 2001
From: Nathan S <55564547+NathanX-S@users.noreply.github.com>
Date: Mon, 6 Jan 2020 04:53:58 -0500
Subject: [PATCH 2/7] device: add support for DualShock Gen 2 (PS4) controllers
 on Windows

Closes #831

Co-authored-by: rdb <git@rdb.name>
---
 panda/src/device/winRawInputDevice.cxx | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/panda/src/device/winRawInputDevice.cxx b/panda/src/device/winRawInputDevice.cxx
index 843e434a16..3651f14fb8 100644
--- a/panda/src/device/winRawInputDevice.cxx
+++ b/panda/src/device/winRawInputDevice.cxx
@@ -69,6 +69,18 @@ static const struct DeviceMapping {
   {0x0955, 0x7214, InputDevice::DeviceClass::gamepad, 0,
     {"face_a", "face_b", 0, "face_x", "face_y", "rshoulder", "lshoulder", "rshoulder", 0, 0, 0, "start", 0, "lstick", "rstick", 0}
   },
+  // Dualshock (PS4)
+  {0x054c, 0x05c4, InputDevice::DeviceClass::gamepad, 0,
+    {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0}
+  },
+  // Dualshock 2nd Gen (PS4 Slim)
+  {0x054c, 0x09cc, InputDevice::DeviceClass::gamepad, 0,
+    {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0}
+  },
+  // Dualshock 2nd Gen (PS4 wireless adapter)
+  {0x054c, 0x0ba0, InputDevice::DeviceClass::gamepad, 0,
+    {"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick", "guide", 0}
+  },
   {0},
 };
 

From bf6dbefdd2d5744e712eff7cafbd784733b05846 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 6 Jan 2020 18:11:40 +0100
Subject: [PATCH 3/7] display: fix get_cpuid_max clobbering %rbx (fixes Py 3.8
 crash on macOS)

This could cause a crash when constructing a GraphicsPipe() under some conditions (observed in Python 3.8).  Credit goes to @CFSworks for tracking this down.
---
 panda/src/display/graphicsPipe.cxx | 32 ++++++++++++------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx
index 937987f567..52ccfa426d 100644
--- a/panda/src/display/graphicsPipe.cxx
+++ b/panda/src/display/graphicsPipe.cxx
@@ -55,25 +55,6 @@ union cpuid_info {
   };
 };
 
-/**
- * Returns the highest cpuid leaf that is supported by the CPU.
- */
-static inline uint32_t get_cpuid_max(uint32_t leaf) {
-#if defined(__GNUC__) && !defined(__APPLE__)
-  return __get_cpuid_max(leaf, nullptr);
-#elif defined(_MSC_VER)
-  uint32_t p[4] = {0};
-  __cpuid((int *)p, leaf);
-  return p[0];
-#else
-  unsigned int eax = 0;
-  __asm__ ("cpuid\n\t"
-           : "=a" (eax)
-           : "0" (leaf));
-  return eax;
-#endif
-}
-
 /**
  * Gets cpuid info for the given leaf.
  */
@@ -88,6 +69,19 @@ static inline void get_cpuid(uint32_t leaf, cpuid_info &info) {
            : "0" (leaf));
 #endif
 }
+
+/**
+ * Returns the highest cpuid leaf that is supported by the CPU.
+ */
+static inline uint32_t get_cpuid_max(uint32_t leaf) {
+#if defined(__GNUC__) && !defined(__APPLE__)
+  return __get_cpuid_max(leaf, nullptr);
+#else
+  cpuid_info info;
+  get_cpuid(leaf, info);
+  return info.eax;
+#endif
+}
 #endif
 
 #ifdef IS_LINUX

From 8d0d733da8671c9dc18f24464acdd34f427f0bcc Mon Sep 17 00:00:00 2001
From: LD <laurent.deru@gmail.com>
Date: Mon, 6 Jan 2020 16:59:39 +0100
Subject: [PATCH 4/7] dist: Flatten also @rpath/ dynamic library references

Closes #834
---
 direct/src/dist/commands.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py
index 7ec1290d5b..7e2ec82a29 100644
--- a/direct/src/dist/commands.py
+++ b/direct/src/dist/commands.py
@@ -1181,18 +1181,20 @@ class build_apps(setuptools.Command):
                     dylib = dylib.replace('@loader_path/../Frameworks/', '')
                 elif dylib.startswith('@executable_path/../Frameworks/'):
                     dylib = dylib.replace('@executable_path/../Frameworks/', '')
-                elif dylib.startswith('@loader_path/'):
-                    dylib = dylib.replace('@loader_path/', '')
+                else:
+                    for prefix in ('@loader_path/', '@rpath/'):
+                        if dylib.startswith(prefix):
+                            dylib = dylib.replace(prefix, '')
 
-                    # Do we need to flatten the relative reference?
-                    if '/' in dylib and flatten:
-                        new_dylib = '@loader_path/' + os.path.basename(dylib)
-                        str_size = len(cmd_data) - 16
-                        if len(new_dylib) < str_size:
-                            fp.seek(-str_size, os.SEEK_CUR)
-                            fp.write(new_dylib.encode('ascii').ljust(str_size, b'\0'))
-                        else:
-                            self.warn('Unable to rewrite dependency {}'.format(orig))
+                            # Do we need to flatten the relative reference?
+                            if '/' in dylib and flatten:
+                                new_dylib = prefix + os.path.basename(dylib)
+                                str_size = len(cmd_data) - 16
+                                if len(new_dylib) < str_size:
+                                    fp.seek(-str_size, os.SEEK_CUR)
+                                    fp.write(new_dylib.encode('ascii').ljust(str_size, b'\0'))
+                                else:
+                                    self.warn('Unable to rewrite dependency {}'.format(orig))
 
                 load_dylibs.append(dylib)
 

From bd5841781ccde7ff4da312d3c9031739a49791cb Mon Sep 17 00:00:00 2001
From: LD <laurent.deru@gmail.com>
Date: Mon, 6 Jan 2020 17:10:03 +0100
Subject: [PATCH 5/7] dist: Add missing dependency for CEFPython on macOS

Closes #835
---
 direct/src/dist/commands.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py
index 7e2ec82a29..cee22d62bf 100644
--- a/direct/src/dist/commands.py
+++ b/direct/src/dist/commands.py
@@ -112,6 +112,7 @@ PACKAGE_DATA_DIRS = {
         ('cefpython3/subprocess*', '', {'PKG_DATA_MAKE_EXECUTABLE'}),
         ('cefpython3/locals/*', 'locals', {}),
         ('cefpython3/Chromium Embedded Framework.framework/Resources', 'Chromium Embedded Framework.framework/Resources', {}),
+        ('cefpython3/Chromium Embedded Framework.framework/Chromium Embedded Framework', '', {'PKG_DATA_MAKE_EXECUTABLE'}),
     ],
 }
 

From f09ee925820f510d5498dfb27f99c6a7a928acfa Mon Sep 17 00:00:00 2001
From: LD <laurent.deru@gmail.com>
Date: Mon, 6 Jan 2020 16:25:18 +0100
Subject: [PATCH 6/7] dist: glob pattern must be lowercase as it is compared to
 lowercase filenames

Closes #832
---
 direct/src/dist/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/direct/src/dist/commands.py b/direct/src/dist/commands.py
index cee22d62bf..a84d7f5fae 100644
--- a/direct/src/dist/commands.py
+++ b/direct/src/dist/commands.py
@@ -835,7 +835,7 @@ class build_apps(setuptools.Command):
                 whlfile = self._get_zip_file(whl)
                 filenames = whlfile.namelist()
                 for source_pattern, target_dir, flags in datadesc:
-                    srcglob = p3d.GlobPattern(source_pattern)
+                    srcglob = p3d.GlobPattern(source_pattern.lower())
                     source_dir = os.path.dirname(source_pattern)
                     # Relocate the target dir to the build directory.
                     target_dir = target_dir.replace('/', os.sep)

From b245c480c01e805055eedc82a8fde1d04fcc0b6d Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 6 Jan 2020 21:03:53 +0100
Subject: [PATCH 7/7] dist: fix ModuleFinder reading .pyc files in Python
 2.7-3.3, 3.7 and 3.8

Fixes #836
---
 direct/src/dist/FreezeTool.py | 37 +++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/direct/src/dist/FreezeTool.py b/direct/src/dist/FreezeTool.py
index 5d12a2fb5c..f7b2ea9b91 100644
--- a/direct/src/dist/FreezeTool.py
+++ b/direct/src/dist/FreezeTool.py
@@ -11,6 +11,7 @@ import struct
 import io
 import distutils.sysconfig as sysconf
 import zipfile
+import importlib
 
 from . import pefile
 
@@ -2349,12 +2350,36 @@ class PandaModuleFinder(modulefinder.ModuleFinder):
             code += b'\n' if isinstance(code, bytes) else '\n'
             co = compile(code, pathname, 'exec')
         elif type == imp.PY_COMPILED:
-            try:
-                marshal_data = importlib._bootstrap_external._validate_bytecode_header(fp.read())
-            except ImportError as exc:
-                self.msgout(2, "raise ImportError: " + str(exc), pathname)
-                raise
-            co = marshal.loads(marshal_data)
+            if sys.version_info >= (3, 7):
+                try:
+                    data = fp.read()
+                    importlib._bootstrap_external._classify_pyc(data, fqname, {})
+                except ImportError as exc:
+                    self.msgout(2, "raise ImportError: " + str(exc), pathname)
+                    raise
+
+                co = marshal.loads(memoryview(data)[16:])
+            elif sys.version_info >= (3, 4):
+                try:
+                    if sys.version_info >= (3, 5):
+                        marshal_data = importlib._bootstrap_external._validate_bytecode_header(fp.read())
+                    else:
+                        marshal_data = importlib._bootstrap._validate_bytecode_header(fp.read())
+                except ImportError as exc:
+                    self.msgout(2, "raise ImportError: " + str(exc), pathname)
+                    raise
+
+                co = marshal.loads(marshal_data)
+            else:
+                if fp.read(4) != imp.get_magic():
+                    self.msgout(2, "raise ImportError: Bad magic number", pathname)
+                    raise ImportError("Bad magic number in %s" % pathname)
+
+                fp.read(4)
+                if sys.version_info >= (3, 3):
+                    fp.read(4)
+
+                co = marshal.load(fp)
         else:
             co = None