diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2005-09-24 07:16:43 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2005-09-24 07:16:43 +0000 |
| commit | eebf076ef3dd86b6e60224e7204eb8518322d9ee (patch) | |
| tree | e2979697119aaf93bce94bd6f792ed3e2c46259f /media-libs | |
| parent | Stable on ppc64 (diff) | |
| download | gentoo-2-eebf076ef3dd86b6e60224e7204eb8518322d9ee.tar.gz gentoo-2-eebf076ef3dd86b6e60224e7204eb8518322d9ee.tar.bz2 gentoo-2-eebf076ef3dd86b6e60224e7204eb8518322d9ee.zip | |
fix bug #98547 and fix autoreconf mess (ok'd by genstef)
(Portage version: 2.0.52-r1)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/lcms/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/lcms/files/lcms.i.diff | 15 | ||||
| -rw-r--r-- | media-libs/lcms/lcms-1.14-r1.ebuild | 17 |
3 files changed, 28 insertions, 10 deletions
diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog index 0cb1a11f6f9b..d5f10d927b43 100644 --- a/media-libs/lcms/ChangeLog +++ b/media-libs/lcms/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/lcms # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.48 2005/09/19 06:49:07 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.49 2005/09/24 07:16:43 cardoe Exp $ + + 24 Sep 2005; Doug Goldstein <cardoe@gentoo.org> +files/lcms.i.diff, + lcms-1.14-r1.ebuild: + fix bug #98547 and fix autoreconf mess (ok'd by genstef) 19 Sep 2005; Hardave Riar <hardave@gentoo.org> lcms-1.13-r1.ebuild: Stable on mips. diff --git a/media-libs/lcms/files/lcms.i.diff b/media-libs/lcms/files/lcms.i.diff new file mode 100644 index 000000000000..f5968cf0fa5d --- /dev/null +++ b/media-libs/lcms/files/lcms.i.diff @@ -0,0 +1,15 @@ +--- lcms-1.14/python/lcms.i.old 2005-07-10 11:12:20.000000000 +0000 ++++ lcms-1.14/python/lcms.i 2005-07-10 11:12:37.000000000 +0000 +@@ -109,9 +109,9 @@ + return NULL;
+ }
+
+- if ((SWIG_ConvertPtr(tmp[0], (void **) &gamma[0], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;
+- if ((SWIG_ConvertPtr(tmp[1], (void **) &gamma[1], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;
+- if ((SWIG_ConvertPtr(tmp[2], (void **) &gamma[2], SWIGTYPE_LPGAMMATABLE,1)) == -1) return NULL;
++ if ((SWIG_ConvertPtr(tmp[0], (void **) &gamma[0], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;
++ if ((SWIG_ConvertPtr(tmp[1], (void **) &gamma[1], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;
++ if ((SWIG_ConvertPtr(tmp[2], (void **) &gamma[2], SWIGTYPE_p_GAMMATABLE,1)) == -1) return NULL;
+
+ $1 = gamma;
+
diff --git a/media-libs/lcms/lcms-1.14-r1.ebuild b/media-libs/lcms/lcms-1.14-r1.ebuild index e803a040c3ce..a567983480d9 100644 --- a/media-libs/lcms/lcms-1.14-r1.ebuild +++ b/media-libs/lcms/lcms-1.14-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.14-r1.ebuild,v 1.2 2005/09/05 11:43:37 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.14-r1.ebuild,v 1.3 2005/09/24 07:16:43 cardoe Exp $ -inherit libtool gnuconfig +inherit libtool gnuconfig autotools DESCRIPTION="A lightweight, speed optimized color management engine" HOMEPAGE="http://www.littlecms.com/" @@ -26,14 +26,13 @@ src_unpack() { # an updated config.sub for the uclibc env gnuconfig_update || die - # fix build on amd64 cd ${S} - einfo "Running autoreconf..." - use ppc-macos || { - libtoolize --copy --force - aclocal || die "aclocal failed" - autoreconf || die "autoreconf failed" - } + + # fixes bug #98547 + epatch ${FILESDIR}/lcms.i.diff + + # fix build on amd64 + use ppc-macos || eautoreconf || die "autoreconf failed" elibtoolize } |