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.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

3 files changed, 13 insertions, 18 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/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
 }