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

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.4 x86_64)

4 files changed, 116 insertions, 1 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/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"
+}