diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-04-26 20:02:12 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-04-26 20:02:12 +0000 |
| commit | 3f8060e36b5f3bc73886ec5975fb77166928a8c1 (patch) | |
| tree | f3ef26799dd2f7f462dd7bef34cc5d09b327345a /www-misc | |
| parent | Bump, #506318 (diff) | |
| download | gentoo-2-3f8060e36b5f3bc73886ec5975fb77166928a8c1.tar.gz gentoo-2-3f8060e36b5f3bc73886ec5975fb77166928a8c1.tar.bz2 gentoo-2-3f8060e36b5f3bc73886ec5975fb77166928a8c1.zip | |
Add useflag for curl, fix useflag for vlc, enable mmap by default
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'www-misc')
| -rw-r--r-- | www-misc/zoneminder/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/zoneminder/metadata.xml | 3 | ||||
| -rw-r--r-- | www-misc/zoneminder/zoneminder-1.27.0.ebuild | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog index 6cb075fdc0df..fb9d150dddbc 100644 --- a/www-misc/zoneminder/ChangeLog +++ b/www-misc/zoneminder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/zoneminder # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.43 2014/04/25 14:43:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.44 2014/04/26 20:02:12 dilfridge Exp $ + + 26 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org> + zoneminder-1.27.0.ebuild, metadata.xml: + Add useflag for curl, fix useflag for vlc, enable mmap by default *zoneminder-1.27.0 (25 Apr 2014) diff --git a/www-misc/zoneminder/metadata.xml b/www-misc/zoneminder/metadata.xml index bd56d97e7ada..43505767f2c0 100644 --- a/www-misc/zoneminder/metadata.xml +++ b/www-misc/zoneminder/metadata.xml @@ -6,8 +6,9 @@ <name>Andreas K. Huettel</name> </maintainer> <use> + <flag name="curl">Enable using net-misc/curl for streaming from cameras</flag> <flag name="gcrypt">...</flag> - <flag name="vlc">...</flag> + <flag name="vlc">Enable using media-libs/vlc for streaming from cameras</flag> <flag name="openssl">...</flag> </use> </pkgmetadata> diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild index 0422a642d718..3b31be3a653a 100644 --- a/www-misc/zoneminder/zoneminder-1.27.0.ebuild +++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.27.0.ebuild,v 1.1 2014/04/25 14:43:39 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.27.0.ebuild,v 1.2 2014/04/26 20:02:12 dilfridge Exp $ # TO DO: # * ffmpeg support can be disabled in CMakeLists.txt but it does not build then @@ -29,7 +29,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="gcrypt gnutls mmap +openssl vlc" +IUSE="curl gcrypt gnutls +mmap +openssl vlc" SLOT="0" REQUIRED_USE=" @@ -51,6 +51,7 @@ DEPEND=" virtual/perl-Getopt-Long virtual/perl-Sys-Syslog virtual/perl-Time-HiRes + curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt ) gnutls? ( net-libs/gnutls ) mmap? ( dev-perl/Sys-Mmap ) @@ -89,7 +90,8 @@ src_configure() { $(cmake-utils_useno mmap ZM_NO_MMAP) -DZM_NO_X10=OFF -DZM_NO_FFMPEG=OFF - $(cmake-utils_useno vlc ZM_NO_VLC) + $(cmake-utils_useno curl ZM_NO_CURL) + $(cmake-utils_useno vlc ZM_NO_LIBVLC) $(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL) $(cmake-utils_use_has gnutls) $(cmake-utils_use_has gcrypt) |