gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

media-libs/sdl*-mixer: Fix conflict by blocking playtools on other vers

Browse Source 
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@gentoo.org>
This commit is contained in:
James Le Cuirot 2025-08-22 22:07:03 +01:00
parent 1e6f574c2b
commit d83bb935c5
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20221010.ebuild
View File

@ -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 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -47,6 +47,10 @@ RDEPEND="
mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
) )
playtools? (
!media-libs/sdl2-mixer[playtools]
!media-libs/sdl3-mixer[playtools]
)
vorbis? ( vorbis? (
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

4
media-libs/sdl-mixer/sdl-mixer-1.2.12_p20240525.ebuild
View File

@ -47,6 +47,10 @@ RDEPEND="
mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] ) mad? ( >=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}] )
smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] ) smpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
) )
playtools? (
!media-libs/sdl2-mixer[playtools]
!media-libs/sdl3-mixer[playtools]
)
vorbis? ( vorbis? (
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]

6
media-libs/sdl2-mixer/sdl2-mixer-2.6.3-r1.ebuild
View File

@ -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 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -32,6 +32,10 @@ RDEPEND="
mod? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) mod? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] ) mp3? ( media-sound/mpg123[${MULTILIB_USEDEP}] )
opus? ( >=media-libs/opusfile-0.2 ) opus? ( >=media-libs/opusfile-0.2 )
playtools? (
!media-libs/sdl-mixer[playtools]
!media-libs/sdl3-mixer[playtools]
)
vorbis? ( vorbis? (
tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
!tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) !tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )

4
media-libs/sdl2-mixer/sdl2-mixer-2.8.1-r3.ebuild
View File

@ -42,6 +42,10 @@ RDEPEND="
) )
mp3? ( media-sound/mpg123-base[${MULTILIB_USEDEP}] ) mp3? ( media-sound/mpg123-base[${MULTILIB_USEDEP}] )
opus? ( media-libs/opusfile[${MULTILIB_USEDEP}] ) opus? ( media-libs/opusfile[${MULTILIB_USEDEP}] )
playtools? (
!media-libs/sdl-mixer[playtools]
!media-libs/sdl3-mixer[playtools]
)
vorbis? ( vorbis? (
stb? ( dev-libs/stb ) stb? ( dev-libs/stb )
tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] ) tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )

4
media-libs/sdl3-mixer/sdl3-mixer-3.0.0_pre20250404-r1.ebuild
View File

@ -42,6 +42,10 @@ RDEPEND="
mod? ( media-libs/libxmp[${MULTILIB_USEDEP}] ) mod? ( media-libs/libxmp[${MULTILIB_USEDEP}] )
opus? ( media-libs/opusfile[${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}] ) sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
vorbis? ( vorbis? (
tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] ) tremor? ( media-libs/tremor[${MULTILIB_USEDEP}] )