From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-975907-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 49B141396D0
for <garchives@archives.gentoo.org>; Sat, 30 Sep 2017 16:10:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9A6ACE0BF4;
Sat, 30 Sep 2017 16:10:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 677AAE0BF4
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 16:10:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 26B38341839
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 16:10:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C6CB9083
for <gentoo-commits@lists.gentoo.org>; Sat, 30 Sep 2017 16:10:14 +0000 (UTC)
From: "Ian Whyman" <thev00d00@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ian Whyman" <thev00d00@gentoo.org>
Message-ID: <1506787807.42ea35941d6dfc6851aff8a3e98faea2d2edcd5a.thev00d00@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch net-misc/gerbera/gerbera-1.1.0-r1.ebuild net-misc/gerbera/gerbera-1.1.0.ebuild net-misc/gerbera/gerbera-9999.ebuild net-misc/gerbera/metadata.xml
X-VCS-Directories: net-misc/gerbera/files/ net-misc/gerbera/
X-VCS-Committer: thev00d00
X-VCS-Committer-Name: Ian Whyman
X-VCS-Revision: 42ea35941d6dfc6851aff8a3e98faea2d2edcd5a
X-VCS-Branch: master
Date: Sat, 30 Sep 2017 16:10:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 544b3024-7fa2-4f89-9879-cebdbdfc3476
X-Archives-Hash: 48305222f640f10fb9b33399adc33949
commit: 42ea35941d6dfc6851aff8a3e98faea2d2edcd5a
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 30 16:09:56 2017 +0000
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 16:10:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ea3594
net-misc/gerbera: Expose new v1.1 options as useflags
Package-Manager: Portage-2.3.10, Repoman-2.3.3
net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch | 14 ++++++++++++++
.../{gerbera-1.1.0.ebuild => gerbera-1.1.0-r1.ebuild} | 12 +++++++++---
net-misc/gerbera/gerbera-9999.ebuild | 10 +++++++---
net-misc/gerbera/metadata.xml | 2 ++
4 files changed, 32 insertions(+), 6 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
new file mode 100644
index 00000000000..ff5f6075ec1
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch
@@ -0,0 +1,14 @@
+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/gerbera-1.1.0.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
similarity index 82%
rename from net-misc/gerbera/gerbera-1.1.0.ebuild
rename to net-misc/gerbera/gerbera-1.1.0-r1.ebuild
index 86fe0131d52..f9521cc5691 100644
--- a/net-misc/gerbera/gerbera-1.1.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
@@ -17,11 +17,11 @@ else
fi
DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
LICENSE="GPL-2"
SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
DEPEND="
!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
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
@@ -47,6 +48,8 @@ RDEPEND="${DEPEND}"
CONFIG_CHECK="~INOTIFY_USER"
+PATCHES=( "${FILESDIR}/${P}-build-failure.patch" )
+
pkg_setup() {
linux-info_pkg_setup
@@ -61,12 +64,15 @@ src_configure() {
-DWITH_DEBUG_LOGGING="$(usex debug)" \
-DWITH_EXIF="$(usex exif)" \
-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_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
)
cmake-utils_src_configure
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 86fe0131d52..7f6f95dd5c3 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -17,11 +17,11 @@ else
fi
DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/v00d00/gerbera"
+HOMEPAGE="https://github.com/gerbera/gerbera"
LICENSE="GPL-2"
SLOT="0"
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib"
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
DEPEND="
!!net-misc/mediatomb
@@ -37,6 +37,7 @@ DEPEND="
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
@@ -61,12 +62,15 @@ src_configure() {
-DWITH_DEBUG_LOGGING="$(usex debug)" \
-DWITH_EXIF="$(usex exif)" \
-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_TAGLIB="$(usex taglib)" \
+ -DWITH_INOTIFY=1
)
cmake-utils_src_configure
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index e244367f765..1c5747db8eb 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -8,9 +8,11 @@
<longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
<use>
<flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+ <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
<flag name="lastfm">Enable last.fm support</flag>
<flag name="magic">Use libmagic to determine file types</flag>
<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
+ <flag name="protocol-extensions">Enable partial DLNA support</flag>
<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
</use>
<upstream>