version bump for bug #227053 and add compatibility with older ffmpegs

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.4 x86_64

5 files changed, 131 insertions, 2 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index 5072a2223371..03aec2c1dc46 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/motion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.17 2008/05/21 16:06:38 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.18 2008/06/20 21:47:08 aballier Exp $
+
+*motion-3.2.10.1 (20 Jun 2008)
+
+  20 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/motion-3.2.10.1-asneeded.patch,
+  +files/motion-3.2.10.1-ffmpegheaders.patch, +motion-3.2.10.1.ebuild:
+  version bump for bug #227053 and add compatibility with older ffmpegs
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> motion-3.2.4.ebuild,
   motion-3.2.7.ebuild, motion-3.2.8.ebuild, motion-3.2.9.ebuild:
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index f07700fb8b15..c54e781cb97b 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,15 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX motion-3.2.10.1-asneeded.patch 515 RMD160 72fbbe9a29e69d90cccd1edbb2ebdce6ea92562c SHA1 1bda4644836e38ae2ee845087660fc1b45bcdb88 SHA256 01d548e78ed55e4d8feb455fc07db664dfd3bb0135dca1e43996d5bb8dd03099
+AUX motion-3.2.10.1-ffmpegheaders.patch 1214 RMD160 d26ace539af3325e50bbab6daa6c57cc5a79c096 SHA1 0021b8a18edeed99e396e956c75116ed9041da57 SHA256 3ded0b20d8078eed4ae42a3263106aaa06537733283ae8044664b116dd75a9f2
 AUX motion-3.2.4-ffmpeg-compat.patch 570 RMD160 8196c62502a34a67b5a8d3d506786c8261915b2a SHA1 17b70e25088c189ff5c53a12f15387558c39995a SHA256 43a2a19e3497b01c56f507dabe99cb6dd223c806b20120fcc4ffc015825eeb6e
 AUX motion-3.2.9-asneeded.patch 523 RMD160 baff2978ccd2f2caf6259b6d5c0fda41f23d3bb5 SHA1 3d60d68444091c03510cfa3ea6fbd513410d6562 SHA256 9896658b5e4a4026f791071a3f801a250180a08697262228a3cedca019f71dae
 AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f685044e26d5fa61bed8fa47340003c3c24 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060
 AUX motion.init 664 RMD160 3905bf9523552872d40fa90f688e4cd1e66bd422 SHA1 bcf900c4ec4df0e916ce363f87e030d4080cdc8b SHA256 a4b66f9f56e8eda645538a92937deb0031667970afb35d03cd2205c0bfc22fcc
 AUX motion.init-r1 708 RMD160 45f70c3c0d91e9669341e274ff81469a889911ae SHA1 1f73b530683397e04646df01da064ba5a1155095 SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857
+DIST motion-3.2.10.1.tar.gz 402788 RMD160 c22ec64c176166519c76d12c6ab792f93d7dd707 SHA1 57cd8c5bdcf7c4d49e46fa3201630a018e67dcca SHA256 2798b2a5e4d248244d5f40cce32dfb0f027e103dd8469a800b6b934467bf6117
 DIST motion-3.2.4.tar.gz 360850 RMD160 09687750161ba37bda6f96d7722d6023b143afd4 SHA1 736b66540b68ed0bf74035bda89c376b29cde14e SHA256 31b862c9bafc3b1682627ca6e93bf8aa4559ec7f0385f0bf6dbceb91afee3530
 DIST motion-3.2.7.tar.gz 370830 RMD160 aaab6b7b993bbf7cc0911b1ea127060a97b81aae SHA1 b0ed252e05f1ff2051df3875dd1a8d0445be45ff SHA256 9ae4e8145b367d9ff0ffd607da597aee3439d23939f3ee28268bc831f71252f2
 DIST motion-3.2.8.tar.gz 394005 RMD160 d110a37ef0f943e07c19a2e43a86577d4a038eb3 SHA1 5b01f10f812cc8bb7878f398ca0f510a737e74da SHA256 8f695660380edf94cdbe7e580a3146bf8c20bcfe3a47643eb9de95e49f691889
 DIST motion-3.2.9.tar.gz 377075 RMD160 47708b7dbd9b63f7709ad3f6f40754eb7d82b134 SHA1 1417529f8c49bdf922caa7d0c746c4a2277fe34a SHA256 de452dc1530d078b29b5a39a909d7483c5b857df3f48c3cef73765a37e98f20c
+EBUILD motion-3.2.10.1.ebuild 1947 RMD160 ca57f7bfb6a3626af2296d9dc6ffb73c5786dc37 SHA1 eb1d64d804472a0938ac6155d8e7358c711471d7 SHA256 6cbfc7c2a8210f2ba55c12f701cc8900054105cebca7850eb53072ee6cad0477
 EBUILD motion-3.2.4.ebuild 1546 RMD160 fe7d95be365897d81c51fe178a92bfa3b8ec735e SHA1 81ceaa4fa9b9b1449e83cd883ce352729191ee08 SHA256 cd8b5125a5f5f502706f204ef8d1bdca72e4ce9ab70e110d4c37a50d10e25e0b
 EBUILD motion-3.2.7.ebuild 1488 RMD160 6cc54fb1c35933f450decf44db5391e643306b74 SHA1 2f8b024605cf89169d070cae54c5dec27ce63b95 SHA256 bed847974dff96aead9c8341750dbb92079314dd7cc51e87fdd53aa38d1def5d
 EBUILD motion-3.2.8.ebuild 1462 RMD160 38ca06e679d513de8eee49c54f2061f6cdea3522 SHA1 fe31d14444b9ea1361e5993f15c4b0cfa5b6343f SHA256 0155714dc2632f6d8a763e5712b71944739e7c7f7e22ed0f45b19e340e784e19
 EBUILD motion-3.2.9.ebuild 2009 RMD160 50f9f68766cdf564706518954f193db99be3b018 SHA1 2329b9e98c87c19e60debf101925f63cbdf4956e SHA256 f1d159a2b8f361d52e5f9b49ad8c83712828911c6ac8a27ee3971f2eae73a1b8
-MISC ChangeLog 2603 RMD160 25f115dc90336ea52929148c46a6320e5a7f06c9 SHA1 387576343dcffd79f6d334790e7c349545b101a5 SHA256 55b08dd5911e8921ef112e43bbd1fcdc0151d8030b56ab9ee93ca2a5fa2a94ea
+MISC ChangeLog 2872 RMD160 ab7705823ba7f5c762229314683ab86508f3266f SHA1 94fd644e2c879737f793ddc22c5c19bd58d0b846 SHA256 84bd17e8f977ddc4efe0d93e46194aed3a60e8a9b06f7b6ea533fd3aec765102
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhcJbwACgkQvFcC4BYPU0pQIQCdGvWCSmdySg+457pV5FhysQte
+fmwAnAyby3kmdqGA24zH52Qp6jYyi+t0
+=CKMT
+-----END PGP SIGNATURE-----
diff --git a/media-video/motion/files/motion-3.2.10.1-asneeded.patch b/media-video/motion/files/motion-3.2.10.1-asneeded.patch
new file mode 100644
index 000000000000..2c0bbf23ad80
--- /dev/null
+++ b/media-video/motion/files/motion-3.2.10.1-asneeded.patch
@@ -0,0 +1,13 @@
+Index: motion-3.2.10.1/configure.in
+===================================================================
+--- motion-3.2.10.1.orig/configure.in
++++ motion-3.2.10.1/configure.in
+@@ -303,7 +303,7 @@ if test x$MJPEG_HEADER1_SUPPORT != xyes 
+    LDFLAGS=$TEMP_LDFLAGS  
+ 	
+    AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ 
+-		TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg"
++		TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg"
+ 		MJPEG_SUPPORT="yes"
+ 		TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
+                  ], , -lmjpegutils)
diff --git a/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch b/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch
new file mode 100644
index 000000000000..717749e57695
--- /dev/null
+++ b/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch
@@ -0,0 +1,23 @@
+Index: motion-3.2.10.1/configure.in
+===================================================================
+--- motion-3.2.10.1.orig/configure.in
++++ motion-3.2.10.1/configure.in
+@@ -415,12 +415,18 @@ if test "${FFMPEG_OK}" = "found"; then
+ 	elif test -f ${FFMPEG}/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/avformat.h)
+ 		FFMPEG_CFLAGS="-I${FFMPEG}"
++	elif test -f ${FFMPEG}/libavformat/avformat.h; then
++		AC_MSG_RESULT(found ${FFMPEG}/libavformat/avformat.h)
++		FFMPEG_CFLAGS="-I${FFMPEG}/libavformat -I${FFMPEG}/libavutil"
+ 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/include/avformat.h)
+ 		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include"
+ 	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then
+ 		AC_MSG_RESULT(found ${FFMPEG}/include/ffmpeg/avformat.h)
+ 		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg"
++	elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then
++		AC_MSG_RESULT(found ${FFMPEG}/include/libavformat/avformat.h)
++		FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/libavformat -I`AS_DIRNAME([${FFMPEG}])`/include/libavutil"
+ 	else
+ 		AC_MSG_RESULT(not found)
+ 		FFMPEG_OK="no_found"
diff --git a/media-video/motion/motion-3.2.10.1.ebuild b/media-video/motion/motion-3.2.10.1.ebuild
new file mode 100644
index 000000000000..548888b26c9f
--- /dev/null
+++ b/media-video/motion/motion-3.2.10.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.10.1.ebuild,v 1.1 2008/06/20 21:47:08 aballier Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Motion is a video motion detector with tracking-support for webcams."
+HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="ffmpeg mysql postgres v4l"
+
+DEPEND="sys-libs/zlib
+	media-libs/jpeg
+	media-video/mjpegtools
+	ffmpeg? ( media-video/ffmpeg )
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-server )"
+
+pkg_setup() {
+	enewuser motion -1 -1 -1 "video" || die "failed to create motion user"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-ffmpegheaders.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf --without-optimizecpu \
+		$(use_with v4l) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with ffmpeg)
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# Install init script.
+	newinitd "${FILESDIR}"/motion.init-r1 motion
+	newconfd "${FILESDIR}"/motion.confd motion
+
+	# Create correct dir for motion.pid
+	dodir /var/run/motion
+	fowners motion:video /var/run/motion
+	fperms 750 /var/run/motion
+	keepdir /var/run/motion
+
+	# Rename configuration file.
+	mv "${D}"/etc/motion-dist.conf "${D}"/etc/motion.conf
+
+	# Remove dummy documentation and install it using ebuild functions.
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc CHANGELOG CODE_STANDARD CREDITS FAQ README README.FreeBSD *.conf
+	dohtml *.html
+}
+
+pkg_postinst() {
+	elog "You need to setup /etc/motion.conf before running"
+	elog "motion for the first time. You can install motion"
+	elog "detection as a service, use:"
+	elog "rc-update add motion default"
+}