From c46b97cdad9d9a48e5d075305a8c1ded48b78c81 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 22 Aug 2009 12:56:52 +0000 Subject: Fix building with media-libs/jpeg-7. (Portage version: 2.2_rc38/cvs/Linux x86_64) --- media-libs/netpbm/ChangeLog | 9 +- .../netpbm-10.46.00-min_DCT_v_scaled_size.patch | 14 ++ media-libs/netpbm/netpbm-10.46.00-r1.ebuild | 160 +++++++++++++++++++++ 3 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch create mode 100644 media-libs/netpbm/netpbm-10.46.00-r1.ebuild (limited to 'media-libs') diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 22f8a8af9e7d..ae5be76b402b 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/netpbm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.217 2009/08/09 12:53:43 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.218 2009/08/22 12:56:52 ssuominen Exp $ + +*netpbm-10.46.00-r1 (22 Aug 2009) + + 22 Aug 2009; Samuli Suominen + +netpbm-10.46.00-r1.ebuild, + +files/netpbm-10.46.00-min_DCT_v_scaled_size.patch: + Fix building with media-libs/jpeg-7. 09 Aug 2009; nixnut netpbm-10.46.00.ebuild: ppc stable #277184 diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch new file mode 100644 index 000000000000..a182f92e9793 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch @@ -0,0 +1,14 @@ +jpeg-7 compability + +diff -ur netpbm-10.46.00.orig/converter/ppm/ppmtompeg/jpeg.c netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c +--- netpbm-10.46.00.orig/converter/ppm/ppmtompeg/jpeg.c 2006-10-02 06:42:10.000000000 +0300 ++++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c 2009-08-22 15:41:56.000000000 +0300 +@@ -470,7 +470,7 @@ + #ifdef JPEG4 + buffer_height = 8; /* could be 2, 4,8 rows high */ + #else +- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; ++ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; + #endif + + for(cp=0,compptr = cinfo.comp_info;cp netpbm-${PV}.tar.lzma + eend $? + + einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.lzma" + 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.lzma ]] && 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_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-min_DCT_v_scaled_size.patch + + # glibc2.10 compat (bug 270351) + sed "s:getline:getline_nonlibc:" -i converter/ppm/xvminitoppm.c || die + + epatch "${FILESDIR}"/netpbm-10.31-build.patch + + # avoid ugly depend.mk warnings + touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) + + 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 +} + +src_compile() { + emake -j1 || die +} + +src_install() { + emake -j1 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 -f "${D}"/usr/bin/{doc.url,manweb} || die + rm -r "${D}"/usr/man/web || die + rm -r "${D}"/usr/link || die + rm -f "${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 . + + cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die + doman *.[0-9] + dodoc README* gen-netpbm-manpages +} -- cgit v1.2.3-65-gdbad