[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/

[Matt Turner]

commit:     c389daf23b6e47ef4b9b7f0037c68ea2bd847895
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 01:08:25 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 01:11:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c389daf2

net-misc/gerbera: Don't require specific subslot of libfmt

In upstream commit b11b0017e436 (Bumping fmt and spdlog versions.) the
allowed versions of spdlog and libfmt were raised without any
corresponding code changes. The spdlog dependency already doesn't
require a specific subslot.

Now that a newer subslot of libfmt is stable, this commit will allow
gerbera to build against it.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-misc/gerbera/{gerbera-9999.ebuild => gerbera-1.5.0-r2.ebuild} | 6 +++++-
 net-misc/gerbera/gerbera-9999.ebuild                              | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-misc/gerbera/gerbera-9999.ebuild 
b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild
similarity index 96%
copy from net-misc/gerbera/gerbera-9999.ebuild
copy to net-misc/gerbera/gerbera-1.5.0-r2.ebuild
index 7a452ed244c..5357c3346ff 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild
@@ -29,7 +29,7 @@ DEPEND="
        >=dev-db/sqlite-3
        dev-libs/spdlog:=
        dev-libs/pugixml
-       dev-libs/libfmt:0/6
+       dev-libs/libfmt:0=
        mysql? ( dev-db/mysql-connector-c )
        javascript? ( dev-lang/duktape )
        taglib? ( >=media-libs/taglib-1.11 )
@@ -49,6 +49,10 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
+PATCHES=(
+       "${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
 src_configure() {
        local mycmakeargs=(
                -DWITH_CURL="$(usex curl)" \

diff --git a/net-misc/gerbera/gerbera-9999.ebuild 
b/net-misc/gerbera/gerbera-9999.ebuild
index 7a452ed244c..21938672008 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
        >=dev-db/sqlite-3
        dev-libs/spdlog:=
        dev-libs/pugixml
-       dev-libs/libfmt:0/6
+       dev-libs/libfmt:0=
        mysql? ( dev-db/mysql-connector-c )
        javascript? ( dev-lang/duktape )
        taglib? ( >=media-libs/taglib-1.11 )