Proxy commit on behalf of Andrzej Pauli <andrzej.pauli@gmail.com>.

Version bump.  Fixes bug #411931.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 210 insertions, 9 deletions

diff --git a/media-video/mjpg-streamer/ChangeLog b/media-video/mjpg-streamer/ChangeLog
index a95ee14ba4dd..3d83e65f47ec 100644
--- a/media-video/mjpg-streamer/ChangeLog
+++ b/media-video/mjpg-streamer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mjpg-streamer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.2 2012/04/21 20:20:45 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.3 2012/04/23 10:00:59 aidecoe Exp $
+
+*mjpg-streamer-0_pre20120421 (23 Apr 2012)
+
+  23 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +files/0_pre20120421-make-var-instead-of-cmd.patch,
+  +mjpg-streamer-0_pre20120421.ebuild:
+  Proxy commit on behalf of Andrzej Pauli <andrzej.pauli@gmail.com>.  Version
+  bump.  Fixes bug #411931.
 
   21 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
   mjpg-streamer-0_pre20110522.ebuild:
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 019b3154dcf8..a621d881996e 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX 0_pre20110522-make-var-instead-of-cmd.patch 3756 RMD160 433b165268fdd4a9493d1e42e4c23b08f85aac35 SHA1 6631aca53d6b90c5defb48a116ff7a7fae3855bb SHA256 ef7f66e87c6b3b145ad9e5c0a0023b3d4331d0507aca6e69df95a380a421d2eb
+AUX 0_pre20120421-make-var-instead-of-cmd.patch 3756 RMD160 433b165268fdd4a9493d1e42e4c23b08f85aac35 SHA1 6631aca53d6b90c5defb48a116ff7a7fae3855bb SHA256 ef7f66e87c6b3b145ad9e5c0a0023b3d4331d0507aca6e69df95a380a421d2eb
 AUX mjpg-streamer.confd 347 RMD160 50b97048e9c5e27e336d4925f179f0cc0b2a974c SHA1 e962d439bfebdff487c7d980088481f431744304 SHA256 37019a36c29ad350ac3348c1665c631d0b4ab5efacc4583662fcbf7d4b920db1
 AUX mjpg-streamer.initd 1369 RMD160 210ef19f88b9b2272c4b529dc048d6c6130d63f7 SHA1 3f6f84458b909a8652a1a14274c8c5a8eab6b6f1 SHA256 460d688cb1a25e5fa9d85fe1453a2ad0b4ad11c827125465a057d995415a171a
 DIST mjpg-streamer-0_pre20110522.tar.bz2 473378 RMD160 78e1d3f526f2037e7ac543e3f2511bde86b509f6 SHA1 7e2b5d2b66ae9afcb8fcd85c6e3c84743bc13639 SHA256 6a3aedb57f4779a53e80a7ac617924ebadd52a2098e088ef4b91dc91ba5a24d6
+DIST mjpg-streamer-0_pre20120421.tar.bz2 471104 RMD160 1f785d9076acc305baaec2fe69575a21e35a6a88 SHA1 c2aa63e9b70c18b69708df3697a4e17f84ce1d88 SHA256 cba3027eece48735e104522adf4682169431e0879555c1d22395b4669189aab8
 EBUILD mjpg-streamer-0_pre20110522.ebuild 1817 RMD160 6f6d74f83d7bd0323b569c0c2bf362adad0a0c6e SHA1 63e8c26dc13338d772fab5d8035eed254a7354c0 SHA256 bbbf094ce86fc29dfcedf1a9a217f00640ef27826caabf54d80a831e2fc38ac2
-MISC ChangeLog 832 RMD160 e1d872fe923bcc4f55ca93df6c4e79c5aa86ad30 SHA1 2dab9f69cc9f741326a7a383db2dbeab256c9aa8 SHA256 e4f26fd15230fc073684e260925c7e3a9d164001a63f1a597e7b4c8707cb014d
+EBUILD mjpg-streamer-0_pre20120421.ebuild 1817 RMD160 c0966f32399d7b678a55abdf02880dcf52a37905 SHA1 a26b5889946954cb322fde20a6e9ca0d03d62256 SHA256 477899c54b388141b449f30942a39c0233372f356723754d754178494432ef30
+MISC ChangeLog 1133 RMD160 f7bca91d1be4b102e8b6af6b46caa3ae3020eb54 SHA1 3bca75ff7705034d173c3092c767988972ea3ec6 SHA256 197ba88c49acb3bb78d5075f5b3b3c5c08d9562c0bf8af65a528f17ffab02c29
 MISC metadata.xml 1823 RMD160 4dcdc175ee80e22547ef024d3aa1853f38dd2819 SHA1 1c9d4b8f56c4ff9926889b0999236d2f0a2a2140 SHA256 0f03a0a6a77e3f643e95c5c578cc031b91825088f2de408d8e10d78ef43823c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPkxajAAoJEPATRTHh2/q1W0IH+wcxkxrrSTUXQk2Bs2SVBCl8
-BbiEKgeYqyxUpbXKOSX1NJKUqYZScFiWgxv2iWm6DGcNYLgwIp9XES7B05yFihgq
-wRyYagq8jgn42T3dkX2NGinE9NMIac3RKXPsCNGLiUhGJykdox3kHhLmAY1yAL+q
-l+fhrSib7lb9KQFhMaRaM3JtHIYjqis1C7NZ0sakdSYKWfU8HC2AN+bNtnCGqX3Z
-1CgDtY9prnII0dLKuVhyCII4SqZ6R2NlP7wt4Ktgp/AYSUh4UkshHit9uEAFOvml
-SCTpMbnUdT9+38czaJuQ+qT4Tvws3U5CxiDkc+/2v8Fgn5IPfMdXyXFg4jdX5TM=
-=VkyC
+iQEcBAEBAgAGBQJPlShhAAoJEPATRTHh2/q1SSIIAJKAtFn7mdm/HrfTOmhrvPhc
+1GlTSnWeCfj9oTxHbCPW4F2j9eC79wSyOV73NDXvuvdhguob2XQ8JxxL2OtcFyA6
+OTHKFmFE+l6K23DGi7rfNBydjAT474649SsC5+g46brr4ULs7NQjR52a5ZA6PyDt
+/wx/zLZVHL6vc3M1WNkpa7XTsu/UiRvu04xi6BfekpuwvWBa5QWDmpsu6OYL3czn
+49nhnWiIigygXW+iTSY41vHz0uyv9Nk6U82aqBCCVaAfsoaDlVAti/g8wY0pvQG3
+lZBUtjvcJLJ4ykvsJ++KTsVTgusPggQUa5U36+3eXXzdRy6+ovOsCBbHd0LZnVY=
+=oiN9
 -----END PGP SIGNATURE-----
diff --git a/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch b/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch
new file mode 100644
index 000000000000..98d89c555e04
--- /dev/null
+++ b/media-video/mjpg-streamer/files/0_pre20120421-make-var-instead-of-cmd.patch
@@ -0,0 +1,118 @@
+Index: Makefile
+===================================================================
+--- Makefile	(revision 150)
++++ Makefile	(working copy)
+@@ -63,64 +63,64 @@
+ 	chmod 755 $(APP_BINARY)
+ 
+ output_autofocus.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_autofocus all
++	$(MAKE) -C plugins/output_autofocus all
+ 	cp plugins/output_autofocus/output_autofocus.so .
+ 
+ input_testpicture.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_testpicture all
++	$(MAKE) -C plugins/input_testpicture all
+ 	cp plugins/input_testpicture/input_testpicture.so .
+ 
+ 
+ ifeq ($(USE_LIBV4L2),true)
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc USE_LIBV4L2=true all
++	$(MAKE) -C plugins/input_uvc USE_LIBV4L2=true all
+ 	cp plugins/input_uvc/input_uvc.so .
+ else
+ input_uvc.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_uvc all
++	$(MAKE) -C plugins/input_uvc all
+ 	cp plugins/input_uvc/input_uvc.so .
+ endif
+ 
+ input_control.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_control all
++	$(MAKE) -C plugins/input_control all
+ 	cp plugins/input_control/input_control.so .
+ 
+ output_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_file all
++	$(MAKE) -C plugins/output_file all
+ 	cp plugins/output_file/output_file.so .
+ 
+ ifeq ($(WXP_COMPAT),true)
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http -DWXP_COMPAT all
++	$(MAKE) -C plugins/output_http -DWXP_COMPAT all
+ 	cp plugins/output_http/output_http.so .
+ else
+ output_http.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_http all
++	$(MAKE) -C plugins/output_http all
+ 	cp plugins/output_http/output_http.so .
+ endif
+ 
+ output_udp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_udp all
++	$(MAKE) -C plugins/output_udp all
+ 	cp plugins/output_udp/output_udp.so .
+ 
+ input_gspcav1.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_gspcav1 all
++	$(MAKE) -C plugins/input_gspcav1 all
+ 	cp plugins/input_gspcav1/input_gspcav1.so .
+ 
+ input_file.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_file all
++	$(MAKE) -C plugins/input_file all
+ 	cp plugins/input_file/input_file.so .
+ 
+ output_rtsp.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_rtsp all
++	$(MAKE) -C plugins/output_rtsp all
+ 	cp plugins/output_rtsp/output_rtsp.so .
+ 	
+ output_ptp2.so: mjpg_streamer.h utils.h
+-	make -C plugins/input_ptp2 all
++	$(MAKE) -C plugins/input_ptp2 all
+ 	cp plugins/input_ptp2/input_ptp2.so .	
+ 
+ #input_http.so: mjpg_streamer.h utils.h
+-#	make -C plugins/input_http all
++#	$(MAKE) -C plugins/input_http all
+ #	cp plugins/input_http/input_http.so .
+ 
+ # The viewer plugin requires the SDL library for compilation
+@@ -129,22 +129,22 @@
+ # execute the following command:
+ # make output_viewer.so
+ output_viewer.so: mjpg_streamer.h utils.h
+-	make -C plugins/output_viewer all
++	$(MAKE) -C plugins/output_viewer all
+ 	cp plugins/output_viewer/output_viewer.so .
+ 
+ # cleanup
+ clean:
+-	make -C plugins/input_uvc $@
+-	make -C plugins/input_testpicture $@
+-	make -C plugins/output_file $@
+-	make -C plugins/output_http $@
+-	make -C plugins/output_udp $@
+-	make -C plugins/output_autofocus $@
+-	make -C plugins/input_gspcav1 $@
+-	make -C plugins/output_viewer $@
+-	make -C plugins/input_control $@
+-	make -C plugins/output_rtsp $@
+-#	make -C plugins/input_http $@
++	$(MAKE) -C plugins/input_uvc $@
++	$(MAKE) -C plugins/input_testpicture $@
++	$(MAKE) -C plugins/output_file $@
++	$(MAKE) -C plugins/output_http $@
++	$(MAKE) -C plugins/output_udp $@
++	$(MAKE) -C plugins/output_autofocus $@
++	$(MAKE) -C plugins/input_gspcav1 $@
++	$(MAKE) -C plugins/output_viewer $@
++	$(MAKE) -C plugins/input_control $@
++	$(MAKE) -C plugins/output_rtsp $@
++#	$(MAKE) -C plugins/input_http $@
+ 	rm -f *.a *.o $(APP_BINARY) core *~ *.so *.lo
+ 
+ # useful to make a backup "make tgz"
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
new file mode 100644
index 000000000000..360356b0e0c1
--- /dev/null
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild,v 1.1 2012/04/23 10:00:59 aidecoe Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams"
+HOMEPAGE="http://sourceforge.net/projects/mjpg-streamer"
+SRC_URI="http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+INPUT_PLUGINS="input_testpicture input_control input_file input_uvc "
+OUTPUT_PLUGINS="output_file output_udp output_http output_autofocus output_rtsp"
+IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}"
+IUSE="${IUSE_PLUGINS} www v4l"
+REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
+	|| ( ${OUTPUT_PLUGINS} )
+	v4l? ( input_uvc )"
+
+RDEPEND="virtual/jpeg
+	v4l? ( input_uvc? ( media-libs/libv4l ) )"
+DEPEND="${RDEPEND}
+	input_testpicture? ( media-gfx/imagemagick )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch"
+
+	local flag switch
+
+	for flag in ${IUSE_PLUGINS}; do
+		use ${flag} && switch='' || switch='#'
+		sed -i \
+			-e "s|^#*PLUGINS +\?= ${flag}.so|${switch}PLUGINS += ${flag}.so|" \
+			Makefile
+	done
+}
+
+src_compile() {
+	local v4l=$(use v4l && use input_uvc && echo 'USE_LIBV4L2=true')
+	emake ${v4l}
+}
+
+src_install() {
+	into /usr
+	dobin ${PN//-/_}
+	dolib.so *.so
+
+	if use www ; then
+		insinto /usr/share/${PN}
+		doins -r www
+	fi
+
+	dodoc README TODO
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	elog "Remember to set an input and output plugin for mjpg-streamer."
+
+	if use www ; then
+		echo
+		elog "An example webinterface has been installed into"
+		elog "/usr/share/mjpg-streamer/www for your usage."
+	fi
+}