diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-16 08:46:05 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-16 08:46:05 +0000 |
| commit | 5dcc37da05e8da676ac85b216e033ab642a9830a (patch) | |
| tree | 7276f1809e238517fc253e91eab3935e2a837438 /graphics | |
| parent | e19541de8b9e317b2e21729d305484c0b225e717 (diff) | |
| download | ports-5dcc37da05e8da676ac85b216e033ab642a9830a.tar.gz ports-5dcc37da05e8da676ac85b216e033ab642a9830a.zip | |
Notes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/openjpeg/Makefile | 7 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-CMakeLists.txt | 8 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in | 11 | ||||
| -rw-r--r-- | graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake | 15 | ||||
| -rw-r--r-- | graphics/openjpeg/pkg-plist | 1 |
5 files changed, 38 insertions, 4 deletions
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 39e3675e8d4e..2329265cf809 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -7,18 +7,19 @@ PORTNAME= openjpeg PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= dinoex@FreeBSD.org COMMENT= An open-source JPEG 2000 codec -LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ - png15:${PORTSDIR}/graphics/png - LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ + png15:${PORTSDIR}/graphics/png + GNU_CONFIGURE= yes USE_CMAKE= yes USE_LDCONFIG= yes diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt index b385bc618c67..b8501066c5fe 100644 --- a/graphics/openjpeg/files/patch-CMakeLists.txt +++ b/graphics/openjpeg/files/patch-CMakeLists.txt @@ -36,3 +36,11 @@ INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")") +@@ -244,6 +241,7 @@ ENDIF(BUILD_TESTING) + #----------------------------------------------------------------------------- + # 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/files/patch-CMake_OpenJPEGConfig.cmake.in b/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in new file mode 100644 index 000000000000..1a8fc1f0118c --- /dev/null +++ b/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in @@ -0,0 +1,11 @@ +--- CMake/OpenJPEGConfig.cmake.in~ 2012-02-07 04:49:55.000000000 -0600 ++++ CMake/OpenJPEGConfig.cmake.in 2012-04-09 05:05:46.024519656 -0500 +@@ -17,7 +17,7 @@ SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRAR + SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@") + + # The configuration options. +-SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@") ++SET(OPENJPEG_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) + + # The "use" file. + SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@") diff --git a/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake b/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake new file mode 100644 index 000000000000..674e19bc3e4d --- /dev/null +++ b/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake @@ -0,0 +1,15 @@ +--- libopenjpeg1.pc.cmake~ 2012-02-07 04:49:55.000000000 -0600 ++++ libopenjpeg1.pc.cmake 2012-04-07 17:13:24.589503254 -0500 +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-bindir=@OPENJPEG_INSTALL_BIN_DIR@ +-datadir=@OPENJPEG_INSTALL_DATA_DIR@ +-libdir=@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ ++bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ ++datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@ ++libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ ++includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjpeg + Description: JPEG2000 files library diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist index 4aff4fe8a8d1..dbb7f81a987a 100644 --- a/graphics/openjpeg/pkg-plist +++ b/graphics/openjpeg/pkg-plist @@ -13,4 +13,3 @@ lib/libopenjpeg.so.2 libdata/pkgconfig/libopenjpeg1.pc @dirrm %%DATADIR%% @dirrm %%DOCSDIR%% -@dirrm include/openjpeg |