diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2003-10-02 07:39:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2003-10-02 07:39:53 +0000 |
| commit | 437f6a70267b3bd67150910554e98f3ddf60fe5e (patch) | |
| tree | e67509707022237022e1ca3fdc16fdcffadd5bad /media-libs | |
| parent | Removed duplicate IUSE line. Chaneged tcl IUSE flag to tcltk. (diff) | |
| download | gentoo-2-437f6a70267b3bd67150910554e98f3ddf60fe5e.tar.gz gentoo-2-437f6a70267b3bd67150910554e98f3ddf60fe5e.tar.bz2 gentoo-2-437f6a70267b3bd67150910554e98f3ddf60fe5e.zip | |
fix jpeg support #23648
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libgd/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/libgd/libgd-1.8.4-r2.ebuild | 26 |
2 files changed, 22 insertions, 14 deletions
diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog index a488d5f661f5..7d0e7437d033 100644 --- a/media-libs/libgd/ChangeLog +++ b/media-libs/libgd/ChangeLog @@ -1,12 +1,16 @@ # ChangeLog for media-libs/libgd # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.32 2003/07/09 23:22:57 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.33 2003/10/02 07:39:53 vapier Exp $ + +*libgd-1.8.4-r2 (30 Jun 2003) + + 02 Oct 2003; Mike Frysinger <vapier@gentoo.org> : + Make jpeg support optional again and fix it so that it'll actually + compile when jpeg is not present #23648. 10 Jul 2003; Christian Birchinger <joker@gentoo.org> libgd-1.8.4-r2.ebuild: Added sparc stable keyword -*libgd-1.8.4-r2 (30 Jun 2003) - 06 Jul 2003; Guy Martin <gmsoft@gentoo.org> libgd-1.8.4-r2.ebuild : Marked stable on hppa. diff --git a/media-libs/libgd/libgd-1.8.4-r2.ebuild b/media-libs/libgd/libgd-1.8.4-r2.ebuild index 5936192fc932..6bda7875c0a9 100644 --- a/media-libs/libgd/libgd-1.8.4-r2.ebuild +++ b/media-libs/libgd/libgd-1.8.4-r2.ebuild @@ -1,20 +1,20 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.5 2003/08/14 19:20:13 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.6 2003/10/02 07:39:53 vapier Exp $ MY_P=${P/lib/} S=${WORKDIR}/${MY_P} DESCRIPTION="A graphics library for fast image creation" -SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz" HOMEPAGE="http://www.boutell.com/gd/" +SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz" -SLOT="0" LICENSE="as-is | BSD" -KEYWORDS="x86 ~ppc sparc hppa amd64" -IUSE="X truetype freetype-version-1" +SLOT="0" +KEYWORDS="x86 ppc sparc hppa amd64" +IUSE="X truetype freetype-version-1 jpeg" DEPEND="media-libs/libpng - media-libs/jpeg + jpeg? ( media-libs/jpeg ) X? ( virtual/x11 ) freetype-version-1? ( =media-libs/freetype-1* ) : ( truetype? ( =media-libs/freetype-2* ) )" @@ -34,9 +34,13 @@ src_unpack() { use X \ && compopts="${compopts} -DHAVE_XPM" \ && libsopts="${libsopts} -lXpm -lX11" + use jpeg \ + && compopts="${compopts} -DHAVE_LIBJPEG" \ + && libsopts="${libsopts} -ljpeg" \ + || epatch ${FILESDIR}/${PV}-jpeg-inc.patch - compopts="${compopts} -DHAVE_LIBPNG -DHAVE_LIBJPEG" - libsopts="${libsopts} -lpng -ljpeg" + compopts="${compopts} -DHAVE_LIBPNG" + libsopts="${libsopts} -lpng" if [ `use freetype-version-1` ] ; then compopts="${compopts} -DHAVE_LIBTTF" @@ -48,12 +52,12 @@ src_unpack() { incopts="-I/usr/include/freetype2" fi - mv Makefile Makefile.old || die - sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \ + sed -i \ + -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \ -e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \ -e "s:^\(INCLUDEDIRS\)=:\1=${incopts} :" \ -e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \ - Makefile.old > Makefile || die + Makefile || die } src_compile() { |