1 |
commit: 42ea35941d6dfc6851aff8a3e98faea2d2edcd5a |
2 |
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 30 16:09:56 2017 +0000 |
4 |
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 30 16:10:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ea3594 |
7 |
|
8 |
net-misc/gerbera: Expose new v1.1 options as useflags |
9 |
|
10 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
11 |
|
12 |
net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch | 14 ++++++++++++++ |
13 |
.../{gerbera-1.1.0.ebuild => gerbera-1.1.0-r1.ebuild} | 12 +++++++++--- |
14 |
net-misc/gerbera/gerbera-9999.ebuild | 10 +++++++--- |
15 |
net-misc/gerbera/metadata.xml | 2 ++ |
16 |
4 files changed, 32 insertions(+), 6 deletions(-) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..ff5f6075ec1 |
21 |
--- /dev/null |
22 |
+++ b/net-misc/gerbera/files/gerbera-1.1.0-build-failure.patch |
23 |
@@ -0,0 +1,14 @@ |
24 |
+diff --git gerbera/src/file_request_handler.cc src/file_request_handler.cc |
25 |
+index 2fade4a9..de33617b 100644 |
26 |
+--- gerbera/src/file_request_handler.cc |
27 |
++++ gerbera/src/file_request_handler.cc |
28 |
+@@ -282,8 +282,8 @@ void FileRequestHandler::get_info(IN const char* filename, OUT UpnpFileInfo* inf |
29 |
+ header = header + "CaptionInfo.sec: " + url; |
30 |
+ } |
31 |
+ } |
32 |
+-#endif |
33 |
+ } |
34 |
++#endif |
35 |
+ } |
36 |
+ |
37 |
+ if (!string_ok(mimeType)) |
38 |
|
39 |
diff --git a/net-misc/gerbera/gerbera-1.1.0.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild |
40 |
similarity index 82% |
41 |
rename from net-misc/gerbera/gerbera-1.1.0.ebuild |
42 |
rename to net-misc/gerbera/gerbera-1.1.0-r1.ebuild |
43 |
index 86fe0131d52..f9521cc5691 100644 |
44 |
--- a/net-misc/gerbera/gerbera-1.1.0.ebuild |
45 |
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild |
46 |
@@ -17,11 +17,11 @@ else |
47 |
fi |
48 |
|
49 |
DESCRIPTION="UPnP Media Server (Based on MediaTomb)" |
50 |
-HOMEPAGE="https://github.com/v00d00/gerbera" |
51 |
+HOMEPAGE="https://github.com/gerbera/gerbera" |
52 |
|
53 |
LICENSE="GPL-2" |
54 |
SLOT="0" |
55 |
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib" |
56 |
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" |
57 |
|
58 |
DEPEND=" |
59 |
!!net-misc/mediatomb |
60 |
@@ -37,6 +37,7 @@ DEPEND=" |
61 |
libav? ( >=media-video/libav-10:0= ) |
62 |
!libav? ( >=media-video/ffmpeg-2.2:0= ) |
63 |
) |
64 |
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) |
65 |
curl? ( net-misc/curl net-misc/youtube-dl ) |
66 |
magic? ( sys-apps/file ) |
67 |
sys-apps/util-linux |
68 |
@@ -47,6 +48,8 @@ RDEPEND="${DEPEND}" |
69 |
|
70 |
CONFIG_CHECK="~INOTIFY_USER" |
71 |
|
72 |
+PATCHES=( "${FILESDIR}/${P}-build-failure.patch" ) |
73 |
+ |
74 |
pkg_setup() { |
75 |
linux-info_pkg_setup |
76 |
|
77 |
@@ -61,12 +64,15 @@ src_configure() { |
78 |
-DWITH_DEBUG_LOGGING="$(usex debug)" \ |
79 |
-DWITH_EXIF="$(usex exif)" \ |
80 |
-DWITH_AVCODEC="$(usex ffmpeg)" \ |
81 |
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ |
82 |
-DWITH_JS="$(usex javascript)" \ |
83 |
-DWITH_LASTFM="$(usex lastfm)" \ |
84 |
-DWITH_MAGIC="$(usex magic)" \ |
85 |
-DWITH_MYSQL="$(usex mysql)" |
86 |
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ |
87 |
-DWITH_SYSTEMD="$(usex systemd)" \ |
88 |
- -DWITH_TAGLIB="$(usex taglib)" |
89 |
+ -DWITH_TAGLIB="$(usex taglib)" \ |
90 |
+ -DWITH_INOTIFY=1 |
91 |
) |
92 |
|
93 |
cmake-utils_src_configure |
94 |
|
95 |
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild |
96 |
index 86fe0131d52..7f6f95dd5c3 100644 |
97 |
--- a/net-misc/gerbera/gerbera-9999.ebuild |
98 |
+++ b/net-misc/gerbera/gerbera-9999.ebuild |
99 |
@@ -17,11 +17,11 @@ else |
100 |
fi |
101 |
|
102 |
DESCRIPTION="UPnP Media Server (Based on MediaTomb)" |
103 |
-HOMEPAGE="https://github.com/v00d00/gerbera" |
104 |
+HOMEPAGE="https://github.com/gerbera/gerbera" |
105 |
|
106 |
LICENSE="GPL-2" |
107 |
SLOT="0" |
108 |
-IUSE="curl debug +exif +ffmpeg +javascript lastfm libav +magic mysql systemd +taglib" |
109 |
+IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib" |
110 |
|
111 |
DEPEND=" |
112 |
!!net-misc/mediatomb |
113 |
@@ -37,6 +37,7 @@ DEPEND=" |
114 |
libav? ( >=media-video/libav-10:0= ) |
115 |
!libav? ( >=media-video/ffmpeg-2.2:0= ) |
116 |
) |
117 |
+ ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) |
118 |
curl? ( net-misc/curl net-misc/youtube-dl ) |
119 |
magic? ( sys-apps/file ) |
120 |
sys-apps/util-linux |
121 |
@@ -61,12 +62,15 @@ src_configure() { |
122 |
-DWITH_DEBUG_LOGGING="$(usex debug)" \ |
123 |
-DWITH_EXIF="$(usex exif)" \ |
124 |
-DWITH_AVCODEC="$(usex ffmpeg)" \ |
125 |
+ -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ |
126 |
-DWITH_JS="$(usex javascript)" \ |
127 |
-DWITH_LASTFM="$(usex lastfm)" \ |
128 |
-DWITH_MAGIC="$(usex magic)" \ |
129 |
-DWITH_MYSQL="$(usex mysql)" |
130 |
+ -DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \ |
131 |
-DWITH_SYSTEMD="$(usex systemd)" \ |
132 |
- -DWITH_TAGLIB="$(usex taglib)" |
133 |
+ -DWITH_TAGLIB="$(usex taglib)" \ |
134 |
+ -DWITH_INOTIFY=1 |
135 |
) |
136 |
|
137 |
cmake-utils_src_configure |
138 |
|
139 |
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml |
140 |
index e244367f765..1c5747db8eb 100644 |
141 |
--- a/net-misc/gerbera/metadata.xml |
142 |
+++ b/net-misc/gerbera/metadata.xml |
143 |
@@ -8,9 +8,11 @@ |
144 |
<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> |
145 |
<use> |
146 |
<flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag> |
147 |
+ <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> |
148 |
<flag name="lastfm">Enable last.fm support</flag> |
149 |
<flag name="magic">Use libmagic to determine file types</flag> |
150 |
<flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> |
151 |
+ <flag name="protocol-extensions">Enable partial DLNA support</flag> |
152 |
<flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag> |
153 |
</use> |
154 |
<upstream> |