| 1 |
loki_val 08/06/29 15:57:17 |
| 2 |
|
| 3 |
Modified: zoneminder-1.23.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 www-misc/zoneminder/zoneminder-1.23.3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: zoneminder-1.23.3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- zoneminder-1.23.3.ebuild 17 May 2008 07:40:13 -0000 1.2 |
| 22 |
+++ zoneminder-1.23.3.ebuild 29 Jun 2008 15:57:17 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.23.3.ebuild,v 1.2 2008/05/17 07:40:13 wrobel Exp $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
inherit eutils autotools depend.php depend.apache multilib |
| 30 |
|
| 31 |
@@ -40,7 +40,7 @@ |
| 32 |
X10? ( dev-perl/X10 )" |
| 33 |
|
| 34 |
RDEPEND="dev-perl/DBD-mysql |
| 35 |
- ffmpeg? ( media-video/ffmpeg ) |
| 36 |
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) |
| 37 |
media-libs/netpbm" |
| 38 |
|
| 39 |
# we cannot use need_httpd_cgi here, since we need to setup permissions for the |
| 40 |
@@ -60,9 +60,11 @@ |
| 41 |
|
| 42 |
epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch |
| 43 |
epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch |
| 44 |
- epatch "${FILESDIR}"/${PATCH_PV}/zm_mpeg_ofc.patch |
| 45 |
epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera.patch |
| 46 |
- |
| 47 |
+ sed -i \ |
| 48 |
+ -e 's:ffmpeg/avformat.h:libavformat/avformat.h:' \ |
| 49 |
+ -e 's:ffmpeg/swscale.h:libswscale/swscale.h:' \ |
| 50 |
+ src/zm_mpeg.h || die "404. File not found sedding src/zmpeg.h" |
| 51 |
eautoreconf |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.27 www-misc/zoneminder/ChangeLog |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?rev=1.27&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?rev=1.27&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/zoneminder/ChangeLog?r1=1.26&r2=1.27 |
| 62 |
|
| 63 |
Index: ChangeLog |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v |
| 66 |
retrieving revision 1.26 |
| 67 |
retrieving revision 1.27 |
| 68 |
diff -u -r1.26 -r1.27 |
| 69 |
--- ChangeLog 17 May 2008 07:40:13 -0000 1.26 |
| 70 |
+++ ChangeLog 29 Jun 2008 15:57:17 -0000 1.27 |
| 71 |
@@ -1,6 +1,12 @@ |
| 72 |
# ChangeLog for www-misc/zoneminder |
| 73 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.26 2008/05/17 07:40:13 wrobel Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.27 2008/06/29 15:57:17 loki_val Exp $ |
| 76 |
+ |
| 77 |
+ 29 Jun 2008; Peter Alfredsen <loki_val@g.o> |
| 78 |
+ -files/1.23.1/zm_mpeg_ofc.patch, zoneminder-1.23.3.ebuild: |
| 79 |
+ Fix compatibility with ffmpeg-0.4.9_p20080326 with judicious sedding. Drop |
| 80 |
+ patch which caused build error against 0.4.9_p20080326. Raise deps to |
| 81 |
+ >=ffmpeg-0.4.9_p20080326. Fixes bug #228731. |
| 82 |
|
| 83 |
17 May 2008; wrobel@g.o -files/postinstall-2.txt, |
| 84 |
-files/Makefile.am.patch, -files/ffmpeg.patch, -files/postupgrade.txt, |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
-- |
| 89 |
gentoo-commits@l.g.o mailing list |
Archives