commit: d83bb935c5c5f2b14bcec49a07379c49062386aa Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Fri Aug 22 21:07:03 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Fri Aug 22 21:11:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83bb935
media-libs/sdl*-mixer: Fix conflict by blocking playtools on other vers sdl-mixer 1, 2, and 3 all install playmus and playwave with the playtools USE flag. It doesn't make sense to have multiple copies of these tools, especially when sdl-mixer uses SDL2 anyway. Closes: https://bugs.gentoo.org/621772 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild | 6 +++++- media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild | 4 ++++ media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild | 6 +++++- media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild | 4 ++++ media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild index 39392f11f6ea..adebabd2bffd 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,6 +47,10 @@ RDEPEND=" mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) ) + playtools? ( + !media-libs/sdl2-mixer[playtools] + !media-libs/sdl3-mixer[playtools] + ) vorbis? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild index 3ff9094a7e3e..986b2be18b3d 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild @@ -47,6 +47,10 @@ RDEPEND=" mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) ) + playtools? ( + !media-libs/sdl2-mixer[playtools] + !media-libs/sdl3-mixer[playtools] + ) vorbis? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild index 5c4b5784bf99..f61262cf9b87 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,6 +32,10 @@ RDEPEND=" mod? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] ) opus? ( >=media-libs/opusfile-0.2 ) + playtools? ( + !media-libs/sdl-mixer[playtools] + !media-libs/sdl3-mixer[playtools] + ) vorbis? ( tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild index 007990fc93d6..c24fbb6b3dc8 100644 --- a/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild +++ b/media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild @@ -42,6 +42,10 @@ RDEPEND=" ) mp3? ( media-sound/mpg123-base[${MULTILIB_USEDEP}] ) opus? ( media-libs/opusfile[${MULTILIB_USEDEP}] ) + playtools? ( + !media-libs/sdl-mixer[playtools] + !media-libs/sdl3-mixer[playtools] + ) vorbis? ( stb? ( dev-libs/stb ) tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] ) diff --git a/media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild b/media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild index 07dab3efc25f..6de9e7040b6e 100644 --- a/media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild +++ b/media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild @@ -42,6 +42,10 @@ RDEPEND=" mod? ( media-libs/libxmp[${MULTILIB_USEDEP}] ) opus? ( media-libs/opusfile[${MULTILIB_USEDEP}] ) + playtools? ( + !media-libs/sdl-mixer[playtools] + !media-libs/sdl2-mixer[playtools] + ) sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] ) vorbis? ( tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )
