diff options
| author |   Renat Lumpau <rl03@gentoo.org> | 2007-05-26 23:55:43 +0000 |
|---|---|---|
| committer | Renat Lumpau <rl03@gentoo.org> | 2007-05-26 23:55:43 +0000 |
| commit | 980029e809bc583c814f82135ff74c92055029ae (patch) | |
| tree | 6eb5a45cfa413b406fd3bdae0901740e0811d871 /www-misc | |
| parent | Migrated to split-ant, style cleanup. (diff) | |
| download | gentoo-2-980029e809bc583c814f82135ff74c92055029ae.tar.gz gentoo-2-980029e809bc583c814f82135ff74c92055029ae.tar.bz2 gentoo-2-980029e809bc583c814f82135ff74c92055029ae.zip | |
Fix bugs #175261, #174616.
(Portage version: 2.1.2.8)
Diffstat (limited to 'www-misc')
| -rw-r--r-- | www-misc/zoneminder/ChangeLog | 6 | ||||
| -rw-r--r-- | www-misc/zoneminder/files/ffmpeg.patch | 13 | ||||
| -rw-r--r-- | www-misc/zoneminder/zoneminder-1.22.3.ebuild | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog index 14390cd289ee..2a52b6b04b77 100644 --- a/www-misc/zoneminder/ChangeLog +++ b/www-misc/zoneminder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-misc/zoneminder # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.21 2007/04/19 18:09:52 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.22 2007/05/26 23:55:43 rl03 Exp $ + + 26 May 2007; Renat Lumpau <rl03@gentoo.org> +files/ffmpeg.patch, + zoneminder-1.22.3.ebuild: + Fix bugs #175261, #174616. 19 Apr 2007; Christian Faulhammer <opfer@gentoo.org> zoneminder-1.22.3.ebuild: diff --git a/www-misc/zoneminder/files/ffmpeg.patch b/www-misc/zoneminder/files/ffmpeg.patch new file mode 100644 index 000000000000..75750c72dae7 --- /dev/null +++ b/www-misc/zoneminder/files/ffmpeg.patch @@ -0,0 +1,13 @@ +--- src/zm_mpeg.h.orig 2007-04-17 02:31:07.000000000 +0100 ++++ src/zm_mpeg.h 2007-04-17 02:32:01.000000000 +0100 +@@ -24,7 +24,10 @@ + #ifndef ZM_MPEG_H + #define ZM_MPEG_H + ++extern "C" { ++#define __STDC_CONSTANT_MACROS + #include <ffmpeg/avformat.h> ++} + + #if FFMPEG_VERSION_INT == 0x000408 + #define ZM_FFMPEG_048 1 diff --git a/www-misc/zoneminder/zoneminder-1.22.3.ebuild b/www-misc/zoneminder/zoneminder-1.22.3.ebuild index 22708943c488..162cbae364ae 100644 --- a/www-misc/zoneminder/zoneminder-1.22.3.ebuild +++ b/www-misc/zoneminder/zoneminder-1.22.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.2 2007/04/19 18:09:52 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.3.ebuild,v 1.3 2007/05/26 23:55:43 rl03 Exp $ inherit eutils webapp autotools depend.php depend.apache @@ -37,7 +37,7 @@ DEPEND=" " want_apache -need_php_httpd +need_php RDEPEND="mpeg? ( media-video/ffmpeg ) media-libs/netpbm @@ -56,6 +56,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/Makefile.am.patch epatch ${FILESDIR}/zm_create.sql.in.diff + epatch ${FILESDIR}/ffmpeg.patch } src_compile() { |