net-misc/gerbera: 1.5.0 version bump

Fix 9999 to match

Closes: https://bugs.gentoo.org/719576
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Ian Whyman <thev00d00@gentoo.org>

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index d49cd27e01d1d8bc2ff8e15ba8575096b9a5fc4a..ed502b3d979068bbc3008c8511dbc5041e17cf2d 100644 (file)
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
 DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
+DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96

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
new file mode 100644 (file)
index 0000000..93fd9e1
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
@@ -0,0 +1,25 @@
+From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <ian@gerbera.io>
+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.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0.ebuild
new file mode 100644 (file)
index 0000000..3e0553c
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.5.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 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"
+       KEYWORDS=""
+       SRC_URI=""
+       inherit git-r3
+else
+       SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~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/6
+       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}/${P}-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-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 11919c4298cf897df64d7ac5429813a773288203..adb30342a7ad1889ac46bead86c9779726ead1ec 100644 (file)
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -25,9 +25,11 @@ IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic
 
 DEPEND="
        acct-user/gerbera
-       >=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+       >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
        >=dev-db/sqlite-3
-       dev-libs/expat
+       dev-libs/spdlog
+       dev-libs/pugixml
+       dev-libs/libfmt:0/6
        mysql? ( dev-db/mysql-connector-c )
        javascript? ( dev-lang/duktape )
        taglib? ( >=media-libs/taglib-1.11 )
@@ -36,9 +38,9 @@ DEPEND="
        exiv2? ( media-gfx/exiv2 )
        ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
        ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-       curl? ( net-misc/curl net-misc/youtube-dl )
+       curl? ( net-misc/curl )
        magic? ( sys-apps/file )
-       matroska? (     media-libs/libmatroska )
+       matroska? ( media-libs/libmatroska )
        sys-apps/util-linux
        sys-libs/zlib
        virtual/libiconv