Fix compatibility with ffmpeg-0.4.9_p20080326 with judicious sedding. Drop patch which caused build error against 0.4.9_p20080326. Raise deps to >=ffmpeg-0.4.9_p20080326. Fixes bug #228731.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 15 insertions, 31 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 6586f7c05c15..48ade8b47819 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.26 2008/05/17 07:40:13 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.27 2008/06/29 15:57:17 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/1.23.1/zm_mpeg_ofc.patch, zoneminder-1.23.3.ebuild:
+  Fix compatibility with ffmpeg-0.4.9_p20080326 with judicious sedding. Drop
+  patch which caused build error against 0.4.9_p20080326. Raise deps to
+  >=ffmpeg-0.4.9_p20080326. Fixes bug #228731.
 
   17 May 2008; wrobel@gentoo.org -files/postinstall-2.txt,
   -files/Makefile.am.patch, -files/ffmpeg.patch, -files/postupgrade.txt,
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index abb78eb87cb1..1dd0e21c56b1 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.23.1/Makefile.am.patch 899 RMD160 2ffe9cbb75d433353769759d55580be9d0d8ccd8 SHA1 84024eb973f86e28d0fefa40c9a233f90c52a262 SHA256 301f23e57099c6841601017aed5a834a2ffc5e95a4b2f7e273272d4b11344ac3
 AUX 1.23.1/zm_create.sql.in.patch 19013 RMD160 076dbeb30a4758e4ff708139e40302d6db7ac3f0 SHA1 cc8d2874e4eb382e081e84ff35491f23cb7ba2e1 SHA256 2f60f8f27e9d670859a8dfa5c30e45279a663a40227d9a259b11262e7f97b0d7
-AUX 1.23.1/zm_mpeg_ofc.patch 381 RMD160 cd7be2d702f4df9c425142fdaec393c1517dff1c SHA1 40f2639e8a90f068dae9d4ec1ecd64ab980c2d8d SHA256 1af8db1736a373ea38ff7ece376e37233c28aee3925b93fd72991979e71ba3eb
 AUX 1.23.1/zm_remote_camera.patch 1551 RMD160 03024108ba012b7e39620ed950b96df1c4ab63f3 SHA1 cfda28aa3a17c8dda9d5e7dc014dda6a81b5a0a1 SHA256 fdce259c8bbe18bde09c99c270e8615531f4340db98eb28461177b2b305ed097
 AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1 9c834372d5bab84fe3e368be94bd951c2122ed7a SHA256 96306fd39bcffeaf15db4309b8f5f08e54a2409029f92d4a84b6f3e42f05434f
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 360 RMD160 64806288a9d6365ac08d007db84e5ec37fbd1dcd SHA1 fa4f08eae4505557e6404c2057fb5a77e7735386 SHA256 cb5fdc937bb0a36f123c07cc043945a2e587e21a98343bb8650029e2a7f469ab
 DIST ZoneMinder-1.23.3.tar.gz 764528 RMD160 cf04dcd61891a5b8b1a30d738a8b1274ecefad70 SHA1 aaca4fb26b2f09d57b1901f49c538d7e46963254 SHA256 76cba999bf602b1d561921cfcbbf7a9eab64370f349a0b389efff75f4b0c3af2
-EBUILD zoneminder-1.23.3.ebuild 3536 RMD160 f782863fba24cdb52242aadad0c7937b931a861b SHA1 ee30a1a121614feb246291d482f59ad786984609 SHA256 d375988802790394bb1d9216d9f92194fe6c89efcb550d99185f45dcada26b1d
-MISC ChangeLog 5006 RMD160 7f1d0ac24735f7cb20236b938af1736cd743301b SHA1 74fe6cbe148d86600872b025a4d653f1280f866b SHA256 ec7f1ed2897148672303ff88a9bc4e78fdfc77f6fb479f700162c0dd885efd58
+EBUILD zoneminder-1.23.3.ebuild 3681 RMD160 2bfc9bb3226ca032a2679ce2f9fba2123e9c470d SHA1 84b29491e67e70925734f4adb8249f77a43b6a4c SHA256 f6105b76ec21c3326a1f846d5936c63ff6e038d6622fdcfe1e21b77ae2e3476e
+MISC ChangeLog 5319 RMD160 9510ea954c35d5573f3cb5f7ed6f09ded204cd61 SHA1 3fbe9cf5345921630233569a5376d07f08510c36 SHA256 5d0174729cd5d65661fcfeb5f8c5407792570c2ab33db01b00a3508694b0d997
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFILowCEEcxCpcDQ74RAqn7AJ9Qra/jDjVOyf1usr5QHX06ygHQsgCeJAX0
-UeVi0nfxRNufs5iLhxMhnPA=
-=Y669
------END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/1.23.1/zm_mpeg_ofc.patch b/www-misc/zoneminder/files/1.23.1/zm_mpeg_ofc.patch
deleted file mode 100644
index 214be411e2cf..000000000000
--- a/www-misc/zoneminder/files/1.23.1/zm_mpeg_ofc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ZoneMinder-1.23.1/src/zm_mpeg.cpp
-===================================================================
---- ZoneMinder-1.23.1.orig/src/zm_mpeg.cpp
-+++ ZoneMinder-1.23.1/src/zm_mpeg.cpp
-@@ -278,7 +278,7 @@ VideoStream::~VideoStream()
- 	{
- 		/* close the output file */
- #if ZM_FFMPEG_SVN
--		url_fclose(ofc->pb);
-+		url_fclose(&ofc->pb);
- #else
- 		url_fclose(&ofc->pb);
- #endif
diff --git a/www-misc/zoneminder/zoneminder-1.23.3.ebuild b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
index 3c48418fa21b..7c91f83ea89e 100644
--- a/www-misc/zoneminder/zoneminder-1.23.3.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.23.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.2 2008/05/17 07:40:13 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.3 2008/06/29 15:57:17 loki_val Exp $
 
 inherit eutils autotools depend.php depend.apache multilib
 
@@ -40,7 +40,7 @@ DEPEND="app-admin/sudo
 	X10? ( dev-perl/X10 )"
 
 RDEPEND="dev-perl/DBD-mysql
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
 	media-libs/netpbm"
 
 # we cannot use need_httpd_cgi here, since we need to setup permissions for the
@@ -60,9 +60,11 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
-	epatch "${FILESDIR}"/${PATCH_PV}/zm_mpeg_ofc.patch
 	epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera.patch
-
+	sed -i \
+		-e 's:ffmpeg/avformat.h:libavformat/avformat.h:' \
+		-e 's:ffmpeg/swscale.h:libswscale/swscale.h:' \
+		src/zm_mpeg.h || die "404. File not found sedding src/zmpeg.h"
 	eautoreconf
 }