Gentoo Archives: gentoo-commits

From: Ian Whyman <thev00d00@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
Date: Thu, 31 Jan 2019 20:56:37
Message-Id: 1548968164.f130a7b274ed2fc3e5c880cc42951d9e50ca6cb1.thev00d00@gentoo
commit:     f130a7b274ed2fc3e5c880cc42951d9e50ca6cb1
Author:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 31 20:55:34 2019 +0000
Commit:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Thu Jan 31 20:56:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f130a7b2

net-misc/gerbera: Fix config file, tidy old files

Closes: https://bugs.gentoo.org/676690
Closes: https://bugs.gentoo.org/676686
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org>

 .../files/gerbera-1.1.0-build-failure.patch        |  14 ---
 net-misc/gerbera/files/gerbera-1.3.0.config        |   2 +-
 net-misc/gerbera/gerbera-1.3.0-r1.ebuild           | 101 +++++++++++++++++++++
 3 files changed, 102 insertions(+), 15 deletions(-)

diff --git a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
deleted file mode 100644
index ff5f6075ec1..00000000000
--- a/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc
-index 2fade4a9..de33617b 100644
---- gerbera/src/file_request_handler.cc
-+++ gerbera/src/file_request_handler.cc
-@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf
-                     header = header + "CaptionInfo.sec: " + url;
-                 }
-             }
--#endif
-         }
-+#endif
-     }
- 
-     if (!string_ok(mimeType))

diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config b/net-misc/gerbera/files/gerbera-1.3.0.config
index 4c41a27143c..5659140c6f8 100644
--- a/net-misc/gerbera/files/gerbera-1.3.0.config
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -11,7 +11,7 @@
     </ui>
     <name>Gerbera</name>
     <udn>uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9</udn>
-    <home>/var/lib/gerbera<home>
+    <home>/var/lib/gerbera</home>
     <webroot>/usr/share/gerbera/web</webroot>
     <!--
         How frequently (in seconds) to send ssdp:alive advertisements.

diff --git a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
new file mode 100644
index 00000000000..fcdb0195c5e
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+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 (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	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= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+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_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${P}.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+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
+}