| 1 |
commit: 350df4f0652cb7fb512ef0ec749d1918566f4a03 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 8 09:38:49 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 8 09:38:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350df4f0 |
| 7 |
|
| 8 |
media-sound/potamus: bump to 17 |
| 9 |
|
| 10 |
1) eapi 7 |
| 11 |
2) dropped gnome2.eclass, added xdg.eclass |
| 12 |
3) switched to virtual/jack |
| 13 |
4) updated deps |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/736312 |
| 16 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 17 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 18 |
|
| 19 |
media-sound/potamus/Manifest | 2 +- |
| 20 |
media-sound/potamus/files/ffmpeg29.patch | 22 ---------------------- |
| 21 |
.../{potamus-16.ebuild => potamus-17.ebuild} | 21 ++++++++++----------- |
| 22 |
3 files changed, 11 insertions(+), 34 deletions(-) |
| 23 |
|
| 24 |
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest |
| 25 |
index 2b6b1613ff5..e1f532da073 100644 |
| 26 |
--- a/media-sound/potamus/Manifest |
| 27 |
+++ b/media-sound/potamus/Manifest |
| 28 |
@@ -1 +1 @@ |
| 29 |
-DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d |
| 30 |
+DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099 |
| 31 |
|
| 32 |
diff --git a/media-sound/potamus/files/ffmpeg29.patch b/media-sound/potamus/files/ffmpeg29.patch |
| 33 |
deleted file mode 100644 |
| 34 |
index 8565d7d3d99..00000000000 |
| 35 |
--- a/media-sound/potamus/files/ffmpeg29.patch |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,22 +0,0 @@ |
| 38 |
-Index: potamus-16/src/input-avcodec.c |
| 39 |
-=================================================================== |
| 40 |
---- potamus-16.orig/src/input-avcodec.c |
| 41 |
-+++ potamus-16/src/input-avcodec.c |
| 42 |
-@@ -41,7 +41,7 @@ static int input_avcodec_open(input *p, |
| 43 |
- g_error("out of memory"); |
| 44 |
- p->data = a; |
| 45 |
- |
| 46 |
-- a->frame = avcodec_alloc_frame(); |
| 47 |
-+ a->frame = av_frame_alloc(); |
| 48 |
- |
| 49 |
- for (int pass = 0; pass < 2; pass++) { |
| 50 |
- a->format = NULL; |
| 51 |
-@@ -114,7 +114,7 @@ static int input_avcodec_get_audio(input |
| 52 |
- |
| 53 |
- // Decode the packet. |
| 54 |
- while (packet.size > 0) { |
| 55 |
-- avcodec_get_frame_defaults(a->frame); |
| 56 |
-+ av_frame_unref(a->frame); |
| 57 |
- |
| 58 |
- int got_frame = 0; |
| 59 |
- int in_used = avcodec_decode_audio4(a->codec_ctx, |
| 60 |
|
| 61 |
diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-17.ebuild |
| 62 |
similarity index 82% |
| 63 |
rename from media-sound/potamus/potamus-16.ebuild |
| 64 |
rename to media-sound/potamus/potamus-17.ebuild |
| 65 |
index fe984ebe363..20cdf12c889 100644 |
| 66 |
--- a/media-sound/potamus/potamus-16.ebuild |
| 67 |
+++ b/media-sound/potamus/potamus-17.ebuild |
| 68 |
@@ -1,8 +1,8 @@ |
| 69 |
# Copyright 1999-2020 Gentoo Authors |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
-EAPI=6 |
| 73 |
-inherit gnome2 |
| 74 |
+EAPI=7 |
| 75 |
+inherit xdg |
| 76 |
|
| 77 |
DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality" |
| 78 |
HOMEPAGE="http://offog.org/code/potamus/" |
| 79 |
@@ -13,28 +13,27 @@ SLOT="0" |
| 80 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 81 |
IUSE="+ao audiofile flac jack mad modplug opus vorbis" |
| 82 |
|
| 83 |
+BDEPEND=" |
| 84 |
+ virtual/pkgconfig |
| 85 |
+" |
| 86 |
RDEPEND=" |
| 87 |
x11-libs/gtk+:2 |
| 88 |
- >=gnome-base/libglade-2 |
| 89 |
+ gnome-base/libglade |
| 90 |
media-libs/libsamplerate |
| 91 |
+ media-video/ffmpeg:0= |
| 92 |
ao? ( media-libs/libao ) |
| 93 |
audiofile? ( media-libs/audiofile ) |
| 94 |
flac? ( media-libs/flac ) |
| 95 |
- jack? ( media-sound/jack-audio-connection-kit ) |
| 96 |
- >=media-video/ffmpeg-2.8:0= |
| 97 |
+ jack? ( virtual/jack ) |
| 98 |
mad? ( media-libs/libmad ) |
| 99 |
modplug? ( media-libs/libmodplug ) |
| 100 |
opus? ( media-libs/opusfile ) |
| 101 |
vorbis? ( media-libs/libvorbis ) |
| 102 |
" |
| 103 |
-DEPEND="${RDEPEND} |
| 104 |
- virtual/pkgconfig |
| 105 |
-" |
| 106 |
- |
| 107 |
-PATCHES=( "${FILESDIR}/ffmpeg29.patch" ) |
| 108 |
+DEPEND="${RDEPEND}" |
| 109 |
|
| 110 |
src_configure() { |
| 111 |
- gnome2_src_configure \ |
| 112 |
+ econf \ |
| 113 |
$(use_enable audiofile input-audiofile) \ |
| 114 |
$(use_enable flac input-flac) \ |
| 115 |
$(use_enable mad input-mad) \ |
Archives