diff --git a/scripts/fetch-vendor.py b/scripts/fetch-vendor.py index 47aa2a421..2fb15c676 100644 --- a/scripts/fetch-vendor.py +++ b/scripts/fetch-vendor.py @@ -9,25 +9,18 @@ def get_platform(): system = platform.system() - machine = platform.machine() + is_arm64 = platform.machine() in ("arm64", "aarch64") if system == "Linux": if platform.libc_ver()[0] == "glibc": - return f"manylinux_{machine}" + return "manylinux-aarch64" if is_arm64 else "manylinux-x86_64" else: - return f"musllinux_{machine}" + return "musllinux-aarch64" if is_arm64 else "musllinux-x86_64" elif system == "Darwin": - # cibuildwheel sets ARCHFLAGS: - # https://github.com/pypa/cibuildwheel/blob/5255155bc57eb6224354356df648dc42e31a0028/cibuildwheel/macos.py#L207-L220 - if "ARCHFLAGS" in os.environ: - machine = os.environ["ARCHFLAGS"].split()[1] - return f"macosx_{machine}" + return "macos-arm64" if is_arm64 else "macos-x86_64" elif system == "Windows": - if struct.calcsize("P") * 8 == 64: - return "win_amd64" - else: - return "win32" + return "windows-aarch64" if is_arm64 else "windows-x86_64" else: - raise Exception(f"Unsupported system {system}") + return "unknown" parser = argparse.ArgumentParser(description="Fetch and extract tarballs") @@ -58,6 +51,5 @@ def get_platform(): ["curl", "--location", "--output", tarball_file, "--silent", tarball_url] ) -# extract tarball logging.info(f"Extracting {tarball_name}") subprocess.check_call(["tar", "-C", args.destination_dir, "-xf", tarball_file]) diff --git a/scripts/ffmpeg-7.1.json b/scripts/ffmpeg-7.1.json deleted file mode 100644 index 82ee313d6..000000000 --- a/scripts/ffmpeg-7.1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/7.1.1-6/ffmpeg-{platform}.tar.gz" -} diff --git a/scripts/ffmpeg-8.0.json b/scripts/ffmpeg-8.0.json index 54968d400..5ec867122 100644 --- a/scripts/ffmpeg-8.0.json +++ b/scripts/ffmpeg-8.0.json @@ -1,3 +1,3 @@ { - "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-2/ffmpeg-{platform}.tar.gz" + "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-3/ffmpeg-{platform}.tar.gz" } diff --git a/scripts/ffmpeg-latest.json b/scripts/ffmpeg-latest.json index 54968d400..5ec867122 100644 --- a/scripts/ffmpeg-latest.json +++ b/scripts/ffmpeg-latest.json @@ -1,3 +1,3 @@ { - "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-2/ffmpeg-{platform}.tar.gz" + "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/8.0.1-3/ffmpeg-{platform}.tar.gz" }