summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2023-01-16 23:01:12 -0500
committerIonen Wolkens <ionen@gentoo.org>2023-01-16 23:30:38 -0500
commitc99836435627140c122b30fc14212c980f5c565c (patch)
tree3084205d516b01c00150aff0fb39a0e3719f050e /media-libs/sdl2-mixer
parentmail-filter/rspamd: Stabilize 3.4-r2 amd64, #891111 (diff)
downloadgentoo-c99836435627140c122b30fc14212c980f5c565c.tar.gz
gentoo-c99836435627140c122b30fc14212c980f5c565c.tar.bz2
gentoo-c99836435627140c122b30fc14212c980f5c565c.zip
media-libs/sdl2-mixer: actually enable ogg/flac in 2.6.2
ebuild does --enable-music-ogg/flac and then disables it: $(use_enable vorbis music-ogg) --disable-music-ogg $(use_enable flac music-flac) --disable-music-flac Formerly these were for ogg-shared (used to link with rather than dlopen) but the options were renamed and mis-adjusted. Haven't looked in-depth at this package but at least try to ensure libvorbis/flac get used. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'media-libs/sdl2-mixer')
-rw-r--r--media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild (renamed from media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild)13
1 files changed, 8 insertions, 5 deletions
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
index ad55760aeb5b..35995b532df6 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.6.2.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.6.2-r1.ebuild
@@ -34,9 +34,7 @@ RDEPEND="
opus? ( >=media-libs/opusfile-0.2 )
vorbis? (
tremor? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
- !tremor? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ !tremor? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
)
"
DEPEND="${RDEPEND}"
@@ -61,10 +59,15 @@ multilib_src_configure() {
$(use_enable fluidsynth music-midi-fluidsynth)
--disable-music-midi-fluidsynth-shared
$(use_enable vorbis music-ogg)
+ $(usex vorbis \
+ $(use_enable !tremor music-ogg-vorbis) \
+ --disable-music-ogg-vorbis)
+ --disable-music-ogg-vorbis-shared
$(use_enable tremor music-ogg-tremor)
- --disable-music-ogg
+ --disable-music-ogg-tremor-shared
$(use_enable flac music-flac)
- --disable-music-flac
+ $(use_enable flac music-flac-libflac)
+ --disable-music-flac-libflac-shared
$(use_enable mp3 music-mp3)
$(use_enable mp3 music-mp3-mpg123)
--disable-music-mp3-mpg123-shared