diff options
| author |   Amadeusz Żołnowski <aidecoe@gentoo.org> | 2012-04-21 20:20:45 +0000 |
|---|---|---|
| committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2012-04-21 20:20:45 +0000 |
| commit | 58e9bfd18071c5f67976b968a9dc4af0009a2f72 (patch) | |
| tree | 60085d9e7dd0bac5233cedc13b813fd3cfd3d862 /media-video | |
| parent | marked x86 per bug 412983 (diff) | |
| download | historical-58e9bfd18071c5f67976b968a9dc4af0009a2f72.tar.gz historical-58e9bfd18071c5f67976b968a9dc4af0009a2f72.tar.bz2 historical-58e9bfd18071c5f67976b968a9dc4af0009a2f72.zip | |
Proxy commit on behalf of Andrzej Pauli <andrzej.pauli@gmail.com>. Depend
virtual/jpeg instead of media-libs/jpeg. Fixes bug #411931.
Package-Manager: portage-2.1.10.56/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mjpg-streamer/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/mjpg-streamer/Manifest | 20 | ||||
| -rw-r--r-- | media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild | 6 |
3 files changed, 20 insertions, 15 deletions
diff --git a/media-video/mjpg-streamer/ChangeLog b/media-video/mjpg-streamer/ChangeLog index 595a31980d82..a95ee14ba4dd 100644 --- a/media-video/mjpg-streamer/ChangeLog +++ b/media-video/mjpg-streamer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mjpg-streamer -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/ChangeLog,v 1.1 2011/11/17 20:00:39 aidecoe Exp $ +# 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 $ + + 21 Apr 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> + mjpg-streamer-0_pre20110522.ebuild: + Proxy commit on behalf of Andrzej Pauli <andrzej.pauli@gmail.com>. Depend + virtual/jpeg instead of media-libs/jpeg. Fixes bug #411931. *mjpg-streamer-0_pre20110522 (17 Nov 2011) diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index a2a93bec3f0e..019b3154dcf8 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -5,17 +5,17 @@ AUX 0_pre20110522-make-var-instead-of-cmd.patch 3756 RMD160 433b165268fdd4a9493d 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 -EBUILD mjpg-streamer-0_pre20110522.ebuild 1820 RMD160 2f9f5f9b531c4fe49ae7419f2ad36a37b4067b73 SHA1 3024a3774d2917122b3cd656b8066518cbf1daec SHA256 ad3b8940536cbbdd8f1e31b908ad8a852a26aa636eb643ddf3f9cef3bd01f5a6 -MISC ChangeLog 598 RMD160 757d562a1cb3bb43e23329345ec5f8a1c267a280 SHA1 a8fe1dba3a06b5a071addcbf55c9e99749ddfa6b SHA256 35f6b016c1c43712a74775bd8f93dfbd606c1949817811306073ed9c2a6725ba +EBUILD mjpg-streamer-0_pre20110522.ebuild 1817 RMD160 6f6d74f83d7bd0323b569c0c2bf362adad0a0c6e SHA1 63e8c26dc13338d772fab5d8035eed254a7354c0 SHA256 bbbf094ce86fc29dfcedf1a9a217f00640ef27826caabf54d80a831e2fc38ac2 +MISC ChangeLog 832 RMD160 e1d872fe923bcc4f55ca93df6c4e79c5aa86ad30 SHA1 2dab9f69cc9f741326a7a383db2dbeab256c9aa8 SHA256 e4f26fd15230fc073684e260925c7e3a9d164001a63f1a597e7b4c8707cb014d MISC metadata.xml 1823 RMD160 4dcdc175ee80e22547ef024d3aa1853f38dd2819 SHA1 1c9d4b8f56c4ff9926889b0999236d2f0a2a2140 SHA256 0f03a0a6a77e3f643e95c5c578cc031b91825088f2de408d8e10d78ef43823c7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJOxWfsAAoJEPATRTHh2/q1yY8IAKIqRXfT2J84IRMTMxCTF2bM -5BE85CCN5O5s//nHZNzypQ/X8NU38SuRuzz69TdN5yR0BrY4ouhgxqGZQbOPQB4C -wB/GcTruRPEYO9reoYIMZvGt34OQEdVz+/quEau7swFgfGDIvxKTvTIMnba2FnFA -9e05Dwf4LgOSF9SWTovik53pxEAdv8Wwr7ibk8mRnP1ELAYpw1rrk5jqH9g4fPSr -0HwgusTJ2gWEdFq5VrthHm77+3UjHsYZkzVXDCsKjxHR3mFnmE3yVnQypJDRS02s -q18KTbfhz0V8aBFh+PSoX56MGr4IlQVc8aSIj1YvpC3X6tY99H1rKGrp2NdlLdk= -=DAA+ +iQEcBAEBAgAGBQJPkxajAAoJEPATRTHh2/q1W0IH+wcxkxrrSTUXQk2Bs2SVBCl8 +BbiEKgeYqyxUpbXKOSX1NJKUqYZScFiWgxv2iWm6DGcNYLgwIp9XES7B05yFihgq +wRyYagq8jgn42T3dkX2NGinE9NMIac3RKXPsCNGLiUhGJykdox3kHhLmAY1yAL+q +l+fhrSib7lb9KQFhMaRaM3JtHIYjqis1C7NZ0sakdSYKWfU8HC2AN+bNtnCGqX3Z +1CgDtY9prnII0dLKuVhyCII4SqZ6R2NlP7wt4Ktgp/AYSUh4UkshHit9uEAFOvml +SCTpMbnUdT9+38czaJuQ+qT4Tvws3U5CxiDkc+/2v8Fgn5IPfMdXyXFg4jdX5TM= +=VkyC -----END PGP SIGNATURE----- diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild index 157c7fd0c530..5097e192034c 100644 --- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild +++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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_pre20110522.ebuild,v 1.1 2011/11/17 20:00:39 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpg-streamer/mjpg-streamer-0_pre20110522.ebuild,v 1.2 2012/04/21 20:20:45 aidecoe Exp $ EAPI=4 @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) || ( ${OUTPUT_PLUGINS} ) v4l? ( input_uvc )" -RDEPEND="media-libs/jpeg +RDEPEND="virtual/jpeg v4l? ( input_uvc? ( media-libs/libv4l ) )" DEPEND="${RDEPEND} input_testpicture? ( media-gfx/imagemagick )" |