[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2021-04-11 Thread Ian Whyman 
commit: 139ad0d53ffb5930964a931b8bd07c4d5f1cabfd
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Apr 11 11:48:14 2021 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Apr 11 11:48:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139ad0d5

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  gentoo.org>

 net-misc/gerbera/Manifest  |  2 +-
 .../gerbera-1.5.0-incomplete-type-iohandler.patch  | 25 --
 .../{gerbera-1.7.0.ebuild => gerbera-1.8.0.ebuild} | 10 +++--
 net-misc/gerbera/gerbera-.ebuild   |  4 ++--
 4 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 4f8ba596854..d38d70cae70 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 93fd9e198df..000
--- 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.8.0.ebuild
similarity index 92%
rename from net-misc/gerbera/gerbera-1.7.0.ebuild
rename to net-misc/gerbera/gerbera-1.8.0.ebuild
index 4d3c690cb3c..4539ee1c8f9 100644
--- a/net-misc/gerbera/gerbera-1.7.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.8.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
 else
SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~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
@@ -35,7 +35,7 @@ DEPEND="
lastfm? ( >=media-libs/lastfmlib-0.4 )
exif? ( media-libs/libexif )
exiv2? ( media-gfx/exiv2 )
-   ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
+   ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
curl? ( net-misc/curl )
magic? ( sys-apps/file )
@@ -48,10 +48,6 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-1.5.0-incomplete-type-iohandler.patch"
-)
-
 src_configure() {
local mycmakeargs=(
-DWITH_CURL="$(usex curl)" \

diff --git a/net-misc/gerbera/gerbera-.ebuild 
b/net-misc/gerbera/gerbera-.ebuild
index 5757a960069..4539ee1c8f9 100644
--- a/net-misc/gerbera/gerbera-.ebuild
+++ b/net-misc/gerbera/gerbera-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; 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

[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2020-05-09 Thread Ian Whyman 
commit: 1fee1702f4b658812d3c9aba021ad51d4988f21f
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat May  9 10:35:43 2020 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat May  9 10:35:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fee1702

net-misc/gerbera: 1.5.0 version bump

Fix  to match

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

 net-misc/gerbera/Manifest  |  1 +
 .../gerbera-1.5.0-incomplete-type-iohandler.patch  | 25 ++
 .../{gerbera-.ebuild => gerbera-1.5.0.ebuild}  | 14 
 net-misc/gerbera/gerbera-.ebuild   | 10 +
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index d49cd27e01d..ed502b3d979 100644
--- 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
index 000..93fd9e198df
--- /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 
+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-.ebuild 
b/net-misc/gerbera/gerbera-1.5.0.ebuild
similarity index 90%
copy from net-misc/gerbera/gerbera-.ebuild
copy to net-misc/gerbera/gerbera-1.5.0.ebuild
index 11919c4298c..3e0553c702d 100644
--- a/net-misc/gerbera/gerbera-.ebuild
+++ b/net-misc/gerbera/gerbera-1.5.0.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
@@ -47,6 +49,10 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~INOTIFY_USER"
 
+PATCHES=(
+   "${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DWITH_CURL="$(usex curl)" \

diff --git a/net-misc/gerbera/gerbera-.ebuild 
b/net-misc/gerbera/gerbera-.ebuild
index 11919c4298c..adb30342a7a 100644
--- a/net-misc/gerbera/gerbera-.ebuild
+++ b/net-misc/gerbera/gerbera-.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="
exi

[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2019-01-31 Thread Ian Whyman 
commit: f130a7b274ed2fc3e5c880cc42951d9e50ca6cb1
Author: Ian Whyman  gentoo  org>
AuthorDate: Thu Jan 31 20:55:34 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Thu Jan 31 20:56:04 2019 +
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  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..000
--- 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 @@
 
 Gerbera
 uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9
-/var/lib/gerbera
+/var/lib/gerbera
 /usr/share/gerbera/web

[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2019-01-27 Thread Ian Whyman 
commit: adca6ff181c11c7221beeb543c9d71da102da1dc
Author: Ian Whyman  gentoo  org>
AuthorDate: Sun Jan 27 21:59:09 2019 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sun Jan 27 21:59:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adca6ff1

net-misc/gerbera: v1.3 Version bump

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Ian Whyman  gentoo.org>

 net-misc/gerbera/Manifest   |   1 +
 net-misc/gerbera/files/gerbera-1.3.0.config | 147 
 net-misc/gerbera/gerbera-1.3.0.ebuild   | 101 +++
 3 files changed, 249 insertions(+)

diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 9b5bf6263c1..227564a9a01 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1,2 @@
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B 
b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589
 SHA512 
5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
+DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B 
b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d
 SHA512 
1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434

diff --git a/net-misc/gerbera/files/gerbera-1.3.0.config 
b/net-misc/gerbera/files/gerbera-1.3.0.config
new file mode 100644
index 000..4c41a27143c
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.3.0.config
@@ -0,0 +1,147 @@
+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";>
+  
+  
+
+  
+
+  
+
+Gerbera
+uuid:f6344839-539b-4cb9-9a12-cab6bbb30fd9
+/var/lib/gerbera
+/usr/share/gerbera/web
+
+1800
+
+  
+gerbera.db
+  
+  
+localhost
+gerbera
+gerbera
+  
+
+
+
+  
+128
+5
+yes
+no
+8
+  
+  
+*
+
+  video
+
+  
+
+  
+  
+
+  /usr/share/gerbera/js/common.js
+  /usr/share/gerbera/js/playlists.js
+  
+/usr/share/gerbera/js/import.js
+  
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+
+
+  
+audio/mpeg
+no
+yes
+no
+
+
+  
+  
+video/mpeg
+yes
+yes
+yes
+
+
+  
+
+  
+
+

diff --git a/net-misc/gerbera/gerbera-1.3.0.ebuild 
b/net-misc/gerbera/gerbera-1.3.0.ebuild
new file mode 100644
index 000..fcdb0195c5e
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.3.0.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} ==  ]]; 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
+   v

[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2017-09-30 Thread Ian Whyman 
commit: 42ea35941d6dfc6851aff8a3e98faea2d2edcd5a
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Sep 30 16:09:56 2017 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Sep 30 16:10:07 2017 +
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-.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 000..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-.ebuild 
b/net-misc/gerbera/gerbera-.ebuild
index 86fe0131d52..7f6f95dd5c3 100644
--- a/net-misc/gerbera/gerbera-.ebuild
+++ b/net-misc/gerbera/gerbera-.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)"
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/gerbera/files/, net-misc/gerbera/

2017-06-17 Thread Ian Whyman 
commit: 01c9e9d631a356d7da00cae6062b66c0cb805023
Author: Ian Whyman  gentoo  org>
AuthorDate: Sat Jun 17 16:33:47 2017 +
Commit: Ian Whyman  gentoo  org>
CommitDate: Sat Jun 17 16:34:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c9e9d6

net-misc/gerbera: Fix init scripts

Fixes #621934

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-misc/gerbera/files/gerbera-1.0.0.confd | 37 ++
 net-misc/gerbera/files/gerbera-1.0.0.initd | 31 --
 net-misc/gerbera/files/gerbera.tmpfiles|  1 +
 ...erbera-1.0.0.ebuild => gerbera-1.0.0-r1.ebuild} |  4 ++-
 net-misc/gerbera/gerbera-.ebuild   |  4 ++-
 5 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/net-misc/gerbera/files/gerbera-1.0.0.confd 
b/net-misc/gerbera/files/gerbera-1.0.0.confd
index 7f5c0083025..4c4a4422035 100644
--- a/net-misc/gerbera/files/gerbera-1.0.0.confd
+++ b/net-misc/gerbera/files/gerbera-1.0.0.confd
@@ -1,28 +1,25 @@
-# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
+# /etc/conf.d/gerbera: config file for /etc/init.d/gerbera
 
-# See the mediatomb(1) manpage for more info.
+# See the gerbera(1) manpage for more info.
 
-# MediaTomb Web UI port.
+# Gerbera Web UI port.
 # NOTE: The minimum value allowed is 49152
-MEDIATOMB_PORT=49152
+GERBERA_PORT=49152
 
-# Run MediaTomb as this user.
-# NOTE: For security reasons do not run MediaTomb as root.
-MEDIATOMB_USER="mediatomb"
+# Run Gerbera as this user.
+# NOTE: For security reasons do not run Gerbera as root.
+GERBERA_USER="gerbera"
 
-# Run MediaTomb as this group.
-# NOTE: For security reasons do not run MediaTomb as root.
-MEDIATOMB_GROUP="mediatomb"
+# Run Gerbera as this group.
+# NOTE: For security reasons do not run Gerbera as root.
+GERBERA_GROUP="gerbera"
 
-# Path to MediaTomb config file.
-MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
+# Path to Gerbera config file.
+GERBERA_CONFIG="/etc/gerbera/config.xml"
 
-# Path to MediaTomb log file.
-MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
+# Path to Gerbera log file.
+GERBERA_LOGFILE="/var/log/gerbera.log"
 
-# Path to MediaTomb pid file.
-MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
-
-# Other options you want to pass to MediaTomb.
-# Add "--interface ${MEDIATOMB_INTERFACE}" to bind to a named interface.
-MEDIATOMB_OPTIONS=""
+# Other options you want to pass to Gerbera.
+# Add "--interface ${GERBERA_INTERFACE}" to bind to a named interface.
+GERBERA_OPTIONS=""

diff --git a/net-misc/gerbera/files/gerbera-1.0.0.initd 
b/net-misc/gerbera/files/gerbera-1.0.0.initd
index 86111395d7d..faee5e3c56c 100644
--- a/net-misc/gerbera/files/gerbera-1.0.0.initd
+++ b/net-misc/gerbera/files/gerbera-1.0.0.initd
@@ -5,24 +5,35 @@
 depend() {
need net
# In order to properly support this (need vs use), we would have to
-   # parse ${MEDIATOMB_CONFIG} and see if mysql is enabled and if it is
+   # parse ${GERBERA_CONFIG} and see if mysql is enabled and if it is
# pointing to the local system.  #368409
use mysql
 }
 
 start() {
-   ebegin "Starting MediaTomb"
-   start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
-   --pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
-   --pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
-   --group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
-   --config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
-   ${MEDIATOMB_OPTIONS}
+   ebegin "Starting Gerbera"
+
+   checkpath --directory --owner "${GERBERA_USER}:${GERBERA_GROUP}" --mode 
0755 /run/gerbera
+   checkpath --file --owner "${GERBERA_USER}:${GERBERA_GROUP}" --mode 0644 
"${GERBERA_LOGFILE}"
+
+   start-stop-daemon \
+   --start \
+   --exec /usr/bin/gerbera \
+   --user ${GERBERA_USER} \
+   --group ${GERBERA_GROUP} \
+   --background \
+   --wait 500 \
+   -- \
+   --pidfile /run/gerbera/gerbera.pid \
+   --logfile ${GERBERA_LOGFILE} \
+   --config ${GERBERA_CONFIG} \
+   --port ${GERBERA_PORT} \
+   ${GERBERA_OPTIONS}
eend $?
 }
 
 stop () {
-   ebegin "Stopping MediaTomb"
-   start-stop-daemon --stop --retry 10 --quiet --pidfile 
${MEDIATOMB_PIDFILE}
+   ebegin "Stopping Gerbera"
+   start-stop-daemon --stop --retry 10 --quiet --pidfile 
/run/gerbera/gerbera.pid
eend $?
 }

diff --git a/net-misc/gerbera/files/gerbera.tmpfiles 
b/net-misc/gerbera/files/gerbera.tmpfiles
new file mode 100644
index 000..fcc9b5de490
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera.tmpfiles
@@ -0,0 +1 @@
+d /run/gerbera 0755 gerbera gerbera -
\ No newline at end of file

diff --git a/net-misc/gerbera/gerbera-1.0.0.ebuild 
b/net-misc/gerbera/gerbera-1.0.0-r1.ebuild
similarity index 95%
rename from net-misc/gerbera/gerbera