From 9508b040e77d7f9d6cd318d2e55827e84e0cf95f Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 14 Nov 2022 10:50:30 +0100 Subject: [PATCH] Update to 1.10.13 thirdparty tools on macOS These contain OpenCV libraries with fixed relative references on arm64 Fixes #1393 --- .github/workflows/ci.yml | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a73a2992e0..0ab254bb7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,10 +26,10 @@ jobs: - name: Get thirdparty packages (macOS) if: runner.os == 'macOS' run: | - curl -O https://www.panda3d.org/download/panda3d-1.10.11/panda3d-1.10.11-tools-mac.tar.gz - tar -xf panda3d-1.10.11-tools-mac.tar.gz - mv panda3d-1.10.11/thirdparty thirdparty - rmdir panda3d-1.10.11 + curl -O https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz + tar -xf panda3d-1.10.13-tools-mac.tar.gz + mv panda3d-1.10.13/thirdparty thirdparty + rmdir panda3d-1.10.13 (cd thirdparty/darwin-libs-a && rm -rf rocket) - name: Set up Python 3.9 uses: actions/setup-python@v2 diff --git a/README.md b/README.md index fd73771869..03c50bd2eb 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ macOS ----- On macOS, you will need to download a set of precompiled thirdparty packages in order to -compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.12/panda3d-1.10.12-tools-mac.tar.gz). +compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.10.13/panda3d-1.10.13-tools-mac.tar.gz). After placing the thirdparty directory inside the panda3d source directory, you may build Panda3D using a command like the following: