diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-04 20:49:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-04 20:49:01 +0000 |
| commit | f1feb68bbda3acaeedbf289d31d46ac0942b8856 (patch) | |
| tree | 710715e667093f2fe8fda7aad62438dafce2eead /packages | |
| parent | 194e9823419ad76b29d14edb3733c18009fe3311 (diff) | |
netpbm: Fix perl RDEPENDS, make ppmtojpeg work (disabled by default because
the target of the link, pnmtojpeg, may not exist)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/netpbm/netpbm-10.28/ppmtojpeg.patch | 17 | ||||
| -rw-r--r-- | packages/netpbm/netpbm_10.28.bb | 20 |
2 files changed, 35 insertions, 2 deletions
diff --git a/packages/netpbm/netpbm-10.28/ppmtojpeg.patch b/packages/netpbm/netpbm-10.28/ppmtojpeg.patch new file mode 100644 index 0000000000..39df5edbea --- /dev/null +++ b/packages/netpbm/netpbm-10.28/ppmtojpeg.patch @@ -0,0 +1,17 @@ +# This patch makes the /usr/bin/ppmtojpeg work on OE. + +--- netpbm-10.28/netpbm.c.orig 2005-08-04 13:20:15.665273549 -0700 ++++ netpbm-10.28/netpbm.c 2005-08-04 13:21:09.288647855 -0700 +@@ -62,8 +62,11 @@ + which would know whether pnmtojpeg was built into the merged binary + or not. But that's too much work. + +- TRY("ppmtojpeg", main_pnmtojpeg); ++ * Patched for OE because OE builds the jpeg library (always) and the ++ * subdirectory creates the link anyway, so otherwise we have a bogus ++ * link. + */ ++ TRY("ppmtojpeg", main_pnmtojpeg); + TRY("bmptoppm", main_bmptopnm); + TRY("pgmnorm", main_pnmnorm); + TRY("ppmnorm", main_pnmnorm); diff --git a/packages/netpbm/netpbm_10.28.bb b/packages/netpbm/netpbm_10.28.bb index b4f78a57a1..1bbcb4ff07 100644 --- a/packages/netpbm/netpbm_10.28.bb +++ b/packages/netpbm/netpbm_10.28.bb @@ -10,15 +10,31 @@ LICENSE = "GPL MIT Artistic" SECTION = "console/utils" DEPENDS = "jpeg zlib libpng tiff install-native flex-native" -RDEPENDS = "perl" +RDEPENDS = "perl\ + perl-module-${TARGET_SYS}-xsloader\ + perl-module-carp\ + perl-module-constant\ + perl-module-english\ + perl-module-exporter\ + perl-module-exporter-heavy\ + perl-module-fcntl\ + perl-module-file-spec\ + perl-module-file-spec-unix\ + perl-module-getopt-long\ + perl-module-strict\ + perl-module-vars\ + perl-module-warnings\ + perl-module-warnings-register\ + " HOMEPAGE = "http://netpbm.sourceforge.net" DESCRIPTION = "Netpbm is a toolkit for manipulation of graphic images, including\ conversion of images between a variety of different formats. There\ are over 220 separate tools in the package including converters for\ about 100 graphics formats." -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/netpbm/netpbm-${PV}.tgz \ + file://ppmtojpeg.patch;patch=42 \ file://Makefile.config \ file://oeendiangen" |