gentoo resync : 14.05.2020

6 files changed, 136 insertions, 162 deletions

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 8550ce9ffe4e..ca04ef01fcae 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,8 +1,10 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
-AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
+AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
 DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
-EBUILD gerbera-1.4.0.ebuild 2347 BLAKE2B a04cbd102d80127f538ee7701de893860c432a2be5e0ff2d4f3aced9aea3dffae4d10db1f4cebf03ff9901db70260ec0c1755d8214286d66d7d0cadc2c19397f SHA512 cc8b3b0d2fdeed63773847ed1a6a030d55f5f5351086e020dd6f86e6984fac5334e0ff70dd80b4b993aef7f26b806e2420b352485680a2c3741680f9f56f0e1c
-EBUILD gerbera-9999.ebuild 2347 BLAKE2B a04cbd102d80127f538ee7701de893860c432a2be5e0ff2d4f3aced9aea3dffae4d10db1f4cebf03ff9901db70260ec0c1755d8214286d66d7d0cadc2c19397f SHA512 cc8b3b0d2fdeed63773847ed1a6a030d55f5f5351086e020dd6f86e6984fac5334e0ff70dd80b4b993aef7f26b806e2420b352485680a2c3741680f9f56f0e1c
+DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
+EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
+EBUILD gerbera-1.5.0.ebuild 2374 BLAKE2B 0fc28c9d35b1c615a5880b9ecb19cd5d62a7024f2c07069bf1cca20cb79313b1ad0b03e12184f6310ed51cf03cbdddf41e877c263888b15960cf74727fbd4473 SHA512 d0ef6b689356d05365ce0e9e5046f1bc10173b8c8a56d6edee1bd84e6596fb063cf1bfeed2c07060de867efc7f24ce665e5ef61620f21da0b34b3d4e1dfa5ce7
+EBUILD gerbera-9999.ebuild 2309 BLAKE2B af7060d2acf0d50fb86c0a292e578a58be1971b189010b338047bf80b31e3cba3cf5fbe1ea69a6feb063bb1a00c9f5415e0096e44b83ba4cd32b08896f180a9f SHA512 236756bf69dc2f82b99d0297e142f99304e0798bb4f961caea1e2bd35317319ee4c20e43b6075ff0842b01d54d57f6c587c9a43277cc78d3053761b507a45b48
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.config b/net-misc/gerbera/files/gerbera-1.0.0.config
deleted file mode 100644
index 94bdb936e145..000000000000
--- a/net-misc/gerbera/files/gerbera-1.0.0.config
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
-  <server>
-    <ui enabled="yes" show-tooltips="yes">
-      <accounts enabled="no" session-timeout="30">
-        <account user="gerbera" password="mediatomb"/>
-      </accounts>
-    </ui>
-    <name>Gerbera</name>
-    <udn></udn>
-    <home>/var/lib/gerbera</home>
-    <webroot>/usr/share/gerbera/web</webroot>
-    <storage>
-      <sqlite3 enabled="yes">
-        <database-file>gerbera.db</database-file>
-      </sqlite3>
-      <mysql enabled="no">
-        <host>host</host>
-        <database>database</database>
-        <username>username</username>
-        <password>password</password>
-      </mysql>
-    </storage>
-    <protocolInfo extend="yes"/>
-    <pc-directory upnp-hide="no"/>
-    <extended-runtime-options>
-      <ffmpegthumbnailer enabled="no">
-        <thumbnail-size>160</thumbnail-size>
-        <seek-percentage>10</seek-percentage>
-        <filmstrip-overlay>no</filmstrip-overlay>
-        <workaround-bugs>no</workaround-bugs>
-        <image-quality>8</image-quality>
-      </ffmpegthumbnailer>
-      <mark-played-items enabled="no" suppress-cds-updates="yes">
-        <string mode="prepend">*</string>
-        <mark>
-          <content>video</content>
-        </mark>
-      </mark-played-items>
-      <lastfm enabled="no">
-        <username>username</username>
-        <password>password</password>
-      </lastfm>
-    </extended-runtime-options>
-  </server>
-  <import hidden-files="no">
-    <scripting script-charset="UTF-8">
-      <common-script>/usr/share/gerbera/js/common.js</common-script>
-      <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
-      <virtual-layout type="builtin">
-        <import-script>/usr/share/gerbera/js/import.js</import-script>
-      </virtual-layout>
-    </scripting>
-    <mappings>
-      <extension-mimetype ignore-unknown="no">
-        <map from="mp3" to="audio/mpeg"/>
-        <map from="ogx" to="application/ogg"/>
-        <map from="ogv" to="video/ogg"/>
-        <map from="oga" to="audio/ogg"/>
-        <map from="ogg" to="audio/ogg"/>
-        <map from="ogm" to="video/ogg"/>
-        <map from="asf" to="video/x-ms-asf"/>
-        <map from="asx" to="video/x-ms-asf"/>
-        <map from="wma" to="audio/x-ms-wma"/>
-        <map from="wax" to="audio/x-ms-wax"/>
-        <map from="wmv" to="video/x-ms-wmv"/>
-        <map from="wvx" to="video/x-ms-wvx"/>
-        <map from="wm" to="video/x-ms-wm"/>
-        <map from="wmx" to="video/x-ms-wmx"/>
-        <map from="m3u" to="audio/x-mpegurl"/>
-        <map from="pls" to="audio/x-scpls"/>
-        <map from="flv" to="video/x-flv"/>
-        <map from="mkv" to="video/x-matroska"/>
-        <map from="mka" to="audio/x-matroska"/>
-        <map from="avi" to="video/divx"/>
-        <map from="m2ts" to="video/avc"/>
-        <map from="cr2" to="image/raw"/>
-        <map from="nef" to="image/raw"/>
-      </extension-mimetype>
-      <mimetype-upnpclass>
-        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
-        <map from="video/*" to="object.item.videoItem"/>
-        <map from="image/*" to="object.item.imageItem"/>
-      </mimetype-upnpclass>
-      <mimetype-contenttype>
-        <treat mimetype="audio/mpeg" as="mp3"/>
-        <treat mimetype="application/ogg" as="ogg"/>
-        <treat mimetype="video/ogg" as="ogg"/>
-        <treat mimetype="audio/ogg" as="ogg"/>
-        <treat mimetype="audio/x-flac" as="flac"/>
-        <treat mimetype="image/jpeg" as="jpg"/>
-        <treat mimetype="audio/x-mpegurl" as="playlist"/>
-        <treat mimetype="audio/x-scpls" as="playlist"/>
-        <treat mimetype="audio/x-wav" as="pcm"/>
-        <treat mimetype="audio/L16" as="pcm"/>
-        <treat mimetype="video/x-msvideo" as="avi"/>
-        <treat mimetype="video/mp4" as="mp4"/>
-        <treat mimetype="audio/mp4" as="mp4"/>
-        <treat mimetype="video/divx" as="avi"/>
-      </mimetype-contenttype>
-    </mappings>
-    <online-content>
-      <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
-        <favorites user="NationalGeographic"/>
-        <playlists user="PlayStation"/>
-        <uploads user="Google"/>
-        <standardfeed feed="most_viewed" time-range="today"/>
-        <standardfeed feed="recently_featured" time-range="today"/>
-      </YouTube>
-    </online-content>
-  </import>
-  <transcoding enabled="no">
-    <mimetype-profile-mappings>
-      <transcode mimetype="audio/ogg" using="audio2pcm"/>
-      <transcode mimetype="audio/x-flac" using="audio2pcm"/>
-      <transcode mimetype="video/ogg" using="video2mpeg"/>
-      <transcode mimetype="video/x-flv" using="video2mpeg"/>
-    </mimetype-profile-mappings>
-    <profiles>
-      <profile name="audio2pcm" enabled="yes" type="external">
-        <mimetype>audio/L16</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>no</accept-ogg-theora>
-        <sample-frequency>44100</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
-        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
-      </profile>
-      <profile name="video2mpeg" enabled="yes" type="external">
-        <mimetype>video/mpeg</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>yes</accept-ogg-theora>
-        <sample-frequency>48000</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
-        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
-      </profile>
-    </profiles>
-  </transcoding>
-</config>
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
index 000000000000..93fd9e198dfb
--- /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.4.0.ebuild b/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
index 122b20de3f69..f639025a6dc0 100644
--- a/net-misc/gerbera/gerbera-1.4.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
@@ -21,11 +21,11 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 DEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+	=net-libs/libupnp-1.8*:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
 	mysql? ( dev-db/mysql-connector-c )
@@ -34,10 +34,7 @@ DEPEND="
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	curl? ( net-misc/curl net-misc/youtube-dl )
 	magic? ( sys-apps/file )
diff --git a/net-misc/gerbera/gerbera-1.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0.ebuild
new file mode 100644
index 000000000000..3e0553c702d6
--- /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 122b20de3f69..adb30342a7ad 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -21,27 +21,26 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 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 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
+	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