diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-10 09:01:36 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-10 09:40:19 +0100 |
| commit | e6c0d19b5ed4e6619bd2a4354ae6897390976117 (patch) | |
| tree | 2948c3d7dbab83f20f5f3ee51b2845d799fe334c /media-sound/mixxx | |
| parent | media-sound/asunder: EAPI 8 (diff) | |
| download | gentoo-e6c0d19b5ed4e6619bd2a4354ae6897390976117.tar.gz gentoo-e6c0d19b5ed4e6619bd2a4354ae6897390976117.tar.bz2 gentoo-e6c0d19b5ed4e6619bd2a4354ae6897390976117.zip | |
media-sound/mixxx: fix syntax, add media-libs/flac subslot dep
media-libs/flac-1.4.0 breaks ABI.
Closes: https://bugs.gentoo.org/839225
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-sound/mixxx')
| -rw-r--r-- | media-sound/mixxx/mixxx-2.3.3-r1.ebuild (renamed from media-sound/mixxx/mixxx-2.3.3.ebuild) | 8 | ||||
| -rw-r--r-- | media-sound/mixxx/mixxx-2.3.9999.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/mixxx/mixxx-9999.ebuild | 17 |
3 files changed, 15 insertions, 16 deletions
diff --git a/media-sound/mixxx/mixxx-2.3.3.ebuild b/media-sound/mixxx/mixxx-2.3.3-r1.ebuild index ee90b8144308..dd7a1e9e57b2 100644 --- a/media-sound/mixxx/mixxx-2.3.3.ebuild +++ b/media-sound/mixxx/mixxx-2.3.3-r1.ebuild @@ -25,7 +25,7 @@ IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack RDEPEND=" dev-db/sqlite dev-libs/glib:2 - dev-libs/protobuf:0= + dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 @@ -38,7 +38,7 @@ RDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint - media-libs/flac + media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg @@ -60,9 +60,9 @@ RDEPEND=" x11-libs/libX11 aac? ( media-libs/faad2 - media-libs/libmp4v2:0 + media-libs/libmp4v2 ) - ffmpeg? ( media-video/ffmpeg:0= ) + ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild index ef33c268c4fe..eed827c69005 100644 --- a/media-sound/mixxx/mixxx-2.3.9999.ebuild +++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild @@ -38,7 +38,7 @@ RDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint - media-libs/flac + media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg @@ -60,9 +60,9 @@ RDEPEND=" x11-libs/libX11 aac? ( media-libs/faad2 - media-libs/libmp4v2:0 + media-libs/libmp4v2 ) - ffmpeg? ( media-video/ffmpeg:0= ) + ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index 3b37660dc9e1..5348bd3d18a5 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -7,8 +7,11 @@ inherit cmake xdg udev DESCRIPTION="Advanced Digital DJ tool based on Qt" HOMEPAGE="https://www.mixxx.org/" -if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then +if [[ "${PV}" == *9999 ]] ; then inherit git-r3 + if [[ "${PV}" == ?.?.9999 ]] ; then + EGIT_BRANCH=${PV%.9999} + fi EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git" else SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz" @@ -16,10 +19,6 @@ else KEYWORDS="~amd64 ~x86" fi -if [[ "${PV}" == ?.?.9999 ]] ; then - EGIT_BRANCH=${PV%.9999} -fi - LICENSE="GPL-2" SLOT="0" IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack" @@ -27,7 +26,7 @@ IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack" RDEPEND=" dev-db/sqlite dev-libs/glib:2 - dev-libs/protobuf:0= + dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -41,7 +40,7 @@ RDEPEND=" dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint - media-libs/flac + media-libs/flac:= media-libs/libebur128 media-libs/libid3tag:= media-libs/libogg @@ -62,9 +61,9 @@ RDEPEND=" x11-libs/libX11 aac? ( media-libs/faad2 - media-libs/libmp4v2:0 + media-libs/libmp4v2 ) - ffmpeg? ( media-video/ffmpeg:0= ) + ffmpeg? ( media-video/ffmpeg:= ) hid? ( dev-libs/hidapi ) keyfinder? ( media-libs/libkeyfinder ) lv2? ( media-libs/lilv ) |