diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2006-10-04 01:25:13 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2006-10-04 01:25:13 +0000 |
| commit | 3a6f731bd41682c7e5d08e12a682dcae46eb22f4 (patch) | |
| tree | 03ed8eeaa523262b9005cea8061294773badca66 /media-libs/libmng | |
| parent | Install icon in the right place (diff) | |
| download | gentoo-2-3a6f731bd41682c7e5d08e12a682dcae46eb22f4.tar.gz gentoo-2-3a6f731bd41682c7e5d08e12a682dcae46eb22f4.tar.bz2 gentoo-2-3a6f731bd41682c7e5d08e12a682dcae46eb22f4.zip | |
Fix compiling with USE='-jpeg'. without-jpeg didn't really remove the depend.
(Portage version: 2.1.2_pre2-r1)
Diffstat (limited to 'media-libs/libmng')
| -rw-r--r-- | media-libs/libmng/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch | 13 | ||||
| -rw-r--r-- | media-libs/libmng/libmng-1.0.9.ebuild | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog index a1961d42e958..9f02a84ed146 100644 --- a/media-libs/libmng/ChangeLog +++ b/media-libs/libmng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmng # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.36 2006/04/14 11:33:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.37 2006/10/04 01:25:13 cardoe Exp $ + + 04 Oct 2006; Doug Goldstein <cardoe@gentoo.org> + +files/libmng-1.0.9-jpeg-compile.patch, libmng-1.0.9.ebuild: + Fix compiling with USE='-jpeg'. without-jpeg didn't really remove the depend. 14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libmng-1.0.9.ebuild: Don't provide zlib useflag as it's an hard-dependency, bug #129928. diff --git a/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch b/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch new file mode 100644 index 000000000000..59b27ac25232 --- /dev/null +++ b/media-libs/libmng/files/libmng-1.0.9-jpeg-compile.patch @@ -0,0 +1,13 @@ +--- libmng_conf.h 2006-10-03 05:11:10.000000000 -0400 ++++ libmng_conf.h.new 2006-10-03 05:11:03.000000000 -0400 +@@ -94,6 +94,10 @@ + so choose the one you've defined in jconfig.h; if you don't know what
+ the heck I'm talking about, just leave it at 8-bit support (thank you!) */
+
++#ifndef HAVE_LIBJPEG
++#define MNG_NO_INCLUDE_JNG
++#endif
++
+ #ifndef MNG_NO_INCLUDE_JNG
+ #ifdef MNG_SUPPORT_FULL /* full support includes JNG */
+ #define MNG_SUPPORT_IJG6B
diff --git a/media-libs/libmng/libmng-1.0.9.ebuild b/media-libs/libmng/libmng-1.0.9.ebuild index 0be50d912fab..2e0f5edfb2e5 100644 --- a/media-libs/libmng/libmng-1.0.9.ebuild +++ b/media-libs/libmng/libmng-1.0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.9.ebuild,v 1.2 2006/04/14 11:33:33 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.9.ebuild,v 1.3 2006/10/04 01:25:13 cardoe Exp $ inherit autotools @@ -21,6 +21,8 @@ src_unpack() { unpack ${A} cd "${S}" + #Fixes issue with compiling without JPEG support + epatch "${FILESDIR}"/${P}-jpeg-compile.patch ln -s makefiles/configure.in . ln -s makefiles/Makefile.am . |