commit:     11e0280b3ed7fc8ab39977b8d4d80ff26a98cf21
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Tue Apr 29 18:39:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 29 19:02:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e0280b

media-libs/libyuv: block older pjproject where libyuv is vendored

Bug: https://bugs.gentoo.org/955077
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/41849
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libyuv/{libyuv-1904.ebuild => libyuv-1904-r1.ebuild} | 6 +++++-
 media-libs/libyuv/libyuv-9999.ebuild                            | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-libs/libyuv/libyuv-1904.ebuild 
b/media-libs/libyuv/libyuv-1904-r1.ebuild
similarity index 89%
rename from media-libs/libyuv/libyuv-1904.ebuild
rename to media-libs/libyuv/libyuv-1904-r1.ebuild
index 256a02fae229..f53e1b3e8961 100644
--- a/media-libs/libyuv/libyuv-1904.ebuild
+++ b/media-libs/libyuv/libyuv-1904-r1.ebuild
@@ -25,7 +25,11 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=media-libs/libjpeg-turbo-3.0.0"
+# !<net-libs/pjproject-2.15.1-r1[libyuv]: bug 955077
+RDEPEND="
+       !<net-libs/pjproject-2.15.1-r1[libyuv]
+       >=media-libs/libjpeg-turbo-3.0.0
+"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 

diff --git a/media-libs/libyuv/libyuv-9999.ebuild 
b/media-libs/libyuv/libyuv-9999.ebuild
index c1e85a7e35df..fb5891d3468b 100644
--- a/media-libs/libyuv/libyuv-9999.ebuild
+++ b/media-libs/libyuv/libyuv-9999.ebuild
@@ -25,7 +25,11 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=media-libs/libjpeg-turbo-3.0.0"
+# !<net-libs/pjproject-2.15.1-r1[libyuv]: bug 955077
+RDEPEND="
+       !<net-libs/pjproject-2.15.1-r1[libyuv]
+       >=media-libs/libjpeg-turbo-3.0.0
+"
 DEPEND="${RDEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 

Reply via email to