| 1 |
aidecoe 14/07/03 07:49:41 |
| 2 |
|
| 3 |
Added: 0_pre20120621-make-var-instead-of-cmd.patch |
| 4 |
Log: |
| 5 |
Version bump. Fixed bug #515406 on behalf of |
| 6 |
ChaosEngine <andrzej.pauli@×××××.com>. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mjpg-streamer/files/0_pre20120621-make-var-instead-of-cmd.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0_pre20120621-make-var-instead-of-cmd.patch |
| 17 |
=================================================================== |
| 18 |
Index: Makefile |
| 19 |
=================================================================== |
| 20 |
--- Makefile (revision 150) |
| 21 |
+++ Makefile (working copy) |
| 22 |
@@ -63,64 +63,64 @@ |
| 23 |
chmod 755 $(APP_BINARY) |
| 24 |
|
| 25 |
output_autofocus.so: mjpg_streamer.h utils.h |
| 26 |
- make -C plugins/output_autofocus all |
| 27 |
+ $(MAKE) -C plugins/output_autofocus all |
| 28 |
cp plugins/output_autofocus/output_autofocus.so . |
| 29 |
|
| 30 |
input_testpicture.so: mjpg_streamer.h utils.h |
| 31 |
- make -C plugins/input_testpicture all |
| 32 |
+ $(MAKE) -C plugins/input_testpicture all |
| 33 |
cp plugins/input_testpicture/input_testpicture.so . |
| 34 |
|
| 35 |
|
| 36 |
ifeq ($(USE_LIBV4L2),true) |
| 37 |
input_uvc.so: mjpg_streamer.h utils.h |
| 38 |
- make -C plugins/input_uvc USE_LIBV4L2=true all |
| 39 |
+ $(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all |
| 40 |
cp plugins/input_uvc/input_uvc.so . |
| 41 |
else |
| 42 |
input_uvc.so: mjpg_streamer.h utils.h |
| 43 |
- make -C plugins/input_uvc all |
| 44 |
+ $(MAKE) -C plugins/input_uvc all |
| 45 |
cp plugins/input_uvc/input_uvc.so . |
| 46 |
endif |
| 47 |
|
| 48 |
input_control.so: mjpg_streamer.h utils.h |
| 49 |
- make -C plugins/input_control all |
| 50 |
+ $(MAKE) -C plugins/input_control all |
| 51 |
cp plugins/input_control/input_control.so . |
| 52 |
|
| 53 |
output_file.so: mjpg_streamer.h utils.h |
| 54 |
- make -C plugins/output_file all |
| 55 |
+ $(MAKE) -C plugins/output_file all |
| 56 |
cp plugins/output_file/output_file.so . |
| 57 |
|
| 58 |
ifeq ($(WXP_COMPAT),true) |
| 59 |
output_http.so: mjpg_streamer.h utils.h |
| 60 |
- make -C plugins/output_http -DWXP_COMPAT all |
| 61 |
+ $(MAKE) -C plugins/output_http -DWXP_COMPAT all |
| 62 |
cp plugins/output_http/output_http.so . |
| 63 |
else |
| 64 |
output_http.so: mjpg_streamer.h utils.h |
| 65 |
- make -C plugins/output_http all |
| 66 |
+ $(MAKE) -C plugins/output_http all |
| 67 |
cp plugins/output_http/output_http.so . |
| 68 |
endif |
| 69 |
|
| 70 |
output_udp.so: mjpg_streamer.h utils.h |
| 71 |
- make -C plugins/output_udp all |
| 72 |
+ $(MAKE) -C plugins/output_udp all |
| 73 |
cp plugins/output_udp/output_udp.so . |
| 74 |
|
| 75 |
input_gspcav1.so: mjpg_streamer.h utils.h |
| 76 |
- make -C plugins/input_gspcav1 all |
| 77 |
+ $(MAKE) -C plugins/input_gspcav1 all |
| 78 |
cp plugins/input_gspcav1/input_gspcav1.so . |
| 79 |
|
| 80 |
input_file.so: mjpg_streamer.h utils.h |
| 81 |
- make -C plugins/input_file all |
| 82 |
+ $(MAKE) -C plugins/input_file all |
| 83 |
cp plugins/input_file/input_file.so . |
| 84 |
|
| 85 |
output_rtsp.so: mjpg_streamer.h utils.h |
| 86 |
- make -C plugins/output_rtsp all |
| 87 |
+ $(MAKE) -C plugins/output_rtsp all |
| 88 |
cp plugins/output_rtsp/output_rtsp.so . |
| 89 |
|
| 90 |
output_ptp2.so: mjpg_streamer.h utils.h |
| 91 |
- make -C plugins/input_ptp2 all |
| 92 |
+ $(MAKE) -C plugins/input_ptp2 all |
| 93 |
cp plugins/input_ptp2/input_ptp2.so . |
| 94 |
|
| 95 |
#input_http.so: mjpg_streamer.h utils.h |
| 96 |
-# make -C plugins/input_http all |
| 97 |
+# $(MAKE) -C plugins/input_http all |
| 98 |
# cp plugins/input_http/input_http.so . |
| 99 |
|
| 100 |
# The viewer plugin requires the SDL library for compilation |
| 101 |
@@ -129,22 +129,22 @@ |
| 102 |
# execute the following command: |
| 103 |
# make output_viewer.so |
| 104 |
output_viewer.so: mjpg_streamer.h utils.h |
| 105 |
- make -C plugins/output_viewer all |
| 106 |
+ $(MAKE) -C plugins/output_viewer all |
| 107 |
cp plugins/output_viewer/output_viewer.so . |
| 108 |
|
| 109 |
# cleanup |
| 110 |
clean: |
| 111 |
- make -C plugins/input_uvc $@ |
| 112 |
- make -C plugins/input_testpicture $@ |
| 113 |
- make -C plugins/output_file $@ |
| 114 |
- make -C plugins/output_http $@ |
| 115 |
- make -C plugins/output_udp $@ |
| 116 |
- make -C plugins/output_autofocus $@ |
| 117 |
- make -C plugins/input_gspcav1 $@ |
| 118 |
- make -C plugins/output_viewer $@ |
| 119 |
- make -C plugins/input_control $@ |
| 120 |
- make -C plugins/output_rtsp $@ |
| 121 |
-# make -C plugins/input_http $@ |
| 122 |
+ $(MAKE) -C plugins/input_uvc $@ |
| 123 |
+ $(MAKE) -C plugins/input_testpicture $@ |
| 124 |
+ $(MAKE) -C plugins/output_file $@ |
| 125 |
+ $(MAKE) -C plugins/output_http $@ |
| 126 |
+ $(MAKE) -C plugins/output_udp $@ |
| 127 |
+ $(MAKE) -C plugins/output_autofocus $@ |
| 128 |
+ $(MAKE) -C plugins/input_gspcav1 $@ |
| 129 |
+ $(MAKE) -C plugins/output_viewer $@ |
| 130 |
+ $(MAKE) -C plugins/input_control $@ |
| 131 |
+ $(MAKE) -C plugins/output_rtsp $@ |
| 132 |
+# $(MAKE) -C plugins/input_http $@ |
| 133 |
rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo |
| 134 |
|
| 135 |
# useful to make a backup "make tgz" |
Archives