From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7BFF138359 for ; Thu, 20 Aug 2020 01:11:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF732E083B; Thu, 20 Aug 2020 01:11:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF152E083B for ; Thu, 20 Aug 2020 01:11:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2604534F327 for ; Thu, 20 Aug 2020 01:11:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98CBA315 for ; Thu, 20 Aug 2020 01:11:22 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1597885874.c389daf23b6e47ef4b9b7f0037c68ea2bd847895.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/gerbera/gerbera-1.5.0-r2.ebuild net-misc/gerbera/gerbera-9999.ebuild X-VCS-Directories: net-misc/gerbera/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c389daf23b6e47ef4b9b7f0037c68ea2bd847895 X-VCS-Branch: master Date: Thu, 20 Aug 2020 01:11:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac168486-d73f-413b-bf03-0bfa9613de50 X-Archives-Hash: 16ab8b63b09ef6d514cc95e9d28c6e2e commit: c389daf23b6e47ef4b9b7f0037c68ea2bd847895 Author: Matt Turner gentoo org> AuthorDate: Thu Aug 20 01:08:25 2020 +0000 Commit: Matt Turner gentoo 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 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 )