From aace94a52174bc214f9c44220b83b9a525cfe62b Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 25 Nov 2020 01:17:43 +0100 Subject: [PATCH 1/2] makepanda: Fix version checks for macOS 11.0 Big Sur Fixes #1056 --- makepanda/makepackage.py | 4 ++-- makepanda/makepanda.py | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py index 59125ac9bd..274f159ce4 100755 --- a/makepanda/makepackage.py +++ b/makepanda/makepackage.py @@ -167,8 +167,8 @@ deps: {DEPENDS} MACOS_SCRIPT_PREFIX = \ """#!/bin/bash IFS=. -read -a version_info <<< "`sw_vers -productVersion`'" -if (( ${version_info[1]} < 15 )); then +read -a version_info <<< "`sw_vers -productVersion`" +if (( ${version_info[0]} == 10 && ${version_info[1]} < 15 )); then """ MACOS_SCRIPT_POSTFIX = \ diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index bcdca0bea0..a13c6ed840 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -294,7 +294,7 @@ def parseopts(args): try: maj, min = OSXTARGET.strip().split('.') OSXTARGET = int(maj), int(min) - assert OSXTARGET[0] == 10 + assert OSXTARGET[0] >= 10 except: usage("Invalid setting for OSXTARGET") else: @@ -313,10 +313,10 @@ def parseopts(args): maj, min = platform.mac_ver()[0].split('.')[:2] osxver = int(maj), int(min) - if osxver[1] < 15: + if osxver[0] == 10 and osxver[1] < 15: OSX_ARCHS.append("i386") - if osxver[1] < 6: + if osxver[0] == 10 and osxver[1] < 6: OSX_ARCHS.append("ppc") else: OSX_ARCHS.append("x86_64") @@ -2645,9 +2645,6 @@ def WriteConfigSettings(): dtool_config["HAVE_VIDEO4LINUX"] = 'UNDEF' dtool_config["PHAVE_LINUX_INPUT_H"] = 'UNDEF' dtool_config["IS_OSX"] = '1' - # 10.4 had a broken ucontext implementation - if int(platform.mac_ver()[0][3]) <= 4: - dtool_config["PHAVE_UCONTEXT_H"] = 'UNDEF' if (GetTarget() == "freebsd"): dtool_config["IS_LINUX"] = 'UNDEF' From 4e7742b8e22bf763b60a75bb877f41468cd08e72 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 28 Nov 2020 22:22:32 +0100 Subject: [PATCH 2/2] VFSImporter: replace deprecated U open() flag Fixes #1063 --- direct/src/showbase/VFSImporter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/direct/src/showbase/VFSImporter.py b/direct/src/showbase/VFSImporter.py index b59965ae3c..7ed45db6bd 100644 --- a/direct/src/showbase/VFSImporter.py +++ b/direct/src/showbase/VFSImporter.py @@ -65,7 +65,7 @@ class VFSImporter: vfile = vfs.getFile(filename, True) if vfile: return VFSLoader(dir_path, vfile, filename, - desc=('.py', 'U', imp.PY_SOURCE)) + desc=('.py', 'r', imp.PY_SOURCE)) # If there's no .py file, but there's a .pyc file, load that # anyway. @@ -93,7 +93,7 @@ class VFSImporter: vfile = vfs.getFile(filename, True) if vfile: return VFSLoader(dir_path, vfile, filename, packagePath=path, - desc=('.py', 'U', imp.PY_SOURCE)) + desc=('.py', 'r', imp.PY_SOURCE)) for ext in compiledExtensions: filename = Filename(path, '__init__.' + ext) vfile = vfs.getFile(filename, True)