From 01b0f351216d170bd824017aa45ca2ce58073e27 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:05:50 +0800 Subject: [PATCH 1/5] pyqt@5 5.15.9 Follow-up to #132437. --- Formula/p/pyqt@5.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Formula/p/pyqt@5.rb b/Formula/p/pyqt@5.rb index 33a409bf9784..155a622990d1 100644 --- a/Formula/p/pyqt@5.rb +++ b/Formula/p/pyqt@5.rb @@ -1,10 +1,9 @@ class PyqtAT5 < Formula desc "Python bindings for v5 of Qt" homepage "https://www.riverbankcomputing.com/software/pyqt/intro" - url "https://files.pythonhosted.org/packages/e1/57/2023316578646e1adab903caab714708422f83a57f97eb34a5d13510f4e1/PyQt5-5.15.7.tar.gz" - sha256 "755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594" + url "https://files.pythonhosted.org/packages/5c/46/b4b6eae1e24d9432905ef1d4e7c28b6610e28252527cdc38f2a75997d8b5/PyQt5-5.15.9.tar.gz" + sha256 "dc41e8401a90dc3e2b692b411bd5492ab559ae27a27424eed4bd3915564ec4c0" license "GPL-3.0-only" - revision 2 bottle do sha256 cellar: :any, arm64_ventura: "3e36ecd411d274f6c728ee7be982673d8a843795909a1e6a7294a9c287445292" @@ -27,13 +26,13 @@ class PyqtAT5 < Formula # extra components resource "PyQt5-sip" do - url "https://files.pythonhosted.org/packages/39/5f/fd9384fdcb9cd0388088899c110838007f49f5da1dd1ef6749bfb728a5da/PyQt5_sip-12.11.0.tar.gz" - sha256 "b4710fd85b57edef716cc55fae45bfd5bfac6fc7ba91036f1dcc3f331ca0eb39" + url "https://files.pythonhosted.org/packages/c1/61/4055e7a0f36339964956ff415e36f4abf82561904cc49c021da32949fc55/PyQt5_sip-12.12.1.tar.gz" + sha256 "8fdc6e0148abd12d977a1d3828e7b79aae958e83c6cb5adae614916d888a6b10" end resource "PyQt3D" do - url "https://files.pythonhosted.org/packages/44/af/58684ce08013c0e16839662844b29cd73259a909982c4d6517ce5ffda05f/PyQt3D-5.15.5.tar.gz" - sha256 "c025e8a2de12a27e3bd34671d01cac39f78305128cc6cea3f0ba99e4ca3ec41b" + url "https://files.pythonhosted.org/packages/a5/80/26e3394c25187854bd3b68865b2b46cfd285aae01bbf448ddcac6f466af0/PyQt3D-5.15.6.tar.gz" + sha256 "7d6c6d55cd8fc221b313c995c0f8729a377114926f0377f8e9011d45ebf3881c" end resource "PyQtChart" do From 6663943670b0d20f87ff061e4ac2eef152672e26 Mon Sep 17 00:00:00 2001 From: Michael Cho Date: Mon, 3 Jul 2023 20:19:58 -0700 Subject: [PATCH 2/5] qt@5: use bundled `re2` --- Formula/q/qt@5.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Formula/q/qt@5.rb b/Formula/q/qt@5.rb index eb269db7204c..aa57c21cef4a 100644 --- a/Formula/q/qt@5.rb +++ b/Formula/q/qt@5.rb @@ -64,7 +64,6 @@ class QtAT5 < Formula depends_on "nss" depends_on "opus" depends_on "pulseaudio" - depends_on "re2" depends_on "sdl2" depends_on "snappy" depends_on "systemd" From c64da2d9154102b08b65727754c46a6ed9f081de Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Wed, 23 Aug 2023 23:04:08 +0200 Subject: [PATCH 3/5] qt@5: add patch for Linux build --- Formula/q/qt@5.rb | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/Formula/q/qt@5.rb b/Formula/q/qt@5.rb index aa57c21cef4a..6ed414ad884c 100644 --- a/Formula/q/qt@5.rb +++ b/Formula/q/qt@5.rb @@ -9,6 +9,7 @@ class QtAT5 < Formula mirror "https://mirrors.ocf.berkeley.edu/qt/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz" sha256 "b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca" license all_of: ["GFDL-1.3-only", "GPL-2.0-only", "GPL-3.0-only", "LGPL-2.1-only", "LGPL-3.0-only"] + revision 1 bottle do rebuild 1 @@ -112,6 +113,10 @@ class QtAT5 < Formula sha256 "142c4fb11dca6c0bbc86ca8f74410447c23be1b1d314758515bfda20afa6f612" directory "src/3rdparty" end + + # Fix ffmpeg build with binutils + # https://www.linuxquestions.org/questions/slackware-14/regression-on-current-with-ffmpeg-4175727691/ + patch :DATA end # Update catapult to a revision that supports Python 3. @@ -301,3 +306,78 @@ def caveats system "./hello" end end + +__END__ +From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 16 Jul 2023 18:18:02 +0300 +Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift + instructions within inline assembly + +Fixes assembling with binutil as >= 2.41 + +Signed-off-by: James Almer +--- + src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +diff --git a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +index 6298f5ed1983b84205479d1a714bd657435789f9..ca7e2dffc1076f82d2cabf55eae0681adbdcfb96 100644 +--- a/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h ++++ b/src/3rdparty/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h +@@ -35,12 +35,20 @@ + static av_always_inline av_const int MULL(int a, int b, unsigned shift) + { + int rt, dummy; ++ if (__builtin_constant_p(shift)) + __asm__ ( + "imull %3 \n\t" + "shrdl %4, %%edx, %%eax \n\t" + :"=a"(rt), "=d"(dummy) +- :"a"(a), "rm"(b), "ci"((uint8_t)shift) ++ :"a"(a), "rm"(b), "i"(shift & 0x1F) + ); ++ else ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++ :"a"(a), "rm"(b), "c"((uint8_t)shift) ++ ); + return rt; + } + +@@ -113,19 +121,31 @@ __asm__ volatile(\ + // avoid +32 for shift optimization (gcc should do that ...) + #define NEG_SSR32 NEG_SSR32 + static inline int32_t NEG_SSR32( int32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("sarl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } + + #define NEG_USR32 NEG_USR32 + static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ ++ if (__builtin_constant_p(s)) + __asm__ ("shrl %1, %0\n\t" + : "+r" (a) +- : "ic" ((uint8_t)(-s)) ++ : "i" (-s & 0x1F) + ); ++ else ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++ : "c" ((uint8_t)(-s)) ++ ); + return a; + } + From 9b99c9a256280d85a33ab7d8118e59c0ff0a3b6e Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 28 Aug 2023 21:17:42 +0000 Subject: [PATCH 4/5] qt@5: update 5.15.10_1 bottle. --- Formula/q/qt@5.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Formula/q/qt@5.rb b/Formula/q/qt@5.rb index 6ed414ad884c..a560eaacdce9 100644 --- a/Formula/q/qt@5.rb +++ b/Formula/q/qt@5.rb @@ -12,14 +12,13 @@ class QtAT5 < Formula revision 1 bottle do - rebuild 1 - sha256 cellar: :any, arm64_ventura: "8caeb580012da1742aa9d2ce0b06ebd69a14d1e2cb1c5f8452de5bf351eb38a0" - sha256 cellar: :any, arm64_monterey: "82d9c11e66478d53c106a9b6cf827e15ed3d9f985191a39b9d50f2273a31f093" - sha256 cellar: :any, arm64_big_sur: "9bfa378a951e54e0b557d72fd9c73c6ca6d35c914ddab249573987ed289fe8c9" - sha256 cellar: :any, ventura: "74d8d57fc5e31ef60565e74d421f1b80fa68f67adf41663d30922b68bc4ccfbd" - sha256 cellar: :any, monterey: "f0beebfcdc5eafa89b84cc6ffa15f0359be50969efb706688168f94647c8077c" - sha256 cellar: :any, big_sur: "ada5a2bd5fb44eb222e8b99a06cd075bc7d78e146291acbf905922482acf3914" - sha256 cellar: :any_skip_relocation, x86_64_linux: "3cefabf81e57004029003a2fc31e836487c51695f261071d318f9c2f74d776c3" + sha256 arm64_ventura: "330939c7756ddee5e43da5e9798a15796cdf7135e6914939899be2a217918f2f" + sha256 arm64_monterey: "1f17cce98119eddcf96818e51b8c1f08945fc94ad27628153115e4dc48497b5a" + sha256 arm64_big_sur: "c7710f1d370c4cb9152e552c494839fab03f4832ca1f6f4c82d530c33ce292d2" + sha256 ventura: "cd820d8c2d510b8164504cf4b6d73aded029eaa085dec90eca7827fbd09c67fb" + sha256 monterey: "45aa69692119d95baaaabe4a685e95d052eb6a6284b42faa05857bdddc3461cb" + sha256 big_sur: "ccc45e8c1ef15a2172c6df6b7222e8d3f71e07cb485de12533de2f6fb2ae7efb" + sha256 cellar: :any_skip_relocation, x86_64_linux: "bbb2c33ff6ae8495f6f255b8c5a7304db66c66c659687a80e78f126a11b0e2c1" end keg_only :versioned_formula From cb7d3ab0b6246ba5054c633e2e3d9110ae672047 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 28 Aug 2023 21:17:45 +0000 Subject: [PATCH 5/5] pyqt@5: update 5.15.9 bottle. --- Formula/p/pyqt@5.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/p/pyqt@5.rb b/Formula/p/pyqt@5.rb index 155a622990d1..2f3df971773b 100644 --- a/Formula/p/pyqt@5.rb +++ b/Formula/p/pyqt@5.rb @@ -6,13 +6,13 @@ class PyqtAT5 < Formula license "GPL-3.0-only" bottle do - sha256 cellar: :any, arm64_ventura: "3e36ecd411d274f6c728ee7be982673d8a843795909a1e6a7294a9c287445292" - sha256 cellar: :any, arm64_monterey: "65d02cc59037ca2eb5dd5ac2d5e19fb46debba9a4b418764592b1cec2fdf0975" - sha256 cellar: :any, arm64_big_sur: "054b7a3aac3ae4030c2989aca8120e97aa347ac8a8341add5b3358a298fda543" - sha256 cellar: :any, ventura: "6f3b970bf51f05674d2d7e3a50aee7cd2fe8e68e36d2167781714579d9412d7a" - sha256 cellar: :any, monterey: "d42f26eec225db2710a8e29939d04ab779b3487c7bc614db576c5d44110419c4" - sha256 cellar: :any, big_sur: "08f088f6a293b8f0246afe3d25142e0d1faf43012d876bd500b979bdcdd9aca3" - sha256 cellar: :any_skip_relocation, x86_64_linux: "f3c706d51bb7d4f4fd8f7839be6a65060267d0939aa8cba042eb4e40f0a8ad49" + sha256 cellar: :any_skip_relocation, arm64_ventura: "bdebe6cce54a45c856b8b2237308f4ba53e45ea0bc460769b615f557bc69ac09" + sha256 cellar: :any_skip_relocation, arm64_monterey: "83b6ea13c4b1389d0fe758bcd9f83b8d6564b8b6abbfc05c57ce102d4734940d" + sha256 cellar: :any_skip_relocation, arm64_big_sur: "0926e76447c749f669f1a2cc13c9fa06ff2da0ae8071c62d1e96f8ea1357227f" + sha256 cellar: :any_skip_relocation, ventura: "e05bf795d62839535e0e0e6ee6c70a6bef82bc90a953de0393c21ed1f870b4bb" + sha256 cellar: :any_skip_relocation, monterey: "04905257fd09737552946add20a940e065cbe973080bc60c63022f0b5cacc939" + sha256 cellar: :any_skip_relocation, big_sur: "25533e0e23fb89a027e17c991cc9ddd0dc76c3d4805acc4f1d6f3e506bde88b8" + sha256 cellar: :any_skip_relocation, x86_64_linux: "ccf729fadf5aec8e76778c9ea6cc1abe3a1abe6c19016a56a4a7713348dcd45f" end depends_on "pyqt-builder" => :build