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
commit8bfd71a26d84b3a06828b8866ce94b57f0c455a3 (patch)
treef0db4ede6754b70ac72885db07adfb2666a27976 /media-video/motion
parentFix patch for 4.6.1, bug 301559. (diff)
downloadhistorical-8bfd71a26d84b3a06828b8866ce94b57f0c455a3.tar.gz
historical-8bfd71a26d84b3a06828b8866ce94b57f0c455a3.tar.bz2
historical-8bfd71a26d84b3a06828b8866ce94b57f0c455a3.zip
Rename conflicting type of jpeg_mem_dest for jpeg-8.
Package-Manager: portage-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/Manifest4
-rw-r--r--media-video/motion/motion-3.2.11.1.ebuild10
3 files changed, 16 insertions, 6 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/Manifest b/media-video/motion/Manifest
index f264feedec72..63324495bcdb 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,6 +1,6 @@
AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f685044e26d5fa61bed8fa47340003c3c24 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060
AUX motion.init-r1 708 RMD160 45f70c3c0d91e9669341e274ff81469a889911ae SHA1 1f73b530683397e04646df01da064ba5a1155095 SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857
DIST motion-3.2.11.1.tar.gz 417246 RMD160 dfaa27b73599e375288d9758108c302f3db089a1 SHA1 6e7acea3b27a9e24301e57e066ad5603d41598b2 SHA256 73973e723c39c05cbfc5c2a90357c5dea3078c3162dfc41f303fbf40cda9e403
-EBUILD motion-3.2.11.1.ebuild 1684 RMD160 57656a2a0ca0915bc3bcf989d8eda48290486616 SHA1 0172131a072eaddb893ced3284b91358db4b18a9 SHA256 4dd6ac5c4629168f82227c97b1280f1ce789d3760fbd979b02695776a9e8f492
-MISC ChangeLog 4184 RMD160 43c5f1736d908af27e45d737f9b8d5245c1d7bca SHA1 ab91560e4455afba74dd77d4ccd1c35a37b6ab8f SHA256 9684f058da04f3d5d612aca704b37a3cb9aace79aa06bcc7136e93bf0c33d7b9
+EBUILD motion-3.2.11.1.ebuild 1774 RMD160 d123184c73871007006fd977573a5ed9dcc65f41 SHA1 cdde1b1d43d68e05367f97217c6280fa56c6b07c SHA256 80f412218124118772828375d8ac787715cbde60496b00d8fe6a7213b677ad18
+MISC ChangeLog 4320 RMD160 574b00b29b5554458c8136b1a4f4f3196b1be11b SHA1 1b1a179465eb7191e8676fcec92926ac506e4540 SHA256 5d1e588aa3ba51eb33b38c5a09759a718bc9af5a1419d5c385fa02c76d54ad54
MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
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) \