From 0f484e61b4156253876ff3a5d6f6ae5117da6220 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 14 Aug 2017 01:12:09 +0200 Subject: [PATCH] media-video/mplayer: revbump all ebuilds to fix jack dependency * mplayer can use both - media-sound/jack-audio-connection-kit (aka jack1) - media-sound/jack2 (aka jack2) and hence requires a dependency on virtual/jack to be able to use any one of them. Bug: https://bugs.gentoo.org/show_bug.cgi?id=602886 Closes: https://github.com/gentoo/gentoo/pull/5413 --- .../mplayer/{mplayer-1.2.1.ebuild => mplayer-1.2.1-r1.ebuild} | 4 ++-- .../mplayer/{mplayer-1.3.0.ebuild => mplayer-1.3.0-r2.ebuild} | 2 +- .../{mplayer-1.3.0-r1.ebuild => mplayer-1.3.0-r3.ebuild} | 2 +- media-video/mplayer/mplayer-9999.ebuild | 2 +- profiles/arch/arm/package.use.stable.mask | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename media-video/mplayer/{mplayer-1.2.1.ebuild => mplayer-1.2.1-r1.ebuild} (99%) rename media-video/mplayer/{mplayer-1.3.0.ebuild => mplayer-1.3.0-r2.ebuild} (99%) rename media-video/mplayer/{mplayer-1.3.0-r1.ebuild => mplayer-1.3.0-r3.ebuild} (99%) diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild similarity index 99% rename from media-video/mplayer/mplayer-1.2.1.ebuild rename to media-video/mplayer/mplayer-1.2.1-r1.ebuild index 173a22680a3e..da0d2b6068cb 100644 --- a/media-video/mplayer/mplayer-1.2.1.ebuild +++ b/media-video/mplayer/mplayer-1.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -89,7 +89,7 @@ RDEPEND+=" gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild similarity index 99% rename from media-video/mplayer/mplayer-1.3.0.ebuild rename to media-video/mplayer/mplayer-1.3.0-r2.ebuild index 507ad23d136f..d6bfb7e6ba2d 100644 --- a/media-video/mplayer/mplayer-1.3.0.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r2.ebuild @@ -89,7 +89,7 @@ RDEPEND+=" gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) diff --git a/media-video/mplayer/mplayer-1.3.0-r1.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild similarity index 99% rename from media-video/mplayer/mplayer-1.3.0-r1.ebuild rename to media-video/mplayer/mplayer-1.3.0-r3.ebuild index 0b643e2701b7..8cfb4f4b72a2 100644 --- a/media-video/mplayer/mplayer-1.3.0-r1.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild @@ -89,7 +89,7 @@ RDEPEND+=" gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 1306b016c86a..6257dc214add 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -89,7 +89,7 @@ RDEPEND+=" gif? ( media-libs/giflib:0= ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) + jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index 2cf6a2a01610..2fa4bf278a2c 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -22,7 +22,7 @@ media-libs/sdl-mixer fluidsynth # Alexis Ballier (26 May 2017) # toolame not stable yet -=media-video/mplayer-1.2.1 toolame +~media-video/mplayer-1.2.1 toolame # Alexis Ballier (26 May 2017) # No musepack-tools stable yet -- 2.26.2