diff options
author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-12-08 23:05:56 +0000 |
---|---|---|
committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-12-08 23:05:56 +0000 |
commit | db6a354613619cb871d9a02abe3f0c62b4e74ba3 (patch) | |
tree | 09fa28935cc02b9f4501193465d17fb7aa5cdd90 /graphics/nomacs | |
parent | 841c55f106c639f7922f32b080439459a92fc0c7 (diff) | |
download | ports-db6a354613619cb871d9a02abe3f0c62b4e74ba3.tar.gz ports-db6a354613619cb871d9a02abe3f0c62b4e74ba3.zip |
Fix problems introduced in r374261.
* Fix the plist.
* Add patch to properly look for and link against pthreads, required by the
bundled webp copy used by the port (this fixes the build on FreeBSD >=
10). Ideally, we should just use webp from ports instead.
PR: 192046
Notes
Notes:
svn path=/head/; revision=374340
Diffstat (limited to 'graphics/nomacs')
-rw-r--r-- | graphics/nomacs/Makefile | 1 | ||||
-rw-r--r-- | graphics/nomacs/files/patch-cmake_Unix.cmake | 13 | ||||
-rw-r--r-- | graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake | 6 | ||||
-rw-r--r-- | graphics/nomacs/pkg-plist | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/graphics/nomacs/Makefile b/graphics/nomacs/Makefile index 876639db3df1..018c88d38e9b 100644 --- a/graphics/nomacs/Makefile +++ b/graphics/nomacs/Makefile @@ -2,6 +2,7 @@ PORTNAME= nomacs PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/graphics/nomacs/files/patch-cmake_Unix.cmake b/graphics/nomacs/files/patch-cmake_Unix.cmake index 4181d42cc1f2..bb29c126839e 100644 --- a/graphics/nomacs/files/patch-cmake_Unix.cmake +++ b/graphics/nomacs/files/patch-cmake_Unix.cmake @@ -1,5 +1,5 @@ ---- cmake/Unix.cmake.orig 2014-11-11 12:00:55.000000000 +0000 -+++ cmake/Unix.cmake 2014-12-05 08:24:29.222613898 +0000 +--- cmake/Unix.cmake ++++ cmake/Unix.cmake @@ -34,17 +34,15 @@ endif(NOT EXIV2_FOUND) @@ -52,3 +52,12 @@ #search for quazip unset(QUAZIP_SOURCE_DIRECTORY CACHE) unset(QUAZIP_INCLUDE_DIRECTORY CACHE) +@@ -128,6 +129,8 @@ + SET(WEBP_INCLUDE_DIR "") + SET(WEBP_SOURCE "") + if(ENABLE_WEBP) ++ find_package(Threads REQUIRED) ++ + add_definitions(-DNDEBUG -DWEBP_USE_THREAD) + + file(GLOB WEBP_DEC_SRCS diff --git a/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake b/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake index a56a10ab47b4..9f81678095fa 100644 --- a/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake +++ b/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake @@ -1,11 +1,11 @@ ---- cmake/UnixBuildTarget.cmake.orig 2014-12-04 21:12:50.516406428 +0000 -+++ cmake/UnixBuildTarget.cmake 2014-12-04 21:14:12.825377661 +0000 +--- cmake/UnixBuildTarget.cmake ++++ cmake/UnixBuildTarget.cmake @@ -3,7 +3,7 @@ set(BINARY_NAME ${CMAKE_PROJECT_NAME}) link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS}) add_executable(${BINARY_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${QUAZIP_MOC_SRC}) - target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARY} ${ZLIB_LIBRARY}) -+ target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${SYSINFO_LIBRARY} ${VERSION_LIB} ${TIFF_LIBRARY} ${ZLIB_LIBRARY}) ++ target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${SYSINFO_LIBRARY} ${VERSION_LIB} ${TIFF_LIBRARY} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) if(CMAKE_SYSTEM_NAME MATCHES "Linux") SET_TARGET_PROPERTIES(${BINARY_NAME} PROPERTIES LINK_FLAGS -fopenmp) diff --git a/graphics/nomacs/pkg-plist b/graphics/nomacs/pkg-plist index 2afa1ecfad73..57d3dc213ab8 100644 --- a/graphics/nomacs/pkg-plist +++ b/graphics/nomacs/pkg-plist @@ -1,5 +1,6 @@ bin/nomacs share/applications/nomacs.desktop +share/man/man1/nomacs.1 %%DATADIR%%/translations/nomacs_als.qm %%DATADIR%%/translations/nomacs_az.qm %%DATADIR%%/translations/nomacs_cs.qm @@ -8,6 +9,7 @@ share/applications/nomacs.desktop %%DATADIR%%/translations/nomacs_es.qm %%DATADIR%%/translations/nomacs_fr.qm %%DATADIR%%/translations/nomacs_it.qm +%%DATADIR%%/translations/nomacs_ja.qm %%DATADIR%%/translations/nomacs_pl.qm %%DATADIR%%/translations/nomacs_pt.qm %%DATADIR%%/translations/nomacs_ru.qm |