Version bump. Fixed bug #515406 on behalf of

ChaosEngine <andrzej.pauli@gmail.com>.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

3 files changed, 202 insertions, 2 deletions

diff --git a/media-video/mjpg-streamer/ChangeLog b/media-video/mjpg-streamer/ChangeLog
index e35b76671ecd..230f73fda17c 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.7 2013/03/17 16:05:48 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.8 2014/07/03 07:49:40 aidecoe Exp $
+
+*mjpg-streamer-0_pre20120621 (03 Jul 2014)
+
+  03 Jul 2014; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +mjpg-streamer-0_pre20120621.ebuild,
+  +files/0_pre20120621-make-var-instead-of-cmd.patch:
+  Version bump. Fixed bug #515406 on behalf of
+  ChaosEngine <andrzej.pauli@gmail.com>.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
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
new file mode 100644
index 000000000000..98d89c555e04
--- /dev/null
+++ b/media-video/mjpg-streamer/files/0_pre20120621-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_pre20120621.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
new file mode 100644
index 000000000000..5fdaec7f2b06
--- /dev/null
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 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_pre20120621.ebuild,v 1.1 2014/07/03 07:49:40 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="input_testpicture input_control +input_file input_uvc output_file
+	output_udp +output_http output_autofocus output_rtsp
+	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
+}