diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2013-10-10 00:19:01 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-10-10 00:19:01 +0000 |
| commit | 2ac0481f0ea02d50d0f78277bc4db22b22f37c39 (patch) | |
| tree | 748d166a4c14bc08653190418fff5a1eb4f82cd3 /graphics | |
| parent | - Convert to staging (diff) | |
- Convert to staging
- Convert LIB_DEPENDS to new format
- Use DOS2UNIX and regenerate patch without DOS style newlines
Notes
Notes:
svn path=/head/; revision=329949
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/openjpeg/Makefile | 11 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-opj_malloc.h | 22 | ||||
| -rw-r--r-- | graphics/openjpeg/pkg-plist | 4 |
3 files changed, 19 insertions, 18 deletions
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 6c1b1d4233e9..874efb54546b 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -13,16 +13,13 @@ COMMENT= Open-source JPEG 2000 codec LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ - png15:${PORTSDIR}/graphics/png \ - lcms2:${PORTSDIR}/graphics/lcms2 +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ + libpng15.so:${PORTSDIR}/graphics/png \ + liblcms2.so:${PORTSDIR}/graphics/lcms2 +USE_DOS2UNIX= opj_malloc.h GNU_CONFIGURE= yes USES= cmake USE_LDCONFIG= yes -MAN1= image_to_j2k.1 j2k_dump.1 j2k_to_image.1 -MAN3= libopenjpeg.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/graphics/openjpeg/files/patch-opj_malloc.h b/graphics/openjpeg/files/patch-opj_malloc.h index d1a620775c93..0f61562b49a8 100644 --- a/graphics/openjpeg/files/patch-opj_malloc.h +++ b/graphics/openjpeg/files/patch-opj_malloc.h @@ -1,12 +1,12 @@ ---- libopenjpeg/opj_malloc.h.orig 2012-02-07 11:49:55.000000000 +0100 -+++ libopenjpeg/opj_malloc.h 2012-06-02 11:25:56.000000000 +0200 +--- libopenjpeg/opj_malloc.h.orig 2013-10-08 17:19:09.755013928 +0200 ++++ libopenjpeg/opj_malloc.h 2013-10-08 17:20:11.403012744 +0200 @@ -85,8 +85,7 @@ - #define HAVE_MEMALIGN
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
-- #define HAVE_MEMALIGN
-- #include <malloc.h>
-+ #include <stdlib.h>
- #endif
- #endif
-
+ #define HAVE_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) +- #define HAVE_MEMALIGN +- #include <malloc.h> ++ #include <stdlib.h> + #endif + #endif + diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist index dbb7f81a987a..2b5167388318 100644 --- a/graphics/openjpeg/pkg-plist +++ b/graphics/openjpeg/pkg-plist @@ -5,6 +5,10 @@ include/openjpeg.h lib/libopenjpeg.so lib/libopenjpeg.so.1.5.0 lib/libopenjpeg.so.2 +man/man1/image_to_j2k.1.gz +man/man1/j2k_dump.1.gz +man/man1/j2k_to_image.1.gz +man/man3/libopenjpeg.3.gz %%DOCSDIR%%/CHANGES %%DOCSDIR%%/LICENSE %%DATADIR%%/OpenJPEGConfig.cmake |