mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

Fix problems introduced in r374261.

Browse source 
* 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
This commit is contained in:
Raphael Kubo da Costa 2014-12-08 23:05:56 +00:00
parent 841c55f106
commit db6a354613
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
graphics/nomacs/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= nomacs
PORTVERSION= 2.2.0
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source

13
graphics/nomacs/files/patch-cmake_Unix.cmake
View file

@ -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

6
graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
View file

@ -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)

2
graphics/nomacs/pkg-plist
View file

@ -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