summaryrefslogtreecommitdiff
path: root/media-sound/potamus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-sound/potamus
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'media-sound/potamus')
-rw-r--r--media-sound/potamus/Manifest5
-rw-r--r--media-sound/potamus/files/ffmpeg29.patch22
-rw-r--r--media-sound/potamus/potamus-17.ebuild (renamed from media-sound/potamus/potamus-16.ebuild)21
3 files changed, 12 insertions, 36 deletions
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index ba7cdebf44b7..3a504c0a37fb 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,4 +1,3 @@
-AUX ffmpeg29.patch 684 BLAKE2B 06808e146419469de9f3d4a98db52e45c284779677b9f7525d108afbf485fb804a8bdf45909fbc53c19546dc6b56ae308348a1616f94af269c9cd1407bb134bd SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475
-DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d
-EBUILD potamus-16.ebuild 1219 BLAKE2B 4b78720ea2840ab4c0fffbb2ccd4c669780c179b606aa3d6accd0ef9904021cae87d69284b8ef83a032facf41fe8d6714ad4ac90f310ad958de50b397fca8d06 SHA512 b3b0ca291ec6b9cdf89038ac779e64f61d714b87f2a84fcbfa06e10f9eebb11d9fc7920af475d9d2147a99c014d6a1865d12680579d0973aff4bf6151010af8c
+DIST potamus-17.tar.gz 146822 BLAKE2B 9fa7beabcd4e0ce8a3a6adda4fa425d0a6789c85cc1852bcf528c709574097f5fc34127cb8404d2d8b01c0f961026439786f58a0afd3bd022ed9efe22790bcf9 SHA512 655ac7c99e252c200bb012b1076850ae8c4307ac57dd8d6cb86fc0da0a0ea3b3193c617a365889485a4cab87cb113e40f1d828585e5bdf20c5f2b1b0a2c51099
+EBUILD potamus-17.ebuild 1135 BLAKE2B b599d5bc1103afa726dcd2d83f4be4beb70d4c5a976f077980e3b51cbf9258b3a2242ed67f87a5f5127f42d9cd0a1b866c10396b1ad81f5d7fd0627021264959 SHA512 9e92cdfce334ea08f77c3216cc2d994358f88371cca90b89d5da82ac2d1fac6d6ccfcf375d6ceba6aed482fdbc5a85c45c30d70aefa6364e2bce611046f6a586
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/potamus/files/ffmpeg29.patch b/media-sound/potamus/files/ffmpeg29.patch
deleted file mode 100644
index 8565d7d3d99f..000000000000
--- a/media-sound/potamus/files/ffmpeg29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: potamus-16/src/input-avcodec.c
-===================================================================
---- potamus-16.orig/src/input-avcodec.c
-+++ potamus-16/src/input-avcodec.c
-@@ -41,7 +41,7 @@ static int input_avcodec_open(input *p,
- g_error("out of memory");
- p->data = a;
-
-- a->frame = avcodec_alloc_frame();
-+ a->frame = av_frame_alloc();
-
- for (int pass = 0; pass < 2; pass++) {
- a->format = NULL;
-@@ -114,7 +114,7 @@ static int input_avcodec_get_audio(input
-
- // Decode the packet.
- while (packet.size > 0) {
-- avcodec_get_frame_defaults(a->frame);
-+ av_frame_unref(a->frame);
-
- int got_frame = 0;
- int in_used = avcodec_decode_audio4(a->codec_ctx,
diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-17.ebuild
index fe984ebe363a..20cdf12c8897 100644
--- a/media-sound/potamus/potamus-16.ebuild
+++ b/media-sound/potamus/potamus-17.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit gnome2
+EAPI=7
+inherit xdg
DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality"
HOMEPAGE="http://offog.org/code/potamus/"
@@ -13,28 +13,27 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="+ao audiofile flac jack mad modplug opus vorbis"
+BDEPEND="
+ virtual/pkgconfig
+"
RDEPEND="
x11-libs/gtk+:2
- >=gnome-base/libglade-2
+ gnome-base/libglade
media-libs/libsamplerate
+ media-video/ffmpeg:0=
ao? ( media-libs/libao )
audiofile? ( media-libs/audiofile )
flac? ( media-libs/flac )
- jack? ( media-sound/jack-audio-connection-kit )
- >=media-video/ffmpeg-2.8:0=
+ jack? ( virtual/jack )
mad? ( media-libs/libmad )
modplug? ( media-libs/libmodplug )
opus? ( media-libs/opusfile )
vorbis? ( media-libs/libvorbis )
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/ffmpeg29.patch" )
+DEPEND="${RDEPEND}"
src_configure() {
- gnome2_src_configure \
+ econf \
$(use_enable audiofile input-audiofile) \
$(use_enable flac input-flac) \
$(use_enable mad input-mad) \