From 139ad0d53ffb5930964a931b8bd07c4d5f1cabfd Mon Sep 17 00:00:00 2001 From: Ian Whyman Date: Sun, 11 Apr 2021 12:48:14 +0100 Subject: net-misc/gerbera: Bump to 1.8.0, add ~arm64 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ian Whyman --- net-misc/gerbera/Manifest | 2 +- .../gerbera-1.5.0-incomplete-type-iohandler.patch | 25 ------ net-misc/gerbera/gerbera-1.7.0.ebuild | 94 ---------------------- net-misc/gerbera/gerbera-1.8.0.ebuild | 90 +++++++++++++++++++++ net-misc/gerbera/gerbera-9999.ebuild | 4 +- 5 files changed, 93 insertions(+), 122 deletions(-) delete mode 100644 net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch delete mode 100644 net-misc/gerbera/gerbera-1.7.0.ebuild create mode 100644 net-misc/gerbera/gerbera-1.8.0.ebuild (limited to 'net-misc/gerbera') diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 4f8ba596854d..d38d70cae70f 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1 +1 @@ -DIST gerbera-1.7.0.tar.gz 3574471 BLAKE2B 32aca4576236f852f7d0c85b86817e88e8539c074c6a3967266920750f89ef7fede6ccfa4e9534534dcf753fc030910500d5bf3dd3282d96c9f64b6492fe4a15 SHA512 32998ce281bdacfd11a0d4f7cfb1edcbea40cc6c5bb1dba4bbebed667ac47eea5049a49333ea15698e50a9954450873b4739f4ce9fcf4c56e1b548f19dee7533 +DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745 diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch deleted file mode 100644 index 93fd9e198dfb..000000000000 --- a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001 -From: Ian Whyman -Date: Sat, 9 May 2020 11:22:47 +0100 -Subject: [PATCH] Fix incomplete type iohandler with Ninja generator -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’ ---- - src/metadata/ffmpeg_handler.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h -index 7c134430..565ff773 100644 ---- a/src/metadata/ffmpeg_handler.h -+++ b/src/metadata/ffmpeg_handler.h -@@ -42,6 +42,7 @@ - namespace fs = std::filesystem; - - #include "metadata_handler.h" -+#include "iohandler/io_handler.h" - - // forward declaration - class AVFormatContext; diff --git a/net-misc/gerbera/gerbera-1.7.0.ebuild b/net-misc/gerbera/gerbera-1.7.0.ebuild deleted file mode 100644 index 4d3c690cb3c8..000000000000 --- a/net-misc/gerbera/gerbera-1.7.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake eutils linux-info systemd tmpfiles - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - SRC_URI="" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" - S="${WORKDIR}/${P}" -fi - -DESCRIPTION="UPnP Media Server" -HOMEPAGE="https://gerbera.io" - -LICENSE="GPL-2" -SLOT="0" -IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" - -DEPEND=" - acct-user/gerbera - >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] - >=dev-db/sqlite-3 - dev-libs/spdlog:= - 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 ) - exif? ( media-libs/libexif ) - exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) - magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~INOTIFY_USER" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.0-incomplete-type-iohandler.patch" -) - -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_INOTIFY=1 - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - 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 - fperms 0640 /etc/${PN}/config.xml - fowners root:gerbera /etc/${PN}/config.xml -} - -pkg_postinst() { - 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." - fi -} diff --git a/net-misc/gerbera/gerbera-1.8.0.ebuild b/net-misc/gerbera/gerbera-1.8.0.ebuild new file mode 100644 index 000000000000..4539ee1c8f96 --- /dev/null +++ b/net-misc/gerbera/gerbera-1.8.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake eutils linux-info systemd tmpfiles + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + SRC_URI="" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" + +DEPEND=" + acct-user/gerbera + >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] + >=dev-db/sqlite-3 + dev-libs/spdlog:= + 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 ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2 ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + curl? ( net-misc/curl ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska ) + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv +" +RDEPEND="${DEPEND}" + +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_INOTIFY=1 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + 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 + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + 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." + fi +} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 5757a960069a..4539ee1c8f96 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -24,7 +24,7 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic DEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] + >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml -- cgit v1.2.3-65-gdbad