summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mjpg-streamer/ChangeLog6
-rw-r--r--media-video/mjpg-streamer/Manifest18
-rw-r--r--media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild6
3 files changed, 17 insertions, 13 deletions
diff --git a/media-video/mjpg-streamer/ChangeLog b/media-video/mjpg-streamer/ChangeLog
index 258e9e1d9c8c..1cae96fada92 100644
--- a/media-video/mjpg-streamer/ChangeLog
+++ b/media-video/mjpg-streamer/ChangeLog
@@ -1,6 +1,10 @@
# 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.4 2012/04/23 10:04:27 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.5 2012/06/28 07:31:28 aidecoe Exp $
+
+ 28 Jun 2012; Amadeusz Żołnowski <aidecoe@gentoo.org>
+ mjpg-streamer-0_pre20120421.ebuild:
+ Default USE: input_file and output_http.
*mjpg-streamer-0_pre20120421 (23 Apr 2012)
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 7ca4d3890982..9b5ff05df671 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -8,17 +8,17 @@ AUX mjpg-streamer.initd 1369 RMD160 210ef19f88b9b2272c4b529dc048d6c6130d63f7 SHA
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
-EBUILD mjpg-streamer-0_pre20120421.ebuild 1817 RMD160 c0966f32399d7b678a55abdf02880dcf52a37905 SHA1 a26b5889946954cb322fde20a6e9ca0d03d62256 SHA256 477899c54b388141b449f30942a39c0233372f356723754d754178494432ef30
-MISC ChangeLog 1133 RMD160 06db98385c77aa140ad17a094b44d91cb30bb3e6 SHA1 96b2743911bd4d2f56f7b644bec4b80441c102b4 SHA256 cd88858ca2101d6403f6c866843677b3a6fbb01c358353efe82e6b7702c8fb4d
+EBUILD mjpg-streamer-0_pre20120421.ebuild 1841 RMD160 0ef0773ab1770c513a838ca350209e5d480b7b67 SHA1 98c5792be16bf7ba2d8239731c17d125435bc5c2 SHA256 f7084622fcb1826952af07707c1a9077565115e7a4b1425eb851341818921b77
+MISC ChangeLog 1272 RMD160 11ba68cba01540d7b333d3f2c1e302bf4b5ec647 SHA1 958200a9b9a96a11f3aae7e2e93f8f907b040440 SHA256 e025cc6727d33ed168386ca7f961db44c2d5fbc25ad33273c56d56a6b0ee92b8
MISC metadata.xml 1823 RMD160 4dcdc175ee80e22547ef024d3aa1853f38dd2819 SHA1 1c9d4b8f56c4ff9926889b0999236d2f0a2a2140 SHA256 0f03a0a6a77e3f643e95c5c578cc031b91825088f2de408d8e10d78ef43823c7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBAgAGBQJPlSkwAAoJEPATRTHh2/q1YZ4H/R7yNRb3SZK0MDvRKBnQUcAH
-AuqRyUOxmJJyIKZF78zFhoI6yrPDIY/u/aeleaVLmLE9Ek6vumEY7OX1mIvlKDeY
-PXRhlyAp2ZI5oABeWPGe0knuURPq+CnYedV3kM0GjLYBMo78q82VGDAo9/hk+6mX
-4cOazgBp91vswmDmmFwLgDX92KqH6FSpEags9LCgGuvH9rthxxKY+BeyAYXWASvJ
-v9aD2kjV9pffPZi69XF6rYrRvT8MHrp00wj+WmPCzAX+EFsB8zcmsHBzxFC8YDBt
-4gALM8AoZpyPm96bHBVL89fCZGwwPeIinTnq8fMpKlJ/j0AyyF1xxEerFhhAhFw=
-=K5VS
+iQEcBAEBAgAGBQJP7AhVAAoJEPATRTHh2/q1RhYH/22DgzXWTT+XXpl06ShduT2p
+guHZC1Ziv5BZpYyKhtyNiJXCXDRYbCKnh7Ghi1oH08KTRbBe8dKqoptXWfqAjDtE
+5zl8nhjX6Gf7yLXuxfqJcuh99gZqWoDmuYjwyX2YmH5t/LrMTw+8d44H6I1hMRMo
+GJS+eDfUq8IC18Qh7mngZZg2CXMtngwD/CMJH7qVabAGNCyu149O6hao1IMUnrOz
+0TQlvPEA+E81ckcmnrpAcdrIby4Au4gGMKt1BubDpAapGdB+tU0jyplxieqRtaFO
+mfwYkIYaQXTZjOiKbst3Dp0iwB53KHxJx467hFb+mVjrXxheIYswrQGWP/FEt/Y=
+=RTk/
-----END PGP SIGNATURE-----
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
index 360356b0e0c1..173913061340 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/mjpg-streamer-0_pre20120421.ebuild,v 1.2 2012/06/28 07:31:28 aidecoe Exp $
EAPI=4
@@ -14,9 +14,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-INPUT_PLUGINS="input_testpicture input_control input_file input_uvc "
+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_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS} +input_file +output_http"
IUSE="${IUSE_PLUGINS} www v4l"
REQUIRED_USE="|| ( ${INPUT_PLUGINS} )
|| ( ${OUTPUT_PLUGINS} )