summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-05 19:59:41 +0100
committerSam James <sam@gentoo.org>2022-10-05 19:59:41 +0100
commit66283f2985ba905b9c53412f4b392c0a37144b97 (patch)
tree26d087aa7d0516d8d5cb184f95f5172832e0a8f8 /media-video
parentmedia-sound/teamspeak-client: use || ( ... ) dep for dev-libs/atk (diff)
downloadgentoo-66283f2985ba905b9c53412f4b392c0a37144b97.tar.gz
gentoo-66283f2985ba905b9c53412f4b392c0a37144b97.tar.bz2
gentoo-66283f2985ba905b9c53412f4b392c0a37144b97.zip
media-video/obs-studio: use || ( ... ) dep for dev-libs/atk
Forcing migration to at-spi2-atk right now leads to nasty conflicts for stable users. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/obs-studio/obs-studio-27.2.3-r2.ebuild (renamed from media-video/obs-studio/obs-studio-27.2.3-r1.ebuild)7
-rw-r--r--media-video/obs-studio/obs-studio-27.2.4-r1.ebuild (renamed from media-video/obs-studio/obs-studio-27.2.4.ebuild)7
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild7
3 files changed, 12 insertions, 9 deletions
diff --git a/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild b/media-video/obs-studio/obs-studio-27.2.3-r2.ebuild
index b9550e6de3df..cb4455e6dcd5 100644
--- a/media-video/obs-studio/obs-studio-27.2.3-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-27.2.3-r2.ebuild
@@ -72,9 +72,10 @@ DEPEND="
x11-libs/libxcb:=
alsa? ( media-libs/alsa-lib )
browser? (
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib
dev-libs/nspr
diff --git a/media-video/obs-studio/obs-studio-27.2.4.ebuild b/media-video/obs-studio/obs-studio-27.2.4-r1.ebuild
index b9550e6de3df..cb4455e6dcd5 100644
--- a/media-video/obs-studio/obs-studio-27.2.4.ebuild
+++ b/media-video/obs-studio/obs-studio-27.2.4-r1.ebuild
@@ -72,9 +72,10 @@ DEPEND="
x11-libs/libxcb:=
alsa? ( media-libs/alsa-lib )
browser? (
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib
dev-libs/nspr
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index f42ddb8941af..ce91ef9b0728 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -65,9 +65,10 @@ DEPEND="
x11-libs/libxcb:=
alsa? ( media-libs/alsa-lib )
browser? (
- app-accessibility/at-spi2-atk
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib
dev-libs/nspr