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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4877E15808F for ; Wed, 16 Mar 2022 22:58:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DD93E08EF; Wed, 16 Mar 2022 22:58:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB195E08EF for ; Wed, 16 Mar 2022 22:58:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4A71343526 for ; Wed, 16 Mar 2022 22:58:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D466320 for ; Wed, 16 Mar 2022 22:58:43 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647471279.acb3ab40f45e7b6021682e289c901204263e1bbd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/gerbera/gerbera-9999.ebuild X-VCS-Directories: net-misc/gerbera/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: acb3ab40f45e7b6021682e289c901204263e1bbd X-VCS-Branch: master Date: Wed, 16 Mar 2022 22:58:43 +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: 093f78b3-6ab5-403f-b135-4fad4dc7c84f X-Archives-Hash: 3ad5b1f21906c7335f982de6acf9b3c4 commit: acb3ab40f45e7b6021682e289c901204263e1bbd Author: Christian Tietz mailbox org> AuthorDate: Wed Mar 16 22:47:35 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 16 22:54:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb3ab40 net-misc/gerbera: Sync live ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christian Tietz mailbox.org> Closes: https://github.com/gentoo/gentoo/pull/24576 Signed-off-by: Sam James gentoo.org> net-misc/gerbera/gerbera-9999.ebuild | 74 ++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index d68414c66ed6..6d93837953a1 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -21,48 +21,50 @@ LICENSE="GPL-2" SLOT="0" IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" -DEPEND=" +RDEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= dev-libs/pugixml - dev-libs/libfmt:0= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) + javascript? ( dev-lang/duktape:= ) + lastfm? ( media-libs/lastfmlib ) magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) " -RDEPEND="${DEPEND}" + +DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" src_configure() { local mycmakeargs=( - -DWITH_CURL="$(usex curl)" \ - -DWITH_DEBUG="$(usex debug)" \ - -DWITH_EXIF="$(usex exif)" \ - -DWITH_EXIV2="$(usex exiv2)" \ - -DWITH_AVCODEC="$(usex ffmpeg)" \ - -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ - -DWITH_JS="$(usex javascript)" \ - -DWITH_LASTFM="$(usex lastfm)" \ - -DWITH_MAGIC="$(usex magic)" \ - -DWITH_MATROSKA="$(usex matroska)" \ - -DWITH_MYSQL="$(usex mysql)" - -DWITH_SYSTEMD="$(usex systemd)" \ - -DWITH_TAGLIB="$(usex taglib)" \ + -DWITH_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) -DWITH_INOTIFY=1 + -DWITH_JS=$(usex javascript) + -DWITH_LASTFM=$(usex lastfm) + -DWITH_MAGIC=$(usex magic) + -DWITH_MATROSKA=$(usex matroska) + -DWITH_MYSQL=$(usex mysql) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TAGLIB=$(usex taglib) ) cmake_src_configure @@ -71,17 +73,17 @@ src_configure() { src_install() { cmake_src_install - newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" + newinitd "${FILESDIR}"/${PN}-1.0.0.initd ${PN} + newconfd "${FILESDIR}"/${PN}-1.0.0.confd ${PN} insinto /etc/${PN} - newins "${FILESDIR}/${PN}-1.3.0.config" config.xml + newins "${FILESDIR}"/${PN}-1.3.0.config config.xml fperms 0640 /etc/${PN}/config.xml fowners root:gerbera /etc/${PN}/config.xml } pkg_postinst() { - if use mysql ; then + if use mysql; then elog "Gerbera has been built with MySQL support and needs" elog "to be configured before being started. By default" elog "SQLite will be used."