| 1 |
commit: 0f484e61b4156253876ff3a5d6f6ae5117da6220 |
| 2 |
Author: Ingolf Wagner <contact <AT> ingolf-wagner <DOT> de> |
| 3 |
AuthorDate: Sun Aug 13 23:12:09 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 13 23:51:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f484e61 |
| 7 |
|
| 8 |
media-video/mplayer: revbump all ebuilds to fix jack dependency |
| 9 |
|
| 10 |
* mplayer can use both |
| 11 |
- media-sound/jack-audio-connection-kit (aka jack1) |
| 12 |
- media-sound/jack2 (aka jack2) |
| 13 |
and hence requires a dependency on virtual/jack to be |
| 14 |
able to use any one of them. |
| 15 |
|
| 16 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=602886 |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/5413 |
| 18 |
|
| 19 |
media-video/mplayer/{mplayer-1.2.1.ebuild => mplayer-1.2.1-r1.ebuild} | 4 ++-- |
| 20 |
media-video/mplayer/{mplayer-1.3.0.ebuild => mplayer-1.3.0-r2.ebuild} | 2 +- |
| 21 |
.../mplayer/{mplayer-1.3.0-r1.ebuild => mplayer-1.3.0-r3.ebuild} | 2 +- |
| 22 |
media-video/mplayer/mplayer-9999.ebuild | 2 +- |
| 23 |
profiles/arch/arm/package.use.stable.mask | 2 +- |
| 24 |
5 files changed, 6 insertions(+), 6 deletions(-) |
| 25 |
|
| 26 |
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild |
| 27 |
similarity index 99% |
| 28 |
rename from media-video/mplayer/mplayer-1.2.1.ebuild |
| 29 |
rename to media-video/mplayer/mplayer-1.2.1-r1.ebuild |
| 30 |
index 173a22680a3..da0d2b6068c 100644 |
| 31 |
--- a/media-video/mplayer/mplayer-1.2.1.ebuild |
| 32 |
+++ b/media-video/mplayer/mplayer-1.2.1-r1.ebuild |
| 33 |
@@ -1,4 +1,4 @@ |
| 34 |
-# Copyright 1999-2016 Gentoo Foundation |
| 35 |
+# Copyright 1999-2017 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=5 |
| 39 |
@@ -89,7 +89,7 @@ RDEPEND+=" |
| 40 |
gif? ( media-libs/giflib:0= ) |
| 41 |
gsm? ( media-sound/gsm ) |
| 42 |
iconv? ( virtual/libiconv ) |
| 43 |
- jack? ( media-sound/jack-audio-connection-kit ) |
| 44 |
+ jack? ( virtual/jack ) |
| 45 |
jpeg? ( virtual/jpeg:0 ) |
| 46 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 47 |
ladspa? ( media-libs/ladspa-sdk ) |
| 48 |
|
| 49 |
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild |
| 50 |
similarity index 99% |
| 51 |
rename from media-video/mplayer/mplayer-1.3.0.ebuild |
| 52 |
rename to media-video/mplayer/mplayer-1.3.0-r2.ebuild |
| 53 |
index 507ad23d136..d6bfb7e6ba2 100644 |
| 54 |
--- a/media-video/mplayer/mplayer-1.3.0.ebuild |
| 55 |
+++ b/media-video/mplayer/mplayer-1.3.0-r2.ebuild |
| 56 |
@@ -89,7 +89,7 @@ RDEPEND+=" |
| 57 |
gif? ( media-libs/giflib:0= ) |
| 58 |
gsm? ( media-sound/gsm ) |
| 59 |
iconv? ( virtual/libiconv ) |
| 60 |
- jack? ( media-sound/jack-audio-connection-kit ) |
| 61 |
+ jack? ( virtual/jack ) |
| 62 |
jpeg? ( virtual/jpeg:0 ) |
| 63 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 64 |
ladspa? ( media-libs/ladspa-sdk ) |
| 65 |
|
| 66 |
diff --git a/media-video/mplayer/mplayer-1.3.0-r1.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 67 |
similarity index 99% |
| 68 |
rename from media-video/mplayer/mplayer-1.3.0-r1.ebuild |
| 69 |
rename to media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 70 |
index 0b643e2701b..8cfb4f4b72a 100644 |
| 71 |
--- a/media-video/mplayer/mplayer-1.3.0-r1.ebuild |
| 72 |
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 73 |
@@ -89,7 +89,7 @@ RDEPEND+=" |
| 74 |
gif? ( media-libs/giflib:0= ) |
| 75 |
gsm? ( media-sound/gsm ) |
| 76 |
iconv? ( virtual/libiconv ) |
| 77 |
- jack? ( media-sound/jack-audio-connection-kit ) |
| 78 |
+ jack? ( virtual/jack ) |
| 79 |
jpeg? ( virtual/jpeg:0 ) |
| 80 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 81 |
ladspa? ( media-libs/ladspa-sdk ) |
| 82 |
|
| 83 |
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild |
| 84 |
index 1306b016c86..6257dc214ad 100644 |
| 85 |
--- a/media-video/mplayer/mplayer-9999.ebuild |
| 86 |
+++ b/media-video/mplayer/mplayer-9999.ebuild |
| 87 |
@@ -89,7 +89,7 @@ RDEPEND+=" |
| 88 |
gif? ( media-libs/giflib:0= ) |
| 89 |
gsm? ( media-sound/gsm ) |
| 90 |
iconv? ( virtual/libiconv ) |
| 91 |
- jack? ( media-sound/jack-audio-connection-kit ) |
| 92 |
+ jack? ( virtual/jack ) |
| 93 |
jpeg? ( virtual/jpeg:0 ) |
| 94 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 95 |
ladspa? ( media-libs/ladspa-sdk ) |
| 96 |
|
| 97 |
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask |
| 98 |
index 2cf6a2a0161..2fa4bf278a2 100644 |
| 99 |
--- a/profiles/arch/arm/package.use.stable.mask |
| 100 |
+++ b/profiles/arch/arm/package.use.stable.mask |
| 101 |
@@ -22,7 +22,7 @@ media-libs/sdl-mixer fluidsynth |
| 102 |
|
| 103 |
# Alexis Ballier <aballier@g.o> (26 May 2017) |
| 104 |
# toolame not stable yet |
| 105 |
-=media-video/mplayer-1.2.1 toolame |
| 106 |
+~media-video/mplayer-1.2.1 toolame |
| 107 |
|
| 108 |
# Alexis Ballier <aballier@g.o> (26 May 2017) |
| 109 |
# No musepack-tools stable yet |
Archives