diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-19 10:19:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-19 10:19:51 +0000 |
| commit | eaf1d9be0b2518bd4cacfc25e5dd312db3d731c4 (patch) | |
| tree | 482e33ce1439730d7d04045b003d1289a5fe0ed7 /media-video/mjpegtools | |
| parent | Stable on alpha. (diff) | |
| download | gentoo-2-eaf1d9be0b2518bd4cacfc25e5dd312db3d731c4.tar.gz gentoo-2-eaf1d9be0b2518bd4cacfc25e5dd312db3d731c4.tar.bz2 gentoo-2-eaf1d9be0b2518bd4cacfc25e5dd312db3d731c4.zip | |
Add patch to build with GCC 4.1, thanks to Christian Schmidt in bug #116014.
(Portage version: 2.1_pre1)
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch | 12 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild | 11 |
3 files changed, 21 insertions, 8 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 5d4969ea8e94..622bfabc31ac 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mjpegtools # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.102 2005/12/17 14:20:19 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.103 2005/12/19 10:19:51 flameeyes Exp $ + + 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/mjpegtools-1.8.0-gcc41.patch, mjpegtools-1.8.0-r1.ebuild: + Add patch to build with GCC 4.1, thanks to Christian Schmidt in bug #116014. 17 Dec 2005; Luca Barbato <lu_zero@gentoo.org> -mjpegtools-1.8.0.ebuild: Cleanup diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch new file mode 100644 index 000000000000..77d556f3ff07 --- /dev/null +++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-gcc41.patch @@ -0,0 +1,12 @@ +diff -ur mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh mjpegtools-1.8.0/y4mdenoise/Region2D.hh +--- mjpegtools-1.8.0-orig/y4mdenoise/Region2D.hh 2005-12-19 12:36:54.000000000 +0300 ++++ mjpegtools-1.8.0/y4mdenoise/Region2D.hh 2005-12-19 12:44:36.000000000 +0300 +@@ -16,7 +16,7 @@ + + #include "Status_t.h" + #include <iostream> +- ++#include <cassert> + + + // The 2-dimensional region class. Parameterized by the numeric type diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild index e664c4956c36..710b6d206756 100644 --- a/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild @@ -1,10 +1,8 @@ # Copyright 1999-2005 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.4 2005/12/12 05:06:17 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r1.ebuild,v 1.5 2005/12/19 10:19:51 flameeyes Exp $ -inherit flag-o-matic toolchain-funcs eutils - -M4V="1" +inherit flag-o-matic toolchain-funcs eutils autotools DESCRIPTION="Tools for MJPEG video" HOMEPAGE="http://mjpeg.sourceforge.net/" @@ -43,9 +41,8 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} ; cd ${S} - libtoolize --copy --force -# ACLOCAL="aclocal -I ${WORKDIR}/m4" autoreconf || die - + eautoreconf + epatch "${FILESDIR}/${P}-gcc41.patch" } src_compile() { |