summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenat Lumpau <rl03@gentoo.org>2007-05-26 23:55:43 +0000
committerRenat Lumpau <rl03@gentoo.org>2007-05-26 23:55:43 +0000
commitac925904191c9dfc64d1851e0dbe8294742cd5fa (patch)
tree8c4fafc439766bdf5cdba063492dc34fdce0dae2 /www-misc
parentMigrated to split-ant, style cleanup. (diff)
downloadhistorical-ac925904191c9dfc64d1851e0dbe8294742cd5fa.tar.gz
historical-ac925904191c9dfc64d1851e0dbe8294742cd5fa.tar.bz2
historical-ac925904191c9dfc64d1851e0dbe8294742cd5fa.zip
Fix bugs #175261, #174616.
Package-Manager: portage-2.1.2.8
Diffstat (limited to 'www-misc')
-rw-r--r--www-misc/zoneminder/ChangeLog6
-rw-r--r--www-misc/zoneminder/Manifest28
-rw-r--r--www-misc/zoneminder/files/ffmpeg.patch13
-rw-r--r--www-misc/zoneminder/zoneminder-1.22.3.ebuild5
4 files changed, 37 insertions, 15 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/Manifest b/www-misc/zoneminder/Manifest
index 7f6ae942bc39..a4d2833116f1 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -9,6 +9,10 @@ AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0
MD5 847b42fb080bd720da8854ef46ebcf52 files/conf.d 138
RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c files/conf.d 138
SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c files/conf.d 138
+AUX ffmpeg.patch 314 RMD160 a44b49741362f26770fceea62b93a7fceecb0a6b SHA1 3b935d8530b61fabb5e0411f89911f346ae99161 SHA256 0b404f229edb18a120becf20506c7564d292669ee2478ec407f817c2cd3fc326
+MD5 0a679da981a48d23cc4390418a245e21 files/ffmpeg.patch 314
+RMD160 a44b49741362f26770fceea62b93a7fceecb0a6b files/ffmpeg.patch 314
+SHA256 0b404f229edb18a120becf20506c7564d292669ee2478ec407f817c2cd3fc326 files/ffmpeg.patch 314
AUX init.d 360 RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd SHA1 fa4f08eae4505557e6404c2057fb5a77e7735386 SHA256 cb5fdc937bb0a36f123c07cc043945a2e587e21a98343bb8650029e2a7f469ab
MD5 a657585dda44bd363d478d472d2e63e2 files/init.d 360
RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd files/init.d 360
@@ -26,14 +30,14 @@ MD5 546b6c2bcca5b19ad25dc7762348547a files/zm_create.sql.in.diff 18897
RMD160 bb7dea7b31d81e43da7307a7fe2420bd69c7e90e files/zm_create.sql.in.diff 18897
SHA256 eaa9cfd549f4ff678b934d77a6e43922b028627416bb2a066b30630f93f6e76b files/zm_create.sql.in.diff 18897
DIST ZoneMinder-1.22.3.tar.gz 1258311 RMD160 0752e77333d3eb2f320bb692905eeec9ae7a311e SHA1 4e86dee31acc5f080c8a6f8ce29228b450067201 SHA256 6bee02be8d5e21d3435c17def157a87727330ee6480be3a8fa5b1966cc10a6bc
-EBUILD zoneminder-1.22.3.ebuild 2390 RMD160 a6c1bac44eb836974ffc775758466dc32e56931a SHA1 5a3bb81b4a07fa98e9d17e4d5757ed9a24837436 SHA256 e01613e8f3ce519fd0c6d7e10335c3050363f0a80ba46c6c5d39ad4d4e2f359f
-MD5 04a65ee7139f24fd4e50f36a79978ecb zoneminder-1.22.3.ebuild 2390
-RMD160 a6c1bac44eb836974ffc775758466dc32e56931a zoneminder-1.22.3.ebuild 2390
-SHA256 e01613e8f3ce519fd0c6d7e10335c3050363f0a80ba46c6c5d39ad4d4e2f359f zoneminder-1.22.3.ebuild 2390
-MISC ChangeLog 3916 RMD160 9a6a0ddcbc65027e98b3e4d562ade686b93e4269 SHA1 ba4198c6432cecd65098dbac1f190efbb57c6a57 SHA256 d9c1b8ecb6024103136e7fda3e480209fcd96568c2b09bf2f68b0a1eee761059
-MD5 3e7df3ebb59d6ba132c7b889b86318e7 ChangeLog 3916
-RMD160 9a6a0ddcbc65027e98b3e4d562ade686b93e4269 ChangeLog 3916
-SHA256 d9c1b8ecb6024103136e7fda3e480209fcd96568c2b09bf2f68b0a1eee761059 ChangeLog 3916
+EBUILD zoneminder-1.22.3.ebuild 2416 RMD160 6448cca2ba7ee27db845672a0242de6124255f37 SHA1 b55f513ca7bd449560bfba0b9abf0b4574422701 SHA256 b56546cb76e69faddf3bf23f01ea345c9cfabb8cca815bff239d017764bc9edc
+MD5 56597f002a602ce78181a914b987e3d8 zoneminder-1.22.3.ebuild 2416
+RMD160 6448cca2ba7ee27db845672a0242de6124255f37 zoneminder-1.22.3.ebuild 2416
+SHA256 b56546cb76e69faddf3bf23f01ea345c9cfabb8cca815bff239d017764bc9edc zoneminder-1.22.3.ebuild 2416
+MISC ChangeLog 4040 RMD160 f7b9d8937f81c4e4274c1e86895c2a206102d506 SHA1 addce41c147694834589d35d85bae97c0926432b SHA256 f6ea5de3e8947df5843366744b95cf7197590addc03b1d2316cf02c24c37e1b7
+MD5 6a262254eff44d7f466bd0fc77334bc2 ChangeLog 4040
+RMD160 f7b9d8937f81c4e4274c1e86895c2a206102d506 ChangeLog 4040
+SHA256 f6ea5de3e8947df5843366744b95cf7197590addc03b1d2316cf02c24c37e1b7 ChangeLog 4040
MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -42,9 +46,9 @@ MD5 e2c036752a6417d9cbdf1e71c96cbf34 files/digest-zoneminder-1.22.3 256
RMD160 5c7e662b9729ab86956cf6f89b46a95f5085a953 files/digest-zoneminder-1.22.3 256
SHA256 7496c5e6c8d416931924cb490f539fb4eae1aaf0b72f7ddc4bbd20dffacec571 files/digest-zoneminder-1.22.3 256
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFGJ7B3NQqtfCuFneMRAsC5AJ4q9JwiRXJfkbhSnywkSpsROs6eCgCeMjxk
-xmqvvkeYNdFhwgLOnavMt6Y=
-=Wbd1
+iD8DBQFGWMkIEzitwsaoONoRAvL3AKDVAmpL0FN/rcG6GZ9d2hAd8ZxZsACglZZw
+s2j9nV7ikMr5y1TvyP/VLr8=
+=Y/sh
-----END PGP SIGNATURE-----
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() {