| 1 |
commit: c389daf23b6e47ef4b9b7f0037c68ea2bd847895 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 20 01:08:25 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 20 01:11:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c389daf2 |
| 7 |
|
| 8 |
net-misc/gerbera: Don't require specific subslot of libfmt |
| 9 |
|
| 10 |
In upstream commit b11b0017e436 (Bumping fmt and spdlog versions.) the |
| 11 |
allowed versions of spdlog and libfmt were raised without any |
| 12 |
corresponding code changes. The spdlog dependency already doesn't |
| 13 |
require a specific subslot. |
| 14 |
|
| 15 |
Now that a newer subslot of libfmt is stable, this commit will allow |
| 16 |
gerbera to build against it. |
| 17 |
|
| 18 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 19 |
|
| 20 |
net-misc/gerbera/{gerbera-9999.ebuild => gerbera-1.5.0-r2.ebuild} | 6 +++++- |
| 21 |
net-misc/gerbera/gerbera-9999.ebuild | 2 +- |
| 22 |
2 files changed, 6 insertions(+), 2 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild |
| 25 |
similarity index 96% |
| 26 |
copy from net-misc/gerbera/gerbera-9999.ebuild |
| 27 |
copy to net-misc/gerbera/gerbera-1.5.0-r2.ebuild |
| 28 |
index 7a452ed244c..5357c3346ff 100644 |
| 29 |
--- a/net-misc/gerbera/gerbera-9999.ebuild |
| 30 |
+++ b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild |
| 31 |
@@ -29,7 +29,7 @@ DEPEND=" |
| 32 |
>=dev-db/sqlite-3 |
| 33 |
dev-libs/spdlog:= |
| 34 |
dev-libs/pugixml |
| 35 |
- dev-libs/libfmt:0/6 |
| 36 |
+ dev-libs/libfmt:0= |
| 37 |
mysql? ( dev-db/mysql-connector-c ) |
| 38 |
javascript? ( dev-lang/duktape ) |
| 39 |
taglib? ( >=media-libs/taglib-1.11 ) |
| 40 |
@@ -49,6 +49,10 @@ RDEPEND="${DEPEND}" |
| 41 |
|
| 42 |
CONFIG_CHECK="~INOTIFY_USER" |
| 43 |
|
| 44 |
+PATCHES=( |
| 45 |
+ "${FILESDIR}/${P}-incomplete-type-iohandler.patch" |
| 46 |
+) |
| 47 |
+ |
| 48 |
src_configure() { |
| 49 |
local mycmakeargs=( |
| 50 |
-DWITH_CURL="$(usex curl)" \ |
| 51 |
|
| 52 |
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild |
| 53 |
index 7a452ed244c..21938672008 100644 |
| 54 |
--- a/net-misc/gerbera/gerbera-9999.ebuild |
| 55 |
+++ b/net-misc/gerbera/gerbera-9999.ebuild |
| 56 |
@@ -29,7 +29,7 @@ DEPEND=" |
| 57 |
>=dev-db/sqlite-3 |
| 58 |
dev-libs/spdlog:= |
| 59 |
dev-libs/pugixml |
| 60 |
- dev-libs/libfmt:0/6 |
| 61 |
+ dev-libs/libfmt:0= |
| 62 |
mysql? ( dev-db/mysql-connector-c ) |
| 63 |
javascript? ( dev-lang/duktape ) |
| 64 |
taglib? ( >=media-libs/taglib-1.11 ) |
Archives