From ae5aa2cc856092eedebd70187a9125b037b8d992 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 13 Jun 2025 15:06:56 +0000 Subject: [PATCH] mac build: downgrade pyqt to 6.6, to make camera work --- .../requirements-binaries-mac.txt | 24 ++++++++----------- .../requirements-binaries-mac.txt | 6 ++++- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/deterministic-build/requirements-binaries-mac.txt b/contrib/deterministic-build/requirements-binaries-mac.txt index 5bc5548cc..578af135c 100644 --- a/contrib/deterministic-build/requirements-binaries-mac.txt +++ b/contrib/deterministic-build/requirements-binaries-mac.txt @@ -110,20 +110,16 @@ pip==25.1.1 \ pycparser==2.22 \ --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \ --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc -PyQt6==6.7.1 \ - --hash=sha256:0adb7914c732ad1dee46d9cec838a98cb2b11bc38cc3b7b36fbd8701ae64bf47 \ - --hash=sha256:2d771fa0981514cb1ee937633dfa64f14caa902707d9afffab66677f3a73e3da \ - --hash=sha256:3672a82ccd3a62e99ab200a13903421e2928e399fda25ced98d140313ad59cb9 \ - --hash=sha256:7f397f4b38b23b5588eb2c0933510deb953d96b1f0323a916c4839c2a66ccccc \ - --hash=sha256:c2f202b7941aa74e5c7e1463a6f27d9131dbc1e6cabe85571d7364f5b3de7397 \ - --hash=sha256:f053378e3aef6248fa612c8afddda17f942fb63f9fe8a9aeb2a6b6b4cbb0eba9 \ - --hash=sha256:fa3954698233fe286a8afc477b84d8517f0788eb46b74da69d3ccc0170d3714c -PyQt6-Qt6==6.7.3 \ - --hash=sha256:36ea0892b8caeb983af3f285f45fb8dfbb93cfd972439f4e01b7efb2868f6230 \ - --hash=sha256:50c7482bcdcf2bb78af257fb10ed8b582f8daf91d829782393bc50ac5a0a900c \ - --hash=sha256:8551732984fb36a5f4f3db51eafc4e8e6caf18617365830285306f2db17a94c2 \ - --hash=sha256:cb525fdd393332de60887953029276a44de480fce1d785251ae639580f5e7246 \ - --hash=sha256:f517a93b6b1a814d4aa6587adc312e812ebaf4d70415bb15cfb44268c5ad3f5f +PyQt6==6.6.1 \ + --hash=sha256:03a656d5dc5ac31b6a9ad200f7f4f7ef49fa00ad7ce7a991b9bb691617141d12 \ + --hash=sha256:5aa0e833cb5a79b93813f8181d9f145517dd5a46f4374544bcd1e93a8beec537 \ + --hash=sha256:6b43878d0bbbcf8b7de165d305ec0cb87113c8930c92de748a11c473a6db5085 \ + --hash=sha256:9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379 +PyQt6-Qt6==6.6.2 \ + --hash=sha256:5a41fe9d53b9e29e9ec5c23f3c5949dba160f90ca313ee8b96b8ffe6a5059387 \ + --hash=sha256:7ef446d3ffc678a8586ff6dc9f0d27caf4dff05dea02c353540d2f614386faf9 \ + --hash=sha256:8d7f674a4ec43ca00191e14945ca4129acbe37a2172ed9d08214ad58b170bc11 \ + --hash=sha256:b8363d88623342a72ac17da9127dc12f259bb3148796ea029762aa2d499778d9 PyQt6-sip==13.10.2 \ --hash=sha256:061d4a2eb60a603d8be7db6c7f27eb29d9cea97a09aa4533edc1662091ce4f03 \ --hash=sha256:07f77e89d93747dda71b60c3490b00d754451729fbcbcec840e42084bf061655 \ diff --git a/contrib/requirements/requirements-binaries-mac.txt b/contrib/requirements/requirements-binaries-mac.txt index d542b3dd3..ab8bd5f33 100644 --- a/contrib/requirements/requirements-binaries-mac.txt +++ b/contrib/requirements/requirements-binaries-mac.txt @@ -1,3 +1,7 @@ # Qt 6.8 would require macOS 12+, 6.7 still supports macOS 11 -PyQt6<6.8 +# Qt 6.7 has issue "No QtMultimedia backends found." (i.e. camera does not work) +# PyQt6-Qt6==6.6.3 segfaults with "illegal hardware instruction" +PyQt6<6.7 +PyQt6-Qt6<6.7,!=6.6.3 + cryptography>=2.6