summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-09-06 16:32:23 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-09-06 16:32:23 +0000
commit6370e2c86d3bcd90eeba5cd8b7013653a21d4eae (patch)
tree28e5c3caf2f295b8d54b498e9a6c7b1ce6dde7ac /media-video
parentFixing my comments (rephrasing, clarifying). (diff)
downloadgentoo-2-6370e2c86d3bcd90eeba5cd8b7013653a21d4eae.tar.gz
gentoo-2-6370e2c86d3bcd90eeba5cd8b7013653a21d4eae.tar.bz2
gentoo-2-6370e2c86d3bcd90eeba5cd8b7013653a21d4eae.zip
Added missing m4-files for autoconf, solves Bug #117091.
(Portage version: 2.1.1_rc1-r5)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mjpegtools/ChangeLog6
-rw-r--r--media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r13
-rw-r--r--media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild15
3 files changed, 18 insertions, 6 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 90379f95c130..e011031c69cf 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mjpegtools
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.118 2006/08/28 21:16:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.119 2006/09/06 16:32:23 zzam Exp $
+
+ 06 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+ mjpegtools-1.8.0-r1.ebuild:
+ Added missing m4-files for autoconf, solves Bug #117091.
28 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
files/mjpegtools-1.8.0-as-needed.patch:
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r1
index af09364e891a..8846d158be9f 100644
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r1
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r1
@@ -1,3 +1,6 @@
MD5 6fd98362310480bdaf7171e9659f165f mjpegtools-1.8.0.tar.gz 1475998
RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 mjpegtools-1.8.0.tar.gz 1475998
SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a mjpegtools-1.8.0.tar.gz 1475998
+MD5 cd55f55ddd646eb79d4e4df99d4c777f mjpegtools-m4-1.tar.bz2 4547
+RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 mjpegtools-m4-1.tar.bz2 4547
+SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522 mjpegtools-m4-1.tar.bz2 4547
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
index fdf1209c94ba..c84c5d342d76 100644
--- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.18 2006/08/25 13:45:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.19 2006/09/06 16:32:23 zzam Exp $
inherit flag-o-matic toolchain-funcs eutils libtool autotools
DESCRIPTION="Tools for MJPEG video"
HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
+ mirror://gentoo/${PN}-m4-1.tar.bz2"
LICENSE="as-is"
SLOT="1"
@@ -39,8 +40,7 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
- cd "${S}"
- sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+ cd ${S}
epatch "${FILESDIR}/${P}-gcc41.patch"
epatch "${FILESDIR}/${P}-parallelmake.patch"
@@ -50,7 +50,12 @@ src_unpack() {
# eautoreconf instead of elibtoolize
# as pkg-config-patch changes configure.in
- eautoreconf
+ #
+ # use m4-files from additional tarball as mjpegtools the fails if
+ # package providing m4-file is not installed
+ AT_M4DIR=${WORKDIR}/m4 eautoreconf
+
+ sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
}
src_compile() {