diff options
| -rw-r--r-- | media-libs/netpbm/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch | 15 | ||||
| -rw-r--r-- | media-libs/netpbm/netpbm-10.51.00.ebuild | 166 |
3 files changed, 189 insertions, 1 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index a75d7bd0761c..1524dc989607 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.243 2010/07/23 20:52:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.244 2010/09/18 14:03:58 vapier Exp $ + +*netpbm-10.51.00 (18 Sep 2010) + + 18 Sep 2010; Mike Frysinger <vapier@gentoo.org> +netpbm-10.51.00.ebuild, + +files/netpbm-10.51.00-ppmtompeg-free.patch: + Version bump to fix warnings in older code #337747 by David J Cozatt. Fix + parallel build issues with include dir handling #149843 by Jiri Tyr. 23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> netpbm-10.49.00.ebuild: diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch new file mode 100644 index 000000000000..ee5be69c14c5 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch @@ -0,0 +1,15 @@ +addedSourceP is a pointer to a struct declared on the stack, so we cant +call free() on it + +e-mailed to upstream maintainer already + +--- converter/ppm/ppmtompeg/param.c ++++ converter/ppm/ppmtompeg/param.c +@@ -295,7 +295,6 @@ mergeInputSource(struct inputSource * co + baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] = + addedSourceP->inputFileEntries[i]; + +- free(addedSourceP); + /* Note the space allocated for the *addedSourceP input file + entries themselves is still allocated, and used by + *baseSourceP. diff --git a/media-libs/netpbm/netpbm-10.51.00.ebuild b/media-libs/netpbm/netpbm-10.51.00.ebuild new file mode 100644 index 000000000000..cf7d2dd07470 --- /dev/null +++ b/media-libs/netpbm/netpbm-10.51.00.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00.ebuild,v 1.1 2010/09/18 14:03:58 vapier Exp $ + +EAPI="3" + +inherit toolchain-funcs eutils multilib + +DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" +HOMEPAGE="http://netpbm.sourceforge.net/" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib" + +RDEPEND="jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + tiff? ( >=media-libs/tiff-3.5.5 ) + png? ( >=media-libs/libpng-1.4 ) + xml? ( dev-libs/libxml2 ) + zlib? ( sys-libs/zlib ) + svga? ( media-libs/svgalib ) + jbig? ( media-libs/jbigkit ) + rle? ( media-libs/urt ) + X? ( x11-libs/libX11 )" +DEPEND="${RDEPEND} + sys-devel/flex + app-arch/xz-utils" + +maint_pkg_create() { + local base="/usr/local/src" + local srcdir="${base}/netpbm/release_number" + if [[ -d ${srcdir} ]] ; then + cd "${T}" || die + + ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}" + svn export -q ${srcdir}/${PV} netpbm-${PV} + eend $? || return 1 + + ebegin "Creating netpbm-${PV}.tar.xz" + tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz + eend $? + + einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz" + else + einfo "You need to run:" + einfo " cd ${base}" + einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm" + die "need svn checkout dir" + fi +} +pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; } + +netpbm_libtype() { + case ${CHOST} in + *-darwin*) echo dylib;; + *) echo unixshared;; + esac +} +netpbm_libsuffix() { + local suffix=$(get_libname) + echo ${suffix//\.} +} +netpbm_ldshlib() { + case ${CHOST} in + *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; + *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; + esac +} +netpbm_config() { + if use $1 ; then + [[ $2 != "!" ]] && echo -l${2:-$1} + else + echo NONE + fi +} + +src_prepare() { + epatch "${FILESDIR}"/netpbm-10.31-build.patch + epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch + + # make sure we use system urt + echo all: > urt/Makefile || die + + # take care of the importinc stuff ourselves by only doing it once + # at the top level and having all subdirs use that one set #149843 + sed -i \ + -e '/^importinc:/s|^|importinc:\nmanual_|' \ + -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ + common.mk || die + + # avoid ugly depend.mk warnings + touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) +} + +src_configure() { + cat config.mk.in /dev/stdin >> config.mk <<-EOF + # Misc crap + BUILD_FIASCO = N + SYMLINK = ln -sf + + # Toolchain options + CC = $(tc-getCC) -Wall + LD = \$(CC) + CC_FOR_BUILD = $(tc-getBUILD_CC) + LD_FOR_BUILD = \$(CC_FOR_BUILD) + AR = $(tc-getAR) + RANLIB = $(tc-getRANLIB) + + STRIPFLAG = + CFLAGS_SHLIB = -fPIC + + LDRELOC = \$(LD) -r + LDSHLIB = $(netpbm_ldshlib) + LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to + LINKERISCOMPILER = Y + NETPBMLIBSUFFIX = $(netpbm_libsuffix) + NETPBMLIBTYPE = $(netpbm_libtype) + + # Gentoo build options + TIFFLIB = $(netpbm_config tiff) + JPEGLIB = $(netpbm_config jpeg) + PNGLIB = $(netpbm_config png) + ZLIB = $(netpbm_config zlib z) + LINUXSVGALIB = $(netpbm_config svga vga) + XML2_LIBS = $(netpbm_config xml xml2) + JBIGLIB = -ljbig + JBIGHDR_DIR = $(netpbm_config jbig "!") + JASPERLIB = -ljasper + JASPERHDR_DIR = $(netpbm_config jpeg2k "!") + URTLIB = $(netpbm_config rle) + URTHDR_DIR = + X11LIB = $(netpbm_config X X11) + X11HDR_DIR = + EOF + # cannot chain the die with the heredoc above as bash-3 + # has a parser bug in that setup #282902 + [ $? -eq 0 ] || die "writing config.mk failed" +} + +src_compile() { + emake -j1 pm_config.h version.h manual_importinc || die #149843 + emake || die +} + +src_install() { + emake package pkgdir="${D}"/usr || die "make package failed" + + [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) + + # Remove cruft that we don't need, and move around stuff we want + rm "${D}"/usr/bin/{doc.url,manweb} || die + rm -r "${D}"/usr/man/web || die + rm -r "${D}"/usr/link || die + rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die + dodir /usr/share + mv "${D}"/usr/man "${D}"/usr/share/ || die + mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die + + dodoc README + cd doc + GLOBIGNORE='*.html:.*' dodoc * + dohtml -r . +} |