Date: Sat, 24 May 2014 14:29:41 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355041 - in head/graphics/openjpeg: . files Message-ID: <201405241429.s4OETfGu025167@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat May 24 14:29:41 2014 New Revision: 355041 URL: http://svnweb.freebsd.org/changeset/ports/355041 QAT: https://qat.redports.org/buildarchive/r355041/ Log: Update to 1.5.2. Fixes a number of vulnabilies. Security: 02db20d7-e34a-11e3-bd92-bcaec565249c Deleted: head/graphics/openjpeg/files/patch-CMake_OpenJPEGConfig.cmake.in head/graphics/openjpeg/files/patch-libopenjpeg-CMakeLists.txt head/graphics/openjpeg/files/patch-libopenjpeg1.pc.cmake head/graphics/openjpeg/files/patch-opj_malloc.h Modified: head/graphics/openjpeg/Makefile head/graphics/openjpeg/distinfo head/graphics/openjpeg/files/patch-CMakeLists.txt head/graphics/openjpeg/pkg-plist Modified: head/graphics/openjpeg/Makefile ============================================================================== --- head/graphics/openjpeg/Makefile Sat May 24 14:28:28 2014 (r355040) +++ head/graphics/openjpeg/Makefile Sat May 24 14:29:41 2014 (r355041) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= openjpeg -PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTVERSION= 1.5.2 CATEGORIES= graphics -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Open-source JPEG 2000 codec Modified: head/graphics/openjpeg/distinfo ============================================================================== --- head/graphics/openjpeg/distinfo Sat May 24 14:28:28 2014 (r355040) +++ head/graphics/openjpeg/distinfo Sat May 24 14:29:41 2014 (r355041) @@ -1,2 +1,2 @@ -SHA256 (openjpeg-1.5.0.tar.gz) = c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace -SIZE (openjpeg-1.5.0.tar.gz) = 2117572 +SHA256 (openjpeg-1.5.2.tar.gz) = 15df7b194a5d8dba0052cd21c17a4dc761149a770a907d73fffb972078c28a87 +SIZE (openjpeg-1.5.2.tar.gz) = 1385702 Modified: head/graphics/openjpeg/files/patch-CMakeLists.txt ============================================================================== --- head/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 14:28:28 2014 (r355040) +++ head/graphics/openjpeg/files/patch-CMakeLists.txt Sat May 24 14:29:41 2014 (r355041) @@ -1,15 +1,15 @@ ---- CMakeLists.txt.orig 2012-02-07 11:49:55.000000000 +0100 -+++ CMakeLists.txt 2012-06-03 14:26:55.000000000 +0200 -@@ -36,7 +36,7 @@ - "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}") +--- 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_VERSION_MAJOR}" -+ SOVERSION "2" +- SOVERSION "${OPENJPEG_SOVERSION}" ++ SOVERSION 2 ) # -------------------------------------------------------------------------- -@@ -76,7 +76,7 @@ +@@ -94,7 +94,7 @@ # Install directories STRING(TOLOWER ${PROJECT_NAME} projectname) @@ -18,7 +18,12 @@ IF(NOT OPENJPEG_INSTALL_BIN_DIR) SET(OPENJPEG_INSTALL_BIN_DIR "bin") -@@ -99,7 +99,7 @@ +@@ -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) @@ -27,16 +32,29 @@ ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) IF(NOT OPENJPEG_INSTALL_DOC_DIR) -@@ -146,7 +146,7 @@ +@@ -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_SHARE_DIR}/pkgconfig ) +- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) + libdata/pkgconfig ) 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) +- \"\$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}) Modified: head/graphics/openjpeg/pkg-plist ============================================================================== --- head/graphics/openjpeg/pkg-plist Sat May 24 14:28:28 2014 (r355040) +++ head/graphics/openjpeg/pkg-plist Sat May 24 14:29:41 2014 (r355041) @@ -3,7 +3,7 @@ bin/j2k_dump bin/j2k_to_image include/openjpeg.h lib/libopenjpeg.so -lib/libopenjpeg.so.1.5.0 +lib/libopenjpeg.so.1.5.2 lib/libopenjpeg.so.2 man/man1/image_to_j2k.1.gz man/man1/j2k_dump.1.gz @@ -14,6 +14,7 @@ man/man3/libopenjpeg.3.gz %%DATADIR%%/OpenJPEGConfig.cmake %%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/OpenJPEGTargets.cmake +libdata/pkgconfig/libopenjpeg.pc libdata/pkgconfig/libopenjpeg1.pc @dirrm %%DATADIR%% @dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405241429.s4OETfGu025167>