commit: a33dfbbf7cab05c898224dc9d15abe547d44ef65 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Sun Apr 26 08:58:27 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Sun Apr 26 08:59:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33dfbbf
net-misc/gerbera: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> net-misc/gerbera/gerbera-1.4.0.ebuild | 7 ++----- net-misc/gerbera/gerbera-9999.ebuild | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/net-misc/gerbera/gerbera-1.4.0.ebuild b/net-misc/gerbera/gerbera-1.4.0.ebuild index 122b20de3f6..4e1290f8ff8 100644 --- a/net-misc/gerbera/gerbera-1.4.0.ebuild +++ b/net-misc/gerbera/gerbera-1.4.0.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"; LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" DEPEND=" acct-user/gerbera @@ -34,10 +34,7 @@ DEPEND=" lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( - libav? ( >=media-video/libav-10:0= ) - !libav? ( >=media-video/ffmpeg-2.2:0= ) - ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 122b20de3f6..11919c4298c 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"; LICENSE="GPL-2" SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" DEPEND=" acct-user/gerbera @@ -34,10 +34,7 @@ DEPEND=" lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( - libav? ( >=media-video/libav-10:0= ) - !libav? ( >=media-video/ffmpeg-2.2:0= ) - ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file )
