1 |
commit: 09a97c152dbd8ec5ef3e3cf117acf58ba91ccbbe |
2 |
Author: ChaosEngine <andrzej.pauli <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Sep 17 18:31:51 2019 +0000 |
4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 27 12:25:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a97c15 |
7 |
|
8 |
media-video/mjpg-streamer: usinge EAPI=7 and cleaning old ebuilds |
9 |
|
10 |
Fixes Gentoo bug #694642 (https://bugs.gentoo.org/694642) |
11 |
|
12 |
Signed-off-by: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo.org> |
13 |
|
14 |
media-video/mjpg-streamer/Manifest | 1 - |
15 |
.../0_pre20120621-make-var-instead-of-cmd.patch | 118 --------------------- |
16 |
...-of-cmd.patch => make-var-instead-of-cmd.patch} | 8 +- |
17 |
.../mjpg-streamer/files/mjpg-streamer.initd | 5 +- |
18 |
...l-3.18.patch => to-work-with-kernel-3.18.patch} | 44 ++++---- |
19 |
media-video/mjpg-streamer/metadata.xml | 20 ++-- |
20 |
.../mjpg-streamer-0_pre20120421.ebuild | 71 ------------- |
21 |
...build => mjpg-streamer-0_pre20120621-r2.ebuild} | 33 +++--- |
22 |
.../mjpg-streamer-0_pre20120621.ebuild | 73 ------------- |
23 |
9 files changed, 58 insertions(+), 315 deletions(-) |
24 |
|
25 |
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest |
26 |
index 6b067416e36..d7dd0161571 100644 |
27 |
--- a/media-video/mjpg-streamer/Manifest |
28 |
+++ b/media-video/mjpg-streamer/Manifest |
29 |
@@ -1,2 +1 @@ |
30 |
-DIST mjpg-streamer-0_pre20120421.tar.bz2 471104 BLAKE2B 56edc0e4aac616a546c52cd4c7ee69e93f8895de6443c1987a10bf186108d77ae6715ea376c3c1f193c25d5e1238fa05bd22ef8d5e1a888c4939b3f2bdfe2520 SHA512 bd9fa11c8a615cf33f84898f6acca6c61ead3614c848d50c22891922e7cb553b422f2f121377040f52d636dd719a2f300d3285cefc34759df8861cc84fdc2e82 |
31 |
DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 |
32 |
|
33 |
diff --git a/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch |
34 |
deleted file mode 100644 |
35 |
index 98d89c555e0..00000000000 |
36 |
--- a/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch |
37 |
+++ /dev/null |
38 |
@@ -1,118 +0,0 @@ |
39 |
-Index: Makefile |
40 |
-=================================================================== |
41 |
---- Makefile (revision 150) |
42 |
-+++ Makefile (working copy) |
43 |
-@@ -63,64 +63,64 @@ |
44 |
- chmod 755 $(APP_BINARY) |
45 |
- |
46 |
- output_autofocus.so: mjpg_streamer.h utils.h |
47 |
-- make -C plugins/output_autofocus all |
48 |
-+ $(MAKE) -C plugins/output_autofocus all |
49 |
- cp plugins/output_autofocus/output_autofocus.so . |
50 |
- |
51 |
- input_testpicture.so: mjpg_streamer.h utils.h |
52 |
-- make -C plugins/input_testpicture all |
53 |
-+ $(MAKE) -C plugins/input_testpicture all |
54 |
- cp plugins/input_testpicture/input_testpicture.so . |
55 |
- |
56 |
- |
57 |
- ifeq ($(USE_LIBV4L2),true) |
58 |
- input_uvc.so: mjpg_streamer.h utils.h |
59 |
-- make -C plugins/input_uvc USE_LIBV4L2=true all |
60 |
-+ $(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all |
61 |
- cp plugins/input_uvc/input_uvc.so . |
62 |
- else |
63 |
- input_uvc.so: mjpg_streamer.h utils.h |
64 |
-- make -C plugins/input_uvc all |
65 |
-+ $(MAKE) -C plugins/input_uvc all |
66 |
- cp plugins/input_uvc/input_uvc.so . |
67 |
- endif |
68 |
- |
69 |
- input_control.so: mjpg_streamer.h utils.h |
70 |
-- make -C plugins/input_control all |
71 |
-+ $(MAKE) -C plugins/input_control all |
72 |
- cp plugins/input_control/input_control.so . |
73 |
- |
74 |
- output_file.so: mjpg_streamer.h utils.h |
75 |
-- make -C plugins/output_file all |
76 |
-+ $(MAKE) -C plugins/output_file all |
77 |
- cp plugins/output_file/output_file.so . |
78 |
- |
79 |
- ifeq ($(WXP_COMPAT),true) |
80 |
- output_http.so: mjpg_streamer.h utils.h |
81 |
-- make -C plugins/output_http -DWXP_COMPAT all |
82 |
-+ $(MAKE) -C plugins/output_http -DWXP_COMPAT all |
83 |
- cp plugins/output_http/output_http.so . |
84 |
- else |
85 |
- output_http.so: mjpg_streamer.h utils.h |
86 |
-- make -C plugins/output_http all |
87 |
-+ $(MAKE) -C plugins/output_http all |
88 |
- cp plugins/output_http/output_http.so . |
89 |
- endif |
90 |
- |
91 |
- output_udp.so: mjpg_streamer.h utils.h |
92 |
-- make -C plugins/output_udp all |
93 |
-+ $(MAKE) -C plugins/output_udp all |
94 |
- cp plugins/output_udp/output_udp.so . |
95 |
- |
96 |
- input_gspcav1.so: mjpg_streamer.h utils.h |
97 |
-- make -C plugins/input_gspcav1 all |
98 |
-+ $(MAKE) -C plugins/input_gspcav1 all |
99 |
- cp plugins/input_gspcav1/input_gspcav1.so . |
100 |
- |
101 |
- input_file.so: mjpg_streamer.h utils.h |
102 |
-- make -C plugins/input_file all |
103 |
-+ $(MAKE) -C plugins/input_file all |
104 |
- cp plugins/input_file/input_file.so . |
105 |
- |
106 |
- output_rtsp.so: mjpg_streamer.h utils.h |
107 |
-- make -C plugins/output_rtsp all |
108 |
-+ $(MAKE) -C plugins/output_rtsp all |
109 |
- cp plugins/output_rtsp/output_rtsp.so . |
110 |
- |
111 |
- output_ptp2.so: mjpg_streamer.h utils.h |
112 |
-- make -C plugins/input_ptp2 all |
113 |
-+ $(MAKE) -C plugins/input_ptp2 all |
114 |
- cp plugins/input_ptp2/input_ptp2.so . |
115 |
- |
116 |
- #input_http.so: mjpg_streamer.h utils.h |
117 |
--# make -C plugins/input_http all |
118 |
-+# $(MAKE) -C plugins/input_http all |
119 |
- # cp plugins/input_http/input_http.so . |
120 |
- |
121 |
- # The viewer plugin requires the SDL library for compilation |
122 |
-@@ -129,22 +129,22 @@ |
123 |
- # execute the following command: |
124 |
- # make output_viewer.so |
125 |
- output_viewer.so: mjpg_streamer.h utils.h |
126 |
-- make -C plugins/output_viewer all |
127 |
-+ $(MAKE) -C plugins/output_viewer all |
128 |
- cp plugins/output_viewer/output_viewer.so . |
129 |
- |
130 |
- # cleanup |
131 |
- clean: |
132 |
-- make -C plugins/input_uvc $@ |
133 |
-- make -C plugins/input_testpicture $@ |
134 |
-- make -C plugins/output_file $@ |
135 |
-- make -C plugins/output_http $@ |
136 |
-- make -C plugins/output_udp $@ |
137 |
-- make -C plugins/output_autofocus $@ |
138 |
-- make -C plugins/input_gspcav1 $@ |
139 |
-- make -C plugins/output_viewer $@ |
140 |
-- make -C plugins/input_control $@ |
141 |
-- make -C plugins/output_rtsp $@ |
142 |
--# make -C plugins/input_http $@ |
143 |
-+ $(MAKE) -C plugins/input_uvc $@ |
144 |
-+ $(MAKE) -C plugins/input_testpicture $@ |
145 |
-+ $(MAKE) -C plugins/output_file $@ |
146 |
-+ $(MAKE) -C plugins/output_http $@ |
147 |
-+ $(MAKE) -C plugins/output_udp $@ |
148 |
-+ $(MAKE) -C plugins/output_autofocus $@ |
149 |
-+ $(MAKE) -C plugins/input_gspcav1 $@ |
150 |
-+ $(MAKE) -C plugins/output_viewer $@ |
151 |
-+ $(MAKE) -C plugins/input_control $@ |
152 |
-+ $(MAKE) -C plugins/output_rtsp $@ |
153 |
-+# $(MAKE) -C plugins/input_http $@ |
154 |
- rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo |
155 |
- |
156 |
- # useful to make a backup "make tgz" |
157 |
|
158 |
diff --git a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/make-var-instead-of-cmd.patch |
159 |
similarity index 96% |
160 |
rename from media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch |
161 |
rename to media-video/mjpg-streamer/files/make-var-instead-of-cmd.patch |
162 |
index 98d89c555e0..b6f14da2139 100644 |
163 |
--- a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch |
164 |
+++ b/media-video/mjpg-streamer/files/make-var-instead-of-cmd.patch |
165 |
@@ -1,7 +1,7 @@ |
166 |
-Index: Makefile |
167 |
-=================================================================== |
168 |
---- Makefile (revision 150) |
169 |
-+++ Makefile (working copy) |
170 |
+Index: diff --git a/Makefile b/Makefile |
171 |
+index c0b2d10..ef264e9 100644 |
172 |
+--- a/Makefile |
173 |
++++ b/Makefile |
174 |
@@ -63,64 +63,64 @@ |
175 |
chmod 755 $(APP_BINARY) |
176 |
|
177 |
|
178 |
diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd |
179 |
index 53f046e7b1f..9672a429887 100644 |
180 |
--- a/media-video/mjpg-streamer/files/mjpg-streamer.initd |
181 |
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd |
182 |
@@ -7,6 +7,7 @@ MY_NAME=${SVCNAME//-/_} |
183 |
|
184 |
depend() { |
185 |
use logger |
186 |
+ after modules |
187 |
} |
188 |
|
189 |
checkconfig() { |
190 |
@@ -34,8 +35,8 @@ start() { |
191 |
--user "${MJPG_STREAMER_USER}" \ |
192 |
--group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \ |
193 |
--pidfile "${MJPG_STREAMER_PIDFILE}" \ |
194 |
- -- -i "/usr/lib/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \ |
195 |
- -o "/usr/lib/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}" |
196 |
+ -- -i "/usr/@LIBDIR@/input_${INPUT_PLUGIN}.so ${INPUT_PLUGIN_OPTS}" \ |
197 |
+ -o "/usr/@LIBDIR@/output_${OUTPUT_PLUGIN}.so ${OUTPUT_PLUGIN_OPTS}" |
198 |
eend $? "Check syslog to see why startup failed." |
199 |
} |
200 |
|
201 |
|
202 |
diff --git a/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch b/media-video/mjpg-streamer/files/to-work-with-kernel-3.18.patch |
203 |
similarity index 62% |
204 |
rename from media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch |
205 |
rename to media-video/mjpg-streamer/files/to-work-with-kernel-3.18.patch |
206 |
index 5f16f4ab3f4..a484a27217f 100644 |
207 |
--- a/media-video/mjpg-streamer/files/0_pre20120621-to-work-with-kernel-3.18.patch |
208 |
+++ b/media-video/mjpg-streamer/files/to-work-with-kernel-3.18.patch |
209 |
@@ -1,19 +1,7 @@ |
210 |
-From 03796a1d930212aea460405b86cd41bea8fa5150 Mon Sep 17 00:00:00 2001 |
211 |
-From: Eric Lee <saintgimp@×××××××.com> |
212 |
-Date: Thu, 26 Feb 2015 19:31:41 -0800 |
213 |
-Subject: [PATCH] Fix mjpg-streamer to work with kernel 3.18 |
214 |
- |
215 |
-I didn't create this fix, it was originally posted to http://www.raspberrypi.org/forums/viewtopic.php?f=28&t=97983&p=681259. @koosvriezen tried to create a pull request #3 but made kind of a hash of it, so this is the same fix only a proper pull request. |
216 |
---- |
217 |
- mjpg-streamer/plugins/input_uvc/input_uvc.c | 8 +++++--- |
218 |
- mjpg-streamer/plugins/input_uvc/v4l2uvc.c | 2 ++ |
219 |
- mjpg-streamer/plugins/input_uvc/v4l2uvc.h | 3 +++ |
220 |
- 3 files changed, 10 insertions(+), 3 deletions(-) |
221 |
- |
222 |
-diff --git a/mjpg-streamer/plugins/input_uvc/input_uvc.c b/mjpg-streamer/plugins/input_uvc/input_uvc.c |
223 |
+diff --git a/plugins/input_uvc/input_uvc.c b/plugins/input_uvc/input_uvc.c |
224 |
index c0b2d10..ef264e9 100644 |
225 |
---- a/mjpg-streamer/plugins/input_uvc/input_uvc.c |
226 |
-+++ b/mjpg-streamer/plugins/input_uvc/input_uvc.c |
227 |
+--- a/plugins/input_uvc/input_uvc.c |
228 |
++++ b/plugins/input_uvc/input_uvc.c |
229 |
@@ -405,9 +405,13 @@ void *cam_thread(void *arg) |
230 |
if(pcontext->videoIn->formatIn == V4L2_PIX_FMT_YUYV) { |
231 |
DBG("compressing frame from input: %d\n", (int)pcontext->id); |
232 |
@@ -38,10 +26,10 @@ index c0b2d10..ef264e9 100644 |
233 |
|
234 |
/* signal fresh_frame */ |
235 |
pthread_cond_broadcast(&pglobal->in[pcontext->id].db_update); |
236 |
-diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c |
237 |
+diff --git a/plugins/input_uvc/v4l2uvc.c b/plugins/input_uvc/v4l2uvc.c |
238 |
index 48fd189..329233b 100644 |
239 |
---- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.c |
240 |
-+++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.c |
241 |
+--- a/plugins/input_uvc/v4l2uvc.c |
242 |
++++ b/plugins/input_uvc/v4l2uvc.c |
243 |
@@ -450,6 +450,8 @@ int uvcGrab(struct vdIn *vd) |
244 |
*/ |
245 |
|
246 |
@@ -51,10 +39,10 @@ index 48fd189..329233b 100644 |
247 |
|
248 |
if(debug) |
249 |
fprintf(stderr, "bytes in used %d \n", vd->buf.bytesused); |
250 |
-diff --git a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h |
251 |
+diff --git a/plugins/input_uvc/v4l2uvc.h b/plugins/input_uvc/v4l2uvc.h |
252 |
index d5296fc..0e3f99f 100644 |
253 |
---- a/mjpg-streamer/plugins/input_uvc/v4l2uvc.h |
254 |
-+++ b/mjpg-streamer/plugins/input_uvc/v4l2uvc.h |
255 |
+--- a/plugins/input_uvc/v4l2uvc.h |
256 |
++++ b/plugins/input_uvc/v4l2uvc.h |
257 |
@@ -28,6 +28,7 @@ |
258 |
|
259 |
|
260 |
@@ -72,3 +60,17 @@ index d5296fc..0e3f99f 100644 |
261 |
}; |
262 |
|
263 |
/* context of each camera thread */ |
264 |
+ |
265 |
+diff --git a/utils.c b/utils.c |
266 |
+index b494ca3..2792abe 100644 |
267 |
+--- ai/utils.c |
268 |
++++ b/utils.c |
269 |
+@@ -29,7 +29,7 @@ |
270 |
+ #include <wait.h> |
271 |
+ #include <time.h> |
272 |
+ #include <limits.h> |
273 |
+-#include <linux/stat.h> |
274 |
++//#include <linux/stat.h> |
275 |
+ #include <sys/stat.h> |
276 |
+ |
277 |
+ #include "utils.h" |
278 |
|
279 |
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml |
280 |
index 492364ee19f..27a772223ce 100644 |
281 |
--- a/media-video/mjpg-streamer/metadata.xml |
282 |
+++ b/media-video/mjpg-streamer/metadata.xml |
283 |
@@ -20,26 +20,24 @@ |
284 |
streaming application with Pan/Tilt |
285 |
</longdescription> |
286 |
<use> |
287 |
- <flag name="input_testpicture">Plugin for sending compiled in, test |
288 |
+ <flag name="input-testpicture">Plugin for sending compiled in, test |
289 |
pictures</flag> |
290 |
- <flag name="input_control">Plugin giving ability to control camera |
291 |
+ <flag name="input-control">Plugin giving ability to control camera |
292 |
movement (only specific cameras)</flag> |
293 |
- <flag name="input_file">Plugin that watches given directory and send |
294 |
+ <flag name="input-file">Plugin that watches given directory and send |
295 |
it's content</flag> |
296 |
- <flag name="input_uvc">Plugin that sends video stream from UVC |
297 |
+ <flag name="input-uvc">Plugin that sends video stream from UVC |
298 |
compatible camera</flag> |
299 |
- <flag name="output_file">Plugin that saves received content under given |
300 |
+ <flag name="output-file">Plugin that saves received content under given |
301 |
location</flag> |
302 |
- <flag name="output_udp">Plugin receiving content over UDP and storing to |
303 |
+ <flag name="output-udp">Plugin receiving content over UDP and storing to |
304 |
a directory</flag> |
305 |
- <flag name="output_http">Small HTTP server plugin which sends WWW |
306 |
+ <flag name="output-http">Small HTTP server plugin which sends WWW |
307 |
directory content and streams image content</flag> |
308 |
- <flag name="output_autofocus">Auto focusing plugin</flag> |
309 |
- <flag name="output_rtsp">Plugin which provides a mechanism to take |
310 |
+ <flag name="output-autofocus">Auto focusing plugin</flag> |
311 |
+ <flag name="output-rtsp">Plugin which provides a mechanism to take |
312 |
snapshots with a trigger from a UDP packet</flag> |
313 |
<flag name="www">Installs WWW content</flag> |
314 |
- <flag name="v4l">Uses <pkg>media-libs/libv4l</pkg> function mapping for |
315 |
- input_uvc plugin</flag> |
316 |
</use> |
317 |
<upstream> |
318 |
<remote-id type="sourceforge">mjpg-streamer</remote-id> |
319 |
|
320 |
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild |
321 |
deleted file mode 100644 |
322 |
index 12a604613e8..00000000000 |
323 |
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild |
324 |
+++ /dev/null |
325 |
@@ -1,71 +0,0 @@ |
326 |
-# Copyright 1999-2019 Gentoo Authors |
327 |
-# Distributed under the terms of the GNU General Public License v2 |
328 |
- |
329 |
-EAPI=4 |
330 |
- |
331 |
-inherit eutils |
332 |
- |
333 |
-DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams" |
334 |
-HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer" |
335 |
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2" |
336 |
- |
337 |
-LICENSE="GPL-2" |
338 |
-SLOT="0" |
339 |
-KEYWORDS="~amd64 ~x86" |
340 |
- |
341 |
-INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" |
342 |
-OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" |
343 |
-IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS} +input_file +output_http" |
344 |
-IUSE="${IUSE_PLUGINS} www v4l" |
345 |
-REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) |
346 |
- || ( ${OUTPUT_PLUGINS} ) |
347 |
- v4l? ( input_uvc )" |
348 |
- |
349 |
-RDEPEND="virtual/jpeg |
350 |
- v4l? ( input_uvc? ( media-libs/libv4l ) )" |
351 |
-DEPEND="${RDEPEND} |
352 |
- input_testpicture? ( media-gfx/imagemagick )" |
353 |
- |
354 |
-src_prepare() { |
355 |
- epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" |
356 |
- |
357 |
- local flag switch |
358 |
- |
359 |
- for flag in ${IUSE_PLUGINS}; do |
360 |
- use ${flag} && switch='' || switch='#' |
361 |
- sed -i \ |
362 |
- -e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ |
363 |
- Makefile |
364 |
- done |
365 |
-} |
366 |
- |
367 |
-src_compile() { |
368 |
- local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') |
369 |
- emake ${v4l} |
370 |
-} |
371 |
- |
372 |
-src_install() { |
373 |
- into /usr |
374 |
- dobin ${PN//-/_} |
375 |
- dolib.so *.so |
376 |
- |
377 |
- if use www ; then |
378 |
- insinto /usr/share/${PN} |
379 |
- doins -r www |
380 |
- fi |
381 |
- |
382 |
- dodoc README TODO |
383 |
- |
384 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
385 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
386 |
-} |
387 |
- |
388 |
-pkg_postinst() { |
389 |
- elog "Remember to set an input and output plugin for mjpg-streamer." |
390 |
- |
391 |
- if use www ; then |
392 |
- echo |
393 |
- elog "An example webinterface has been installed into" |
394 |
- elog "/usr/share/mjpg-streamer/www for your usage." |
395 |
- fi |
396 |
-} |
397 |
|
398 |
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild |
399 |
similarity index 63% |
400 |
rename from media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild |
401 |
rename to media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild |
402 |
index e13ff04b0c3..0e44b70eb0a 100644 |
403 |
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild |
404 |
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r2.ebuild |
405 |
@@ -1,7 +1,7 @@ |
406 |
# Copyright 1999-2019 Gentoo Authors |
407 |
# Distributed under the terms of the GNU General Public License v2 |
408 |
|
409 |
-EAPI=4 |
410 |
+EAPI=7 |
411 |
|
412 |
inherit eutils |
413 |
|
414 |
@@ -13,29 +13,34 @@ LICENSE="GPL-2" |
415 |
SLOT="0" |
416 |
KEYWORDS="~amd64 ~x86" |
417 |
|
418 |
-INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" |
419 |
-OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" |
420 |
+INPUT_PLUGINS="input-testpicture input-control input-file input-uvc" |
421 |
+OUTPUT_PLUGINS="output-file output-udp output-http output-autofocus output-rtsp" |
422 |
IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}" |
423 |
-IUSE="input_testpicture input_control +input_file input_uvc output_file |
424 |
- output_udp +output_http output_autofocus output_rtsp |
425 |
- www v4l" |
426 |
+IUSE="input-testpicture input-control +input-file input-uvc output-file |
427 |
+ output-udp +output-http output-autofocus output-rtsp |
428 |
+ www" |
429 |
REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) |
430 |
- || ( ${OUTPUT_PLUGINS} ) |
431 |
- v4l? ( input_uvc )" |
432 |
+ || ( ${OUTPUT_PLUGINS} )" |
433 |
|
434 |
RDEPEND="virtual/jpeg |
435 |
- v4l? ( input_uvc? ( media-libs/libv4l ) )" |
436 |
+ input-uvc? ( media-libs/libv4l )" |
437 |
DEPEND="${RDEPEND} |
438 |
- input_testpicture? ( media-gfx/imagemagick )" |
439 |
+ input-testpicture? ( media-gfx/imagemagick )" |
440 |
+ |
441 |
+PATCHES=( |
442 |
+ "${FILESDIR}/make-var-instead-of-cmd.patch" |
443 |
+ "${FILESDIR}/to-work-with-kernel-3.18.patch" |
444 |
+) |
445 |
|
446 |
src_prepare() { |
447 |
- epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" |
448 |
- epatch "${FILESDIR}/${PV}-to-work-with-kernel-3.18.patch" |
449 |
+ default |
450 |
|
451 |
local flag switch |
452 |
|
453 |
for flag in ${IUSE_PLUGINS}; do |
454 |
use ${flag} && switch='' || switch='#' |
455 |
+ flag=${flag/input-/input_} |
456 |
+ flag=${flag/output-/output_} |
457 |
sed -i \ |
458 |
-e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ |
459 |
Makefile |
460 |
@@ -43,7 +48,7 @@ src_prepare() { |
461 |
} |
462 |
|
463 |
src_compile() { |
464 |
- local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') |
465 |
+ local v4l=$(use input-uvc && echo 'USE_LIBV4L2=true') |
466 |
emake ${v4l} |
467 |
} |
468 |
|
469 |
@@ -59,7 +64,7 @@ src_install() { |
470 |
|
471 |
dodoc README TODO |
472 |
|
473 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
474 |
+ sed -e "s|@LIBDIR@|$(get_libdir)|g" "${FILESDIR}/${PN}.initd" | newinitd - ${PN} |
475 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
476 |
} |
477 |
|
478 |
|
479 |
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild |
480 |
deleted file mode 100644 |
481 |
index ca8898e4a9e..00000000000 |
482 |
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild |
483 |
+++ /dev/null |
484 |
@@ -1,73 +0,0 @@ |
485 |
-# Copyright 1999-2019 Gentoo Authors |
486 |
-# Distributed under the terms of the GNU General Public License v2 |
487 |
- |
488 |
-EAPI=4 |
489 |
- |
490 |
-inherit eutils |
491 |
- |
492 |
-DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams" |
493 |
-HOMEPAGE="https://sourceforge.net/projects/mjpg-streamer" |
494 |
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2" |
495 |
- |
496 |
-LICENSE="GPL-2" |
497 |
-SLOT="0" |
498 |
-KEYWORDS="~amd64 ~x86" |
499 |
- |
500 |
-INPUT_PLUGINS="input_testpicture input_control input_file input_uvc" |
501 |
-OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp" |
502 |
-IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}" |
503 |
-IUSE="input_testpicture input_control +input_file input_uvc output_file |
504 |
- output_udp +output_http output_autofocus output_rtsp |
505 |
- www v4l" |
506 |
-REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) |
507 |
- || ( ${OUTPUT_PLUGINS} ) |
508 |
- v4l? ( input_uvc )" |
509 |
- |
510 |
-RDEPEND="virtual/jpeg |
511 |
- v4l? ( input_uvc? ( media-libs/libv4l ) )" |
512 |
-DEPEND="${RDEPEND} |
513 |
- input_testpicture? ( media-gfx/imagemagick )" |
514 |
- |
515 |
-src_prepare() { |
516 |
- epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch" |
517 |
- |
518 |
- local flag switch |
519 |
- |
520 |
- for flag in ${IUSE_PLUGINS}; do |
521 |
- use ${flag} && switch='' || switch='#' |
522 |
- sed -i \ |
523 |
- -e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \ |
524 |
- Makefile |
525 |
- done |
526 |
-} |
527 |
- |
528 |
-src_compile() { |
529 |
- local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true') |
530 |
- emake ${v4l} |
531 |
-} |
532 |
- |
533 |
-src_install() { |
534 |
- into /usr |
535 |
- dobin ${PN//-/_} |
536 |
- dolib.so *.so |
537 |
- |
538 |
- if use www ; then |
539 |
- insinto /usr/share/${PN} |
540 |
- doins -r www |
541 |
- fi |
542 |
- |
543 |
- dodoc README TODO |
544 |
- |
545 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
546 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
547 |
-} |
548 |
- |
549 |
-pkg_postinst() { |
550 |
- elog "Remember to set an input and output plugin for mjpg-streamer." |
551 |
- |
552 |
- if use www ; then |
553 |
- echo |
554 |
- elog "An example webinterface has been installed into" |
555 |
- elog "/usr/share/mjpg-streamer/www for your usage." |
556 |
- fi |
557 |
-} |