diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-03-29 16:17:31 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-29 16:17:31 +0000 |
commit | ad0f5551ba6734ebe045f168554046635b24e8b2 (patch) | |
tree | f4a513f03137726d857bfb3b70487d7eed9dbcc1 /media-libs | |
parent | amd64 stable (diff) | |
download | gentoo-2-ad0f5551ba6734ebe045f168554046635b24e8b2.tar.gz gentoo-2-ad0f5551ba6734ebe045f168554046635b24e8b2.tar.bz2 gentoo-2-ad0f5551ba6734ebe045f168554046635b24e8b2.zip |
old
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/netpbm/files/netpbm-10.26.45-headers.patch | 229 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-10.26.49.ebuild | 113 | ||||
-rw-r--r-- | media-libs/netpbm/netpbm-10.26.50.ebuild | 112 |
3 files changed, 0 insertions, 454 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.26.45-headers.patch b/media-libs/netpbm/files/netpbm-10.26.45-headers.patch deleted file mode 100644 index 2542ebb9cd23..000000000000 --- a/media-libs/netpbm/files/netpbm-10.26.45-headers.patch +++ /dev/null @@ -1,229 +0,0 @@ ---- netpbm-10.26.37/buildtools/typegen.c -+++ netpbm-10.26.37/buildtools/typegen.c -@@ -28,6 +28,7 @@ - -----------------------------------------------------------------------------*/ - #include <stdio.h> - #include <unistd.h> -+#include <stdlib.h> - - - ---- netpbm-10.26.37/converter/other/pamtohdiff.c -+++ netpbm-10.26.37/converter/other/pamtohdiff.c -@@ -14,6 +14,7 @@ - - ******************************************************************************/ - #include <stdio.h> -+#include <string.h> - - #include "pam.h" - #include "shhopt.h" ---- netpbm-10.26.37/converter/other/fiasco/binerror.c -+++ netpbm-10.26.37/converter/other/fiasco/binerror.c -@@ -25,6 +25,7 @@ - #include "config.h" - - #include <stdio.h> -+#include <stdlib.h> - - #if STDC_HEADERS - # include <stdarg.h> ---- netpbm-10.26.37/converter/other/fiasco/codec/coeff.c -+++ netpbm-10.26.37/converter/other/fiasco/codec/coeff.c -@@ -14,6 +14,8 @@ - * $State: Exp $ - */ - -+#include <string.h> -+ - #include "config.h" - - #include "types.h" ---- netpbm-10.26.37/converter/other/fiasco/codec/dfiasco.c -+++ netpbm-10.26.37/converter/other/fiasco/codec/dfiasco.c -@@ -14,6 +14,8 @@ - * $State: Exp $ - */ - -+#include <string.h> -+ - #include "config.h" - - #include "types.h" ---- netpbm-10.26.37/converter/other/pnmtoxwd.c -+++ netpbm-10.26.37/converter/other/pnmtoxwd.c -@@ -10,6 +10,8 @@ - ** implied warranty. - */ - -+#include <string.h> -+ - #include "pnm.h" - #include "shhopt.h" - #include "mallocvar.h" ---- netpbm-10.26.37/converter/other/pnmtopalm/palmtopnm.c -+++ netpbm-10.26.37/converter/other/pnmtopalm/palmtopnm.c -@@ -10,6 +10,7 @@ - ******************************************************************************/ - - #include <assert.h> -+#include <string.h> - - #include "pnm.h" - #include "shhopt.h" ---- netpbm-10.26.37/converter/other/pnmtopalm/pnmtopalm.c -+++ netpbm-10.26.37/converter/other/pnmtopalm/pnmtopalm.c -@@ -14,6 +14,7 @@ - #include <stdio.h> - #include <assert.h> - #include <limits.h> -+#include <string.h> - - #include "pnm.h" - #include "palm.h" ---- netpbm-10.26.37/converter/other/hdifftopam.c -+++ netpbm-10.26.37/converter/other/hdifftopam.c -@@ -7,6 +7,7 @@ - By Bryan Henderson, San Jose, CA 2002.04.15. - ******************************************************************************/ - #include <stdio.h> -+#include <string.h> - - #include "pam.h" - #include "shhopt.h" ---- netpbm-10.26.37/converter/ppm/ppmtoterm.c -+++ netpbm-10.26.37/converter/ppm/ppmtoterm.c -@@ -19,6 +19,7 @@ - ** - */ - -+#include <string.h> - #include "ppm.h" - #include "shhopt.h" - ---- netpbm-10.26.37/other/pamstack.c -+++ netpbm-10.26.37/other/pamstack.c -@@ -12,6 +12,8 @@ - Contributed to the public domain by its author 2002.05.05. - -----------------------------------------------------------------------------*/ - -+#include <string.h> -+ - #include "pam.h" - #include "shhopt.h" - ---- netpbm-10.26.37/other/pamarith.c -+++ netpbm-10.26.37/other/pamarith.c -@@ -13,6 +13,8 @@ - ** implied warranty. - */ - -+#include <string.h> -+ - #include "pam.h" - #include "shhopt.h" - ---- netpbm-10.26.37/other/pamchannel.c -+++ netpbm-10.26.37/other/pamchannel.c -@@ -11,6 +11,8 @@ - Contributed to the public domain by its author 2000.08.05. - -----------------------------------------------------------------------------*/ - -+#include <string.h> -+ - #include "pam.h" - #include "shhopt.h" - #include "mallocvar.h" ---- netpbm-10.26.37/editor/pamditherbw.c -+++ netpbm-10.26.37/editor/pamditherbw.c -@@ -11,6 +11,7 @@ - =============================================================================*/ - - #include <assert.h> -+#include <string.h> - #include "pam.h" - #include "dithers.h" - #include "mallocvar.h" ---- netpbm-10.26.37/editor/pnmsmooth.c -+++ netpbm-10.26.37/editor/pnmsmooth.c -@@ -23,6 +23,7 @@ - #define _BSD_SOURCE 1 - /* This makes sure that mkstemp() is in unistd.h */ - -+#include <string.h> - #include <unistd.h> - #include <sys/wait.h> - #include "pnm.h" ---- netpbm-10.26.37/generator/ppmwheel.c -+++ netpbm-10.26.37/generator/ppmwheel.c -@@ -13,6 +13,8 @@ - ** implied warranty. - */ - -+#include <string.h> -+ - #include "ppm.h" - #include <math.h> - ---- netpbm-10.26.37/converter/other/fiasco/input/basis.c -+++ netpbm-10.26.37/converter/other/fiasco/input/basis.c -@@ -14,6 +14,8 @@ - * $State: Exp $ - */ - -+#include <string.h> -+ - #include "config.h" - - #include "types.h" ---- netpbm-10.26.37/converter/other/pnmtotiffcmyk.c -+++ netpbm-10.26.37/converter/other/pnmtotiffcmyk.c -@@ -58,6 +58,7 @@ - /* On AIX, _XOPEN_SOURCE keeps inttypes.h from conflicting with tiffio.h */ - #define _XOPEN_SOURCE - -+#include <string.h> - #include "pnm.h" - #include <math.h> - /* float.h used to be included only if __osf__ was defined. On some ---- netpbm-10.26.37/analyzer/pnmpsnr.c -+++ netpbm-10.26.37/analyzer/pnmpsnr.c -@@ -10,6 +10,7 @@ - - #include <stdio.h> - #include <math.h> -+#include <string.h> - - #include "pam.h" - ---- netpbm-10.26.37/editor/pnmpad.c -+++ netpbm-10.26.37/editor/pnmpad.c -@@ -11,6 +11,7 @@ - */ - - #include <stdio.h> -+#include <string.h> - #include "pnm.h" - #include "shhopt.h" - #include "mallocvar.h" ---- netpbm-10.26.37/generator/pbmpage.c -+++ netpbm-10.26.37/generator/pbmpage.c -@@ -15,6 +15,7 @@ - #include <math.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include "pbm.h" - - /* Support both US and A4. */ ---- netpbm-10.26.37/converter/other/fiasco/input/mc.c -+++ netpbm-10.26.37/converter/other/fiasco/input/mc.c -@@ -15,6 +15,8 @@ - * $State: Exp $ - */ - -+#include <stdlib.h> -+ - #include "config.h" - - #include "types.h" diff --git a/media-libs/netpbm/netpbm-10.26.49.ebuild b/media-libs/netpbm/netpbm-10.26.49.ebuild deleted file mode 100644 index c6806f1ca085..000000000000 --- a/media-libs/netpbm/netpbm-10.26.49.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.49.ebuild,v 1.3 2008/02/09 22:54:18 vapier Exp $ - -inherit flag-o-matic toolchain-funcs eutils multilib - -MAN_VER=10.30 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz - mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips s390 sh sparc x86" -IUSE="svga jpeg tiff png zlib" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b ) - tiff? ( >=media-libs/tiff-3.5.5 ) - png? ( >=media-libs/libpng-1.2.1 ) - zlib? ( sys-libs/zlib ) - svga? ( media-libs/svgalib ) - media-libs/jbigkit - media-libs/jasper - media-libs/urt" - -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 '-dynamiclib -install_name $(SONAME)';; - *) echo '-shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - use $1 && echo -l${2:-$1} || echo NONE -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/netpbm-10.30-build.patch - epatch "${FILESDIR}"/netpbm-10.26.45-headers.patch - - rm -f configure - cp Makefile.config.in Makefile.config - cat >> Makefile.config <<-EOF - # Gentoo toolchain options - CC = $(tc-getCC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - NETPBMLIBTYPE = $(netpbm_libtype) - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - LDSHLIB = $(netpbm_ldshlib) - - # 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) - - # Use system versions instead of bundled - JBIGLIB = -ljbig - JBIGHDR_DIR = - JASPERLIB = -ljasper - JASPERHDR_DIR = - URTLIB = -lrle - URTHDR_DIR = - EOF - - # Sparc support ... - replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc" - replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9" -} - -src_install() { - make 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/include/shhopt.h - rm -f "${D}"/usr/bin/{doc.url,manweb} - rm -rf "${D}"/usr/man/web - rm -rf "${D}"/usr/link - rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} - dodir /usr/share - mv "${D}"/usr/man "${D}"/usr/share/ - mv "${D}"/usr/misc "${D}"/usr/share/netpbm - - dodoc README - cd doc - GLOBIGNORE='*.html:.*' dodoc * - dohtml -r . - - cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die - doman *.[0-9] - dodoc README* gen-netpbm-manpages -} diff --git a/media-libs/netpbm/netpbm-10.26.50.ebuild b/media-libs/netpbm/netpbm-10.26.50.ebuild deleted file mode 100644 index a8ec205633a1..000000000000 --- a/media-libs/netpbm/netpbm-10.26.50.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.26.50.ebuild,v 1.1 2008/02/14 01:07:01 vapier Exp $ - -inherit flag-o-matic toolchain-funcs eutils multilib - -MAN_VER=10.30 -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz - mirror://gentoo/${PN}-${MAN_VER}-manpages.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips s390 sh sparc x86" -IUSE="svga jpeg tiff png zlib" - -DEPEND="jpeg? ( >=media-libs/jpeg-6b ) - tiff? ( >=media-libs/tiff-3.5.5 ) - png? ( >=media-libs/libpng-1.2.1 ) - zlib? ( sys-libs/zlib ) - svga? ( media-libs/svgalib ) - media-libs/jbigkit - media-libs/jasper - media-libs/urt" - -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 '-dynamiclib -install_name $(SONAME)';; - *) echo '-shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - use $1 && echo -l${2:-$1} || echo NONE -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/netpbm-10.30-build.patch - - rm -f configure - cp Makefile.config.in Makefile.config - cat >> Makefile.config <<-EOF - # Gentoo toolchain options - CC = $(tc-getCC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - NETPBMLIBTYPE = $(netpbm_libtype) - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - LDSHLIB = $(netpbm_ldshlib) - - # 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) - - # Use system versions instead of bundled - JBIGLIB = -ljbig - JBIGHDR_DIR = - JASPERLIB = -ljasper - JASPERHDR_DIR = - URTLIB = -lrle - URTHDR_DIR = - EOF - - # Sparc support ... - replace-flags -mcpu=ultrasparc "-mcpu=v8 -mtune=ultrasparc" - replace-flags -mcpu=v9 "-mcpu=v8 -mtune=v9" -} - -src_install() { - make 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/include/shhopt.h - rm -f "${D}"/usr/bin/{doc.url,manweb} - rm -rf "${D}"/usr/man/web - rm -rf "${D}"/usr/link - rm -f "${D}"/usr/{README,VERSION,config_template,pkginfo} - dodir /usr/share - mv "${D}"/usr/man "${D}"/usr/share/ - mv "${D}"/usr/misc "${D}"/usr/share/netpbm - - dodoc README - cd doc - GLOBIGNORE='*.html:.*' dodoc * - dohtml -r . - - cd "${WORKDIR}"/${PN}-${MAN_VER}-manpages || die - doman *.[0-9] - dodoc README* gen-netpbm-manpages -} |