summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-19 19:17:15 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-19 19:17:15 +0000
commite48a24e2762438bec2ea936c7582c1976122e942 (patch)
tree4ccd4c06f5795c352f484f4646020dc4de113eb2 /media-video/motion
parentFix patch for 4.6.1, bug 301559. (diff)
downloadgentoo-2-e48a24e2762438bec2ea936c7582c1976122e942.tar.gz
gentoo-2-e48a24e2762438bec2ea936c7582c1976122e942.tar.bz2
gentoo-2-e48a24e2762438bec2ea936c7582c1976122e942.zip
Rename conflicting type of jpeg_mem_dest for jpeg-8.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-video/motion')
-rw-r--r--media-video/motion/ChangeLog8
-rw-r--r--media-video/motion/motion-3.2.11.1.ebuild10
2 files changed, 14 insertions, 4 deletions
diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index 3ef38c9e4dca..0845a632375f 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/motion
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.27 2009/10/23 13:00:57 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.28 2010/01/19 19:17:15 ssuominen Exp $
+
+ 19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+ motion-3.2.11.1.ebuild:
+ Rename conflicting type of jpeg_mem_dest for jpeg-8.
23 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
motion-3.2.11.1.ebuild:
diff --git a/media-video/motion/motion-3.2.11.1.ebuild b/media-video/motion/motion-3.2.11.1.ebuild
index f364d4497e5a..970a8b9f80c2 100644
--- a/media-video/motion/motion-3.2.11.1.ebuild
+++ b/media-video/motion/motion-3.2.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.11.1.ebuild,v 1.2 2009/10/23 13:00:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.11.1.ebuild,v 1.3 2010/01/19 19:17:15 ssuominen Exp $
EAPI=2
inherit eutils
@@ -25,6 +25,12 @@ pkg_setup() {
enewuser motion -1 -1 -1 video
}
+src_prepare() {
+ sed -i \
+ -e 's:jpeg_mem_dest:_jpeg_mem_dest:g' \
+ picture.c || die
+}
+
src_configure() {
econf \
$(use_with v4l) \