From 853de313ca9cc3487c1899c25f6808f48d9e52db Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 3 Jan 2024 00:03:32 +0300 Subject: [PATCH] media-libs/akode: several improvments - fix incorrect dependencies - fix incorrect use flag - add configuration sanity check Signed-off-by: Alexander Golubev (cherry picked from commit 2301a6d551cf527c54b792d75b171bc281d14618) --- media-libs/akode/akode-14.1.0-r1.ebuild | 52 ------------------ media-libs/akode/akode-14.1.0-r2.ebuild | 70 +++++++++++++++++++++++++ media-libs/akode/akode-14.1.1-r1.ebuild | 52 ------------------ media-libs/akode/akode-14.1.1-r2.ebuild | 70 +++++++++++++++++++++++++ media-libs/akode/akode-9999.ebuild | 55 ++++++++++++++----- media-libs/akode/metadata.xml | 2 +- 6 files changed, 182 insertions(+), 119 deletions(-) delete mode 100644 media-libs/akode/akode-14.1.0-r1.ebuild create mode 100644 media-libs/akode/akode-14.1.0-r2.ebuild delete mode 100644 media-libs/akode/akode-14.1.1-r1.ebuild create mode 100644 media-libs/akode/akode-14.1.1-r2.ebuild diff --git a/media-libs/akode/akode-14.1.0-r1.ebuild b/media-libs/akode/akode-14.1.0-r1.ebuild deleted file mode 100644 index 6442e246..00000000 --- a/media-libs/akode/akode-14.1.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Copyright 2020-2023 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -TRINITY_MODULE_TYPE="dependencies" -TRINITY_MODULE_NAME="akode" -inherit trinity-base-2 cmake - -DESCRIPTION="Simple framework to decode the most common audio formats" -HOMEPAGE="https://trinitydesktop.org/" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi -IUSE="alsa flac ffmpeg jack +libsamplerate mp3 mpc oss pulseaudio sndfile vorbis" - -DEPEND=" - alsa? ( media-libs/alsa-lib ) - flac? ( media-libs/flac ) - ffmpeg? ( media-video/ffmpeg ) - jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate ) - mp3? ( media-libs/libmad ) - mpc? ( dev-libs/mpc ) - pulseaudio? ( media-libs/libpulse ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis - media-libs/speex ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DWITH_FFMPEG_DECODER=$(usex ffmpeg) - -DWITH_SUN_SINK=OFF - -DWITH_LIBLTDL=OFF - -DWITH_ALSA_SINK=$(usex alsa) - -DWITH_OSS_SINK=$(usex oss) - -DWITH_PULSE_SINK=$(usex pulseaudio) - -DWITH_JACK_SINK=$(usex jack) - -DWITH_MPEG_DECODER=$(usex mp3) - -DWITH_XIPH_DECODER=$(usex vorbis) - -DWITH_MPC_DECODER=$(usex mpc) - -DWITH_SRC_RESAMPLER=$(usex libsamplerate) - ) - - cmake_src_configure -} diff --git a/media-libs/akode/akode-14.1.0-r2.ebuild b/media-libs/akode/akode-14.1.0-r2.ebuild new file mode 100644 index 00000000..ae64771d --- /dev/null +++ b/media-libs/akode/akode-14.1.0-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2024 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +TRINITY_MODULE_TYPE="dependencies" +TRINITY_MODULE_NAME="akode" +inherit trinity-base-2 cmake + +DESCRIPTION="Simple framework to decode the most common audio formats" +HOMEPAGE="https://trinitydesktop.org/" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi +IUSE="alsa ffmpeg jack +libsamplerate mp3 musepack oss pulseaudio xiph" + +DEPEND=" + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( >=media-video/ffmpeg-5.0 ) + jack? ( virtual/jack ) + libsamplerate? ( media-libs/libsamplerate ) + mp3? ( media-libs/libmad ) + pulseaudio? ( media-libs/libpulse ) + xiph? ( + media-libs/flac + media-libs/libvorbis + media-libs/speex + ) +" +RDEPEND="${DEPEND}" + +pkg_pretend() { + if ! use alsa || use jack || use oss || use pulseaudio + then + ewarn "You haven't selected any audio sinc plugins to build." + ewarn "Avaliable are: alsa, jack, oss, pulseaudio." + ewarn "akode won't be able to playback any sound" + ewarn + fi + + if ! use ffmpeg || use musepack || use mp3 || use xiph + then + ewarn "You haven't selected any decoder plugins to build." + ewarn "Avaliable are: ffmpeg, mp3, musepack, xiph (flac speex vorbis)" + ewarn "akode will support only raw wav files" + ewarn + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_SUN_SINK=OFF # solaris stuff + -DWITH_LIBLTDL=OFF # doesn't provide any additional functinality + -DWITH_ALSA_SINK=$(usex alsa) + -DWITH_OSS_SINK=$(usex oss) + -DWITH_PULSE_SINK=$(usex pulseaudio) + -DWITH_JACK_SINK=$(usex jack) + -DWITH_FFMPEG_DECODER=$(usex ffmpeg) + -DWITH_MPC_DECODER=$(usex musepack) + -DWITH_MPEG_DECODER=$(usex mp3) + -DWITH_XIPH_DECODER=$(usex xiph) + -DWITH_SRC_RESAMPLER=$(usex libsamplerate) + ) + + cmake_src_configure +} diff --git a/media-libs/akode/akode-14.1.1-r1.ebuild b/media-libs/akode/akode-14.1.1-r1.ebuild deleted file mode 100644 index 6442e246..00000000 --- a/media-libs/akode/akode-14.1.1-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Copyright 2020-2023 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -TRINITY_MODULE_TYPE="dependencies" -TRINITY_MODULE_NAME="akode" -inherit trinity-base-2 cmake - -DESCRIPTION="Simple framework to decode the most common audio formats" -HOMEPAGE="https://trinitydesktop.org/" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi -IUSE="alsa flac ffmpeg jack +libsamplerate mp3 mpc oss pulseaudio sndfile vorbis" - -DEPEND=" - alsa? ( media-libs/alsa-lib ) - flac? ( media-libs/flac ) - ffmpeg? ( media-video/ffmpeg ) - jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate ) - mp3? ( media-libs/libmad ) - mpc? ( dev-libs/mpc ) - pulseaudio? ( media-libs/libpulse ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis - media-libs/speex ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DWITH_FFMPEG_DECODER=$(usex ffmpeg) - -DWITH_SUN_SINK=OFF - -DWITH_LIBLTDL=OFF - -DWITH_ALSA_SINK=$(usex alsa) - -DWITH_OSS_SINK=$(usex oss) - -DWITH_PULSE_SINK=$(usex pulseaudio) - -DWITH_JACK_SINK=$(usex jack) - -DWITH_MPEG_DECODER=$(usex mp3) - -DWITH_XIPH_DECODER=$(usex vorbis) - -DWITH_MPC_DECODER=$(usex mpc) - -DWITH_SRC_RESAMPLER=$(usex libsamplerate) - ) - - cmake_src_configure -} diff --git a/media-libs/akode/akode-14.1.1-r2.ebuild b/media-libs/akode/akode-14.1.1-r2.ebuild new file mode 100644 index 00000000..0492ee11 --- /dev/null +++ b/media-libs/akode/akode-14.1.1-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2024 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +TRINITY_MODULE_TYPE="dependencies" +TRINITY_MODULE_NAME="akode" +inherit trinity-base-2 cmake + +DESCRIPTION="Simple framework to decode the most common audio formats" +HOMEPAGE="https://trinitydesktop.org/" + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi +IUSE="+alsa ffmpeg jack +libsamplerate mp3 musepack oss pulseaudio xiph" + +DEPEND=" + alsa? ( media-libs/alsa-lib ) + ffmpeg? ( >=media-video/ffmpeg-5.0 ) + jack? ( virtual/jack ) + libsamplerate? ( media-libs/libsamplerate ) + mp3? ( media-libs/libmad ) + pulseaudio? ( media-libs/libpulse ) + xiph? ( + media-libs/flac + media-libs/libvorbis + media-libs/speex + ) +" +RDEPEND="${DEPEND}" + +pkg_pretend() { + if ! use alsa || use jack || use oss || use pulseaudio + then + ewarn "You haven't selected any audio sinc plugins to build." + ewarn "Avaliable are: alsa, jack, oss, pulseaudio." + ewarn "akode won't be able to playback any sound" + ewarn + fi + + if ! use ffmpeg || use musepack || use mp3 || use xiph + then + ewarn "You haven't selected any decoder plugins to build." + ewarn "Avaliable are: ffmpeg, mp3, musepack, xiph (flac speex vorbis)" + ewarn "akode will support only raw wav files" + ewarn + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_SUN_SINK=OFF # solaris stuff + -DWITH_LIBLTDL=OFF # doesn't provide any additional functinality + -DWITH_ALSA_SINK=$(usex alsa) + -DWITH_OSS_SINK=$(usex oss) + -DWITH_PULSE_SINK=$(usex pulseaudio) + -DWITH_JACK_SINK=$(usex jack) + -DWITH_FFMPEG_DECODER=$(usex ffmpeg) + -DWITH_MPC_DECODER=$(usex musepack) + -DWITH_MPEG_DECODER=$(usex mp3) + -DWITH_XIPH_DECODER=$(usex xiph) + -DWITH_SRC_RESAMPLER=$(usex libsamplerate) + ) + + cmake_src_configure +} diff --git a/media-libs/akode/akode-9999.ebuild b/media-libs/akode/akode-9999.ebuild index 31bfe862..0d437d86 100644 --- a/media-libs/akode/akode-9999.ebuild +++ b/media-libs/akode/akode-9999.ebuild @@ -1,5 +1,5 @@ -# Copyright 1999-2020 Gentoo Authors -# Copyright 2020-2021 The Trinity Desktop Project +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2024 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -14,38 +14,65 @@ HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi -IUSE="alsa flac ffmpeg jack +libsamplerate mp3 mpc oss pulseaudio sndfile vorbis" +IUSE="alsa flac ffmpeg jack +libsamplerate mp3 musepack oss pulseaudio speex vorbis" DEPEND=" alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) - ffmpeg? ( media-video/ffmpeg ) + ffmpeg? ( >=media-video/ffmpeg-5.0 ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-libs/libmad ) - mpc? ( dev-libs/mpc ) pulseaudio? ( media-libs/libpulse ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis - media-libs/speex ) + speex? ( media-libs/speex ) + vorbis? ( media-libs/libvorbis ) " RDEPEND="${DEPEND}" +pkg_pretend() { + if ! use alsa || use jack || use oss || use pulseaudio + then + ewarn "You haven't selected any audio sinc plugins to build." + ewarn "Avaliable are: alsa, jack, oss, pulseaudio." + ewarn "akode won't be able to playback any sound" + ewarn + fi + + if ! use flac || use ffmpeg || use musepack || use mp3 || use speex || use vorbis + then + ewarn "You haven't selected any decoder plugins to build." + ewarn "Avaliable are: ffmpeg, mp3, musepack, xiph (flac speex vorbis)" + ewarn "akode will support only raw wav files" + ewarn + fi +} + src_configure() { + local need_xiph_decoder + + if use flac || use speex || use vorbis; then + need_xiph_decoder = yes + else + need_xiph_decoder = no + fi + local mycmakeargs=( - -DWITH_FFMPEG_DECODER=$(usex ffmpeg) - -DWITH_SUN_SINK=OFF - -DWITH_LIBLTDL=OFF + -DWITH_SUN_SINK=OFF # solaris stuff + -DWITH_LIBLTDL=OFF # doesn't provide any additional functinality -DWITH_ALSA_SINK=$(usex alsa) -DWITH_OSS_SINK=$(usex oss) -DWITH_PULSE_SINK=$(usex pulseaudio) -DWITH_JACK_SINK=$(usex jack) + -DWITH_FFMPEG_DECODER=$(usex ffmpeg) + -DWITH_MPC_DECODER=$(usex musepack) -DWITH_MPEG_DECODER=$(usex mp3) - -DWITH_XIPH_DECODER=$(usex vorbis) - -DWITH_MPC_DECODER=$(usex mpc) -DWITH_SRC_RESAMPLER=$(usex libsamplerate) + -DWITH_XIPH_FLAC=$(usex flac) + -DWITH_XIPH_SPEEX=$(usex speex) + -DWITH_XIPH_VORBIS=$(usex vorbis) + -DWITH_XIPH_DECODER="${need_xiph_decoder}" ) cmake_src_configure diff --git a/media-libs/akode/metadata.xml b/media-libs/akode/metadata.xml index 53375ad3..d941b1a2 100644 --- a/media-libs/akode/metadata.xml +++ b/media-libs/akode/metadata.xml @@ -6,6 +6,6 @@ Trinity Gentoo ebuilds project - Add support for multiprecision complex arithmetic through dev-libs/mpc + Add support for sound codecs provided by xiph.org (flac, speex, vorbis)