diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-06-24 23:37:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-24 23:37:00 +0000 |
| commit | 32f8efe17eca5b51bd547a9b9be21d9afd6fa155 (patch) | |
| tree | 930b08e1248e0fd023361102cc7909e67cbbbce3 /media-libs | |
| parent | Removed man3pm pages for good. Removed gentoo pods finally :) (diff) | |
| download | gentoo-2-32f8efe17eca5b51bd547a9b9be21d9afd6fa155.tar.gz gentoo-2-32f8efe17eca5b51bd547a9b9be21d9afd6fa155.tar.bz2 gentoo-2-32f8efe17eca5b51bd547a9b9be21d9afd6fa155.zip | |
Add support for USE=xml #137871 by Stefan Trenker.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.34-xml2.patch | 47 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.34.ebuild | 7 |
3 files changed, 57 insertions, 3 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 7c7dcd47afb0..e9360884abcb 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.122 2006/06/24 18:09:25 killerfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.123 2006/06/24 23:37:00 vapier Exp $ + + 24 Jun 2006; Mike Frysinger <vapier@gentoo.org> + +files/netpbm-10.34-xml2.patch, netpbm-10.34.ebuild: + Add support for USE=xml #137871 by Stefan Trenker. 24 Jun 2006; Rene Nussbaumer <killerfox@gentoo.org> netpbm-10.34.ebuild: Stable on hppa. See bug #137344. diff --git a/media-libs/netpbm/files/netpbm-10.34-xml2.patch b/media-libs/netpbm/files/netpbm-10.34-xml2.patch new file mode 100644 index 000000000000..db9efef3a5e1 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.34-xml2.patch @@ -0,0 +1,47 @@ +http://bugs.gentoo.org/137871 + +--- converter/other/Makefile ++++ converter/other/Makefile +@@ -7,14 +7,6 @@ + + include $(BUILDDIR)/Makefile.config + +-ifeq ($(shell xml2-config --version),) +- XML2_LIBS=NONE +- XML2_CFLAGS=NONE +-else +- XML2_LIBS=$(shell xml2-config --libs) +- XML2_CFLAGS=$(shell xml2-config --cflags) +-endif +- + SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg + ifneq ($(BUILD_FIASCO), N) + SUBDIRS += fiasco +@@ -101,7 +93,7 @@ + BINARIES += pnmtops + endif + +-ifneq ($(XML2LIBS),NONE) ++ifneq ($(XML2_LIBS),NONE) + BINARIES += svgtopam + endif + +--- Makefile.config.in ++++ Makefile.config.in +@@ -419,6 +419,16 @@ + ZHDR_DIR = + #ZLIB = libz.so + ++# The XML2 library ++ ++ifeq ($(shell xml2-config --version),) ++ XML2_LIBS=NONE ++ XML2_CFLAGS=NONE ++else ++ XML2_LIBS=$(shell xml2-config --libs) ++ XML2_CFLAGS=$(shell xml2-config --cflags) ++endif ++ + # The JBIG lossless image compression library (aka JBIG-KIT): + + JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a diff --git a/media-libs/netpbm/netpbm-10.34.ebuild b/media-libs/netpbm/netpbm-10.34.ebuild index 48e409f6039f..6b3f950d2b83 100644 --- a/media-libs/netpbm/netpbm-10.34.ebuild +++ b/media-libs/netpbm/netpbm-10.34.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/netpbm/netpbm-10.34.ebuild,v 1.6 2006/06/24 18:09:25 killerfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.34.ebuild,v 1.7 2006/06/24 23:37:00 vapier Exp $ inherit flag-o-matic toolchain-funcs eutils multilib @@ -13,11 +13,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd" -IUSE="svga jpeg tiff png zlib" +IUSE="svga jpeg tiff png xml zlib" DEPEND="jpeg? ( >=media-libs/jpeg-6b ) tiff? ( >=media-libs/tiff-3.5.5 ) png? ( >=media-libs/libpng-1.2.1 ) + xml? ( dev-libs/libxml2 ) zlib? ( sys-libs/zlib ) svga? ( media-libs/svgalib ) media-libs/jbigkit @@ -50,6 +51,7 @@ src_unpack() { epatch "${FILESDIR}"/netpbm-10.31-build.patch epatch "${FILESDIR}"/netpbm-10.33-memmem.patch + epatch "${FILESDIR}"/netpbm-10.34-xml2.patch #137871 rm -f configure cp Makefile.config.in Makefile.config @@ -75,6 +77,7 @@ src_unpack() { PNGLIB = $(netpbm_config png) ZLIB = $(netpbm_config zlib z) LINUXSVGALIB = $(netpbm_config svga vga) + XML2_LIBS = $(netpbm_config xml xml2) # Use system versions instead of bundled JBIGLIB = -ljbig |