diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Makefile | 1 | ||||
| -rw-r--r-- | graphics/blender/Makefile | 4 | ||||
| -rw-r--r-- | graphics/darktable/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gstreamer1-plugins-openjpeg/Makefile | 2 | ||||
| -rw-r--r-- | graphics/mtpaint/Makefile | 4 | ||||
| -rw-r--r-- | graphics/mupdf/Makefile | 14 | ||||
| -rw-r--r-- | graphics/mupdf/pkg-plist | 3 | ||||
| -rw-r--r-- | graphics/openimageio/Makefile | 4 | ||||
| -rw-r--r-- | graphics/openjpeg/Makefile | 9 | ||||
| -rw-r--r-- | graphics/openjpeg/distinfo | 4 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-CMakeLists.txt | 95 | ||||
| -rw-r--r-- | graphics/openjpeg/pkg-plist | 35 | ||||
| -rw-r--r-- | graphics/openjpeg15/Makefile | 24 | ||||
| -rw-r--r-- | graphics/openjpeg15/distinfo | 2 | ||||
| -rw-r--r-- | graphics/openjpeg15/files/patch-CMakeLists.txt | 64 | ||||
| -rw-r--r-- | graphics/openjpeg15/pkg-descr | 10 | ||||
| -rw-r--r-- | graphics/openjpeg15/pkg-plist | 20 | ||||
| -rw-r--r-- | graphics/poppler/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xpaint/Makefile | 3 |
19 files changed, 199 insertions, 107 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 98e843969fa2..0f528a68e35e 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -619,6 +619,7 @@ SUBDIR += opengtl SUBDIR += openimageio SUBDIR += openjpeg + SUBDIR += openjpeg15 SUBDIR += openjump SUBDIR += opennurbs SUBDIR += openrm diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 2a27fa30d9c8..d7a672223f6d 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -3,7 +3,7 @@ PORTNAME= blender PORTVERSION= 2.70a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -106,7 +106,7 @@ OPENEXR_LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR OPENJPEG_CMAKE_ON= -DWITH_SYSTEM_OPENJPEG:BOOL=ON \ -DWITH_IMAGE_OPENJPEG:BOOL=ON OPENJPEG_CMAKE_OFF= -DWITH_IMAGE_OPENJPEG:BOOL=OFF -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENMP_CMAKE_ON= -DWITH_OPENMP:BOOL=ON OPENMP_CMAKE_OFF= -DWITH_OPENMP:BOOL=OFF RAYOPTIMIZATION_CMAKE_ON= -DWITH_RAYOPTIMIZATION:BOOL=ON diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 27ac3b6d2268..8829f6997619 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -3,7 +3,7 @@ PORTNAME= darktable PORTVERSION= 1.2.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -95,7 +95,7 @@ CMAKE_ARGS+= -DDONT_USE_RAWSPEED:BOOL=ON .endif .if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 PLIST_FILES+= lib/darktable/plugins/imageio/format/libj2k.so .else CMAKE_ARGS+= -DUSE_OPENJPEG:BOOL=OFF diff --git a/graphics/gstreamer1-plugins-openjpeg/Makefile b/graphics/gstreamer1-plugins-openjpeg/Makefile index fca954293d0a..952c66542e33 100644 --- a/graphics/gstreamer1-plugins-openjpeg/Makefile +++ b/graphics/gstreamer1-plugins-openjpeg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer jpeg2000 decoder plugin diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile index d564cb4f29be..bba94b20b7c9 100644 --- a/graphics/mtpaint/Makefile +++ b/graphics/mtpaint/Makefile @@ -3,7 +3,7 @@ PORTNAME= mtpaint PORTVERSION= 3.40 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF @@ -41,7 +41,7 @@ CONFIGURE_ARGS+=nolcms .endif .if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 CONFIGURE_ARGS+=jp2 .else LIB_DEPENDS+= libjasper.so:${PORTSDIR}/graphics/jasper diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index 763988a4f06b..749897f29995 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= mupdf PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE \ @@ -15,17 +15,16 @@ COMMENT= Lightweight PDF viewer and toolkit LICENSE= AGPLv3 -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - jpeg:${PORTSDIR}/graphics/jpeg \ - jbig2dec:${PORTSDIR}/graphics/jbig2dec \ - openjpeg:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libjbig2dec.so:${PORTSDIR}/graphics/jbig2dec \ + libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 USE_GMAKE= yes MAKE_ARGS+= build=release prefix=${PREFIX} verbose=1 mandir=${PREFIX}/man \ XCFLAGS=-I${LOCALBASE}/include USES= pkgconfig USE_XORG= x11 xext -MAN1= mupdf.1 mutool.1 mudraw.1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source @@ -35,7 +34,6 @@ OPTIONS_DEFAULT=SCROLL SCROLL_DESC= Build with scroll hacks JS_DESC= JavaScript support (V8 engine) -NO_STAGE= yes .include <bsd.port.options.mk> .if ${CC:T:Mclang} == "clang" @@ -49,7 +47,7 @@ EXTRA_PATCHES+= ${FILESDIR}/scroll_hack-apps_pdfapp.c .endif .if ${PORT_OPTIONS:MJS} -LIB_DEPENDS+= v8:${PORTSDIR}/lang/v8 +LIB_DEPENDS+= libv8.so:${PORTSDIR}/lang/v8 MAKE_ARGS+= V8_PRESENT=1 V8LIBS=-lv8 .endif diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist index 4e58bcdbfcfb..f6103b8710e2 100644 --- a/graphics/mupdf/pkg-plist +++ b/graphics/mupdf/pkg-plist @@ -7,3 +7,6 @@ include/mucbz.h include/mupdf.h include/muxps.h lib/libfitz.a +man/man1/mudraw.1.gz +man/man1/mupdf.1.gz +man/man1/mutool.1.gz diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index bb7935c8dfd4..1e669d8a06be 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -3,7 +3,7 @@ PORTNAME= openimageio PORTVERSION= 1.3.9 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -41,7 +41,7 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libhdf5.so:${PORTSDIR}/science/hdf5 \ libopencv_legacy.so:${PORTSDIR}/graphics/opencv \ - libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \ + libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libwebp.so:${PORTSDIR}/graphics/webp USE_LDCONFIG= yes CMAKE_ARGS+= -DUSE_PYTHON:BOOL=OFF -DOIIO_BUILD_TOOLS:BOOL=ON diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 8ed62e61abab..0d32394db9e2 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= openjpeg -PORTVERSION= 1.5.2 +PORTVERSION= 2.1.0 CATEGORIES= graphics MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/ +#?? MAINTAINER= ports@FreeBSD.org COMMENT= Open-source JPEG 2000 codec @@ -15,9 +16,9 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng15.so:${PORTSDIR}/graphics/png \ liblcms2.so:${PORTSDIR}/graphics/lcms2 -USES= cmake dos2unix -DOS2UNIX_FILES= libopenjpeg/opj_malloc.h -GNU_CONFIGURE= yes +USES= cmake pkgconfig USE_LDCONFIG= yes +PLIST_SUB= VER=${PORTVERSION:R} + .include <bsd.port.mk> diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo index 375f8d34d575..ee27cf2b5ed6 100644 --- a/graphics/openjpeg/distinfo +++ b/graphics/openjpeg/distinfo @@ -1,2 +1,2 @@ -SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 -SIZE (openjpeg-1.5.2.tar.gz) = 1385702 +SHA256 (openjpeg-2.1.0.tar.gz) = 1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03 +SIZE (openjpeg-2.1.0.tar.gz) = 1789675 diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt index 02b9fd8fa31c..49af929acfa5 100644 --- a/graphics/openjpeg/files/patch-CMakeLists.txt +++ b/graphics/openjpeg/files/patch-CMakeLists.txt @@ -1,64 +1,37 @@ ---- CMakeLists.txt.orig 2014-03-27 11:58:08.000000000 +0100 -+++ CMakeLists.txt 2014-05-24 11:24:37.000000000 +0200 -@@ -54,7 +54,7 @@ - endif(NOT OPENJPEG_SOVERSION) - SET(OPENJPEG_LIBRARY_PROPERTIES - VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" -- SOVERSION "${OPENJPEG_SOVERSION}" -+ SOVERSION 2 - ) - - # -------------------------------------------------------------------------- -@@ -94,7 +94,7 @@ - # Install directories - - STRING(TOLOWER ${PROJECT_NAME} projectname) --SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") -+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}") - - IF(NOT OPENJPEG_INSTALL_BIN_DIR) - SET(OPENJPEG_INSTALL_BIN_DIR "bin") -@@ -125,11 +125,11 @@ - ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) - - IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) -- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") -+ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/") - ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) - - IF(NOT OPENJPEG_INSTALL_MAN_DIR) -- SET(OPENJPEG_INSTALL_MAN_DIR "share/man/") -+ SET(OPENJPEG_INSTALL_MAN_DIR "man/") - ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) - - IF(NOT OPENJPEG_INSTALL_DOC_DIR) -@@ -148,7 +148,7 @@ - # We could install *.cmake files in share/ however those files contains - # hardcoded path to libraries on a multi-arch system (fedora/debian) those - # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) -- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") - ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) - - #----------------------------------------------------------------------------- -@@ -188,10 +188,10 @@ - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) - INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION +--- CMakeLists.txt.orig 2014-05-23 22:46:07.000000000 +0200 ++++ CMakeLists.txt 2014-05-23 22:48:32.000000000 +0200 +@@ -334,14 +334,14 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) ++ libdata/pkgconfig ) + # + if(BUILD_JPWL) + # install in lib and not share (see multi-arch note above) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) ++ libdata/pkgconfig ) + endif() + # + if(BUILD_JPIP) +@@ -349,7 +349,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) ++ libdata/pkgconfig ) + endif() + # + if(BUILD_JP3D) +@@ -357,7 +357,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION - ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) + libdata/pkgconfig ) - INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink - \"libopenjpeg1.pc\" -- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")") -+ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")") - ENDIF(UNIX) + endif() + endif() - #----------------------------------------------------------------------------- -@@ -288,6 +288,7 @@ - #----------------------------------------------------------------------------- - # install all targets referenced as OPENJPEGTargets - INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) -+SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so") - CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in - ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - @ONLY diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist index caee3d3db0f6..8d0234b7c6f1 100644 --- a/graphics/openjpeg/pkg-plist +++ b/graphics/openjpeg/pkg-plist @@ -1,20 +1,15 @@ -bin/image_to_j2k -bin/j2k_dump -bin/j2k_to_image -include/openjpeg.h -lib/libopenjpeg.so -lib/libopenjpeg.so.1.5.2 -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 -%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/OpenJPEGTargets.cmake -libdata/pkgconfig/libopenjpeg.pc -libdata/pkgconfig/libopenjpeg1.pc -@dirrm %%DATADIR%% -@dirrm %%DOCSDIR%% +bin/opj_compress +bin/opj_decompress +bin/opj_dump +include/openjpeg-%%VER%%/openjpeg.h +include/openjpeg-%%VER%%/opj_config.h +include/openjpeg-%%VER%%/opj_stdint.h +lib/libopenjp2.so +lib/libopenjp2.so.2.1.0 +lib/libopenjp2.so.7 +lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake +lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake +libdata/pkgconfig/libopenjp2.pc +@dirrmtry lib/openjpeg-%%VER%% +@dirrmtry include/openjpeg-%%VER%% diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile new file mode 100644 index 000000000000..802583191dd7 --- /dev/null +++ b/graphics/openjpeg15/Makefile @@ -0,0 +1,24 @@ +# Created by: trasz <trasz@pin.if.uz.zgora.pl> +# $FreeBSD$ + +PORTNAME= openjpeg +PORTVERSION= 1.5.2 +CATEGORIES= graphics +MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/ +PKGNAMESUFFIX= 15 + +MAINTAINER= ports@FreeBSD.org +COMMENT= Open-source JPEG 2000 codec + +LICENSE= BSD2CLAUSE + +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ + libpng15.so:${PORTSDIR}/graphics/png \ + liblcms2.so:${PORTSDIR}/graphics/lcms2 + +USES= cmake dos2unix +DOS2UNIX_FILES= libopenjpeg/opj_malloc.h +GNU_CONFIGURE= yes +USE_LDCONFIG= yes + +.include <bsd.port.mk> diff --git a/graphics/openjpeg15/distinfo b/graphics/openjpeg15/distinfo new file mode 100644 index 000000000000..375f8d34d575 --- /dev/null +++ b/graphics/openjpeg15/distinfo @@ -0,0 +1,2 @@ +SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 +SIZE (openjpeg-1.5.2.tar.gz) = 1385702 diff --git a/graphics/openjpeg15/files/patch-CMakeLists.txt b/graphics/openjpeg15/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..02b9fd8fa31c --- /dev/null +++ b/graphics/openjpeg15/files/patch-CMakeLists.txt @@ -0,0 +1,64 @@ +--- CMakeLists.txt.orig 2014-03-27 11:58:08.000000000 +0100 ++++ CMakeLists.txt 2014-05-24 11:24:37.000000000 +0200 +@@ -54,7 +54,7 @@ + endif(NOT OPENJPEG_SOVERSION) + SET(OPENJPEG_LIBRARY_PROPERTIES + VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" +- SOVERSION "${OPENJPEG_SOVERSION}" ++ SOVERSION 2 + ) + + # -------------------------------------------------------------------------- +@@ -94,7 +94,7 @@ + # Install directories + + STRING(TOLOWER ${PROJECT_NAME} projectname) +-SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") ++SET(OPENJPEG_INSTALL_SUBDIR "${projectname}") + + IF(NOT OPENJPEG_INSTALL_BIN_DIR) + SET(OPENJPEG_INSTALL_BIN_DIR "bin") +@@ -125,11 +125,11 @@ + ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) + + IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) +- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/") + ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) + + IF(NOT OPENJPEG_INSTALL_MAN_DIR) +- SET(OPENJPEG_INSTALL_MAN_DIR "share/man/") ++ SET(OPENJPEG_INSTALL_MAN_DIR "man/") + ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) + + IF(NOT OPENJPEG_INSTALL_DOC_DIR) +@@ -148,7 +148,7 @@ + # We could install *.cmake files in share/ however those files contains + # hardcoded path to libraries on a multi-arch system (fedora/debian) those + # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) +- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") + ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) + + #----------------------------------------------------------------------------- +@@ -188,10 +188,10 @@ + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake + ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) + INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) ++ libdata/pkgconfig ) + INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink + \"libopenjpeg1.pc\" +- \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")") ++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig/libopenjpeg.pc\")") + ENDIF(UNIX) + + #----------------------------------------------------------------------------- +@@ -288,6 +288,7 @@ + #----------------------------------------------------------------------------- + # install all targets referenced as OPENJPEGTargets + INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) ++SET(OPENJPEG_LIBRARIES "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/lib${OPENJPEG_LIBRARY_NAME}.so") + CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in + ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake + @ONLY diff --git a/graphics/openjpeg15/pkg-descr b/graphics/openjpeg15/pkg-descr new file mode 100644 index 000000000000..ce3b146262d8 --- /dev/null +++ b/graphics/openjpeg15/pkg-descr @@ -0,0 +1,10 @@ +The OpenJPEG library is an open-source JPEG 2000 codec written in +C language. It has been developed in order to promote the use of +JPEG 2000, the new still-image compression standard from the Joint +Photographic Experts Group (JPEG). In addition to the basic codec, +various other features are under development, among them the JP2 +and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful +for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer +for j2k-images, ... + +WWW: http://code.google.com/p/openjpeg/ diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist new file mode 100644 index 000000000000..caee3d3db0f6 --- /dev/null +++ b/graphics/openjpeg15/pkg-plist @@ -0,0 +1,20 @@ +bin/image_to_j2k +bin/j2k_dump +bin/j2k_to_image +include/openjpeg.h +lib/libopenjpeg.so +lib/libopenjpeg.so.1.5.2 +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 +%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%DATADIR%%/OpenJPEGTargets.cmake +libdata/pkgconfig/libopenjpeg.pc +libdata/pkgconfig/libopenjpeg1.pc +@dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 6e2085c94f95..49adf49dd8a9 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -4,7 +4,7 @@ PORTNAME= poppler PORTVERSION= 0.24.5 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -103,7 +103,7 @@ PLIST_SUB+= CAIRO="@comment " .if ${PORT_OPTIONS:MOPENJPEG} CONFIGURE_ARGS+=--enable-libopenjpeg -LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 .else CONFIGURE_ARGS+=--disable-libopenjpeg .endif diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 542e2b512ee6..f9ba85f414fb 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -3,6 +3,7 @@ PORTNAME= xpaint PORTVERSION= 2.9.10.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/sf-${PORTNAME}/sf-${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -13,7 +14,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \ + libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libjbig.so:${PORTSDIR}/graphics/jbigkit \ |