Attachment #144934 for bug #192046

Lines 1-8 Link Here

(-)nomacs-neu/Makefile (-2 / +2 lines)
1	# $FreeBSD: head/graphics/nomacs/Makefile 350164 2014-04-04 20:36:47Z danfe $	1	# $FreeBSD: head/graphics/nomacs/Makefile 350164 2014-04-04 20:36:47Z danfe $
2		2
3	PORTNAME= nomacs	3	PORTNAME= nomacs
4	PORTVERSION= 1.6.4	4	PORTVERSION= 2.0.0
5	PORTREVISION= 1
6	CATEGORIES= graphics	5	CATEGORIES= graphics
7	MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/	6	MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-source	7	DISTNAME= ${PORTNAME}-${PORTVERSION}-source
Lines 30-35 Link Here
30	RAW_LIB_DEPENDS= libraw.so:${PORTSDIR}/graphics/libraw \	29	RAW_LIB_DEPENDS= libraw.so:${PORTSDIR}/graphics/libraw \
31	libopencv_core.so:${PORTSDIR}/graphics/opencv-core	30	libopencv_core.so:${PORTSDIR}/graphics/opencv-core
32	RAW_CMAKE_OFF= -DENABLE_RAW=0	31	RAW_CMAKE_OFF= -DENABLE_RAW=0
		32	RAW_CMAKE_ON= -DENABLE_OPENCV
33		33
34	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff	34	TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff
35	TIFF_CMAKE_OFF= -DENABLE_TIFF=0	35	TIFF_CMAKE_OFF= -DENABLE_TIFF=0

Lines 1-2 Link Here

(-)nomacs-neu/distinfo (-2 / +2 lines)
1	SHA256 (nomacs-1.6.4-source.tar.bz2) = 85bb13567165af08f699ee87630151bf2a81d77cd75e025a7a332ab9c9022a94	1	SHA256 (nomacs-2.0.0-source.tar.bz2) = a47c09b073396692e87c0cf7e177e15a63cd8621fcb05b52276986522570c73c
2	SIZE (nomacs-1.6.4-source.tar.bz2) = 1173684	2	SIZE (nomacs-2.0.0-source.tar.bz2) = 1269714




--- ./CMakeLists.txt.orig	2013-12-02 09:23:52.000000000 -0500
+++ ./CMakeLists.txt	2013-12-02 09:25:24.000000000 -0500
@@ -208,19 +178,12 @@
     endif()
 	          
 	# OpenCV
-	SET(OpenCV_LIBS "")
-	if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux  with old old opencv systems
-		pkg_check_modules(OpenCV  opencv>=2.1.0)
-		SET(OpenCV_LIBS ${OpenCV_LIBRARIES})
-	endif(PKG_CONFIG_FOUND)
-	IF (OpenCV_LIBS STREQUAL "") 
-		find_package(OpenCV 2.1.0 REQUIRED core imgproc)
-	ENDIF()
+		find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
 	IF (OpenCV_VERSION VERSION_LESS 2.4.0 AND OpenCV_FOUND AND MSVC) # OpenCV didn't allow to define packages before version 2.4.0 ... nomacs was linking against all libs even if they were not compiled -> error
 		string(REGEX REPLACE "\\." "" OpenCV_SHORT_VERSION ${OpenCV_VERSION})
 		SET(OpenCV_LIBS "debug;opencv_imgproc${OpenCV_SHORT_VERSION}d;optimized;opencv_imgproc${OpenCV_SHORT_VERSION};debug;opencv_core${OpenCV_SHORT_VERSION}d;optimized;opencv_core${OpenCV_SHORT_VERSION};")
 	ENDIF()
-	IF (NOT OpenCV_FOUND)
+	IF (NOT OPENCVCORE_FOUND)
 		message(FATAL_ERROR "OpenCV not found. It's mandatory when used with ENABLE_RAW enabled") 
 	ELSE()
 		add_definitions(-DWITH_OPENCV)
@@ -285,6 +243,8 @@
 	
 ENDIF(ENABLE_TIFF)
 
+# sysinfo library
+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)
 	
 include_directories (
 	${QT_INCLUDES}
@@ -427,7 +387,7 @@
 		set(EXE_NAME ${CMAKE_PROJECT_NAME})
 		link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
 		add_executable(${EXE_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})
-		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES})
+		target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY})
 
 		IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
 			SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)




--- ./cmake/Unix.cmake.old	2014-07-23 23:36:27.000000000 +0200
+++ ./cmake/Unix.cmake	2014-07-23 23:43:28.000000000 +0200
@@ -36,18 +36,9 @@
 # search for opencv
 unset(OpenCV_FOUND CACHE)
 if(ENABLE_OPENCV)
-	set(OpenCV_LIBS "")
-	set(OpenCV_FOUND false)
-	if(PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux  with old old opencv systems
-		pkg_check_modules(OpenCV  opencv>=2.1.0)
-		set(OpenCV_LIBS ${OpenCV_LIBRARIES})
-	endif(PKG_CONFIG_FOUND)
-
-	if(OpenCV_LIBS STREQUAL "")
-		find_package(OpenCV 2.1.0 REQUIRED core imgproc)
-	endif(OpenCV_LIBS STREQUAL "")
+        find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
 
-	if(NOT OpenCV_FOUND)
+	if(NOT OPENCVCORE_FOUND)
 		message(FATAL_ERROR "OpenCV not found.") 
 	else()
 		add_definitions(-DWITH_OPENCV)
@@ -87,3 +78,6 @@
 		message(FATAL_ERROR "libtiff was not found. It's mandatory when used with ENABLE_TIFF enabled.")
 	endif()
 endif(ENABLE_TIFF)
+
+# sysinfo library
+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)

Line 0 Link Here

(-)nomacs-neu/files/patch-UnixBuildTarget-cmake.diff (+11 lines)
	1	--- ./cmake/UnixBuildTarget.cmake.old 2014-07-23 23:44:53.000000000 +0200
	2	+++ ./cmake/UnixBuildTarget.cmake 2014-07-23 23:45:42.000000000 +0200
	3	@@ -3,7 +3,7 @@
	4	set(BINARY_NAME ${CMAKE_PROJECT_NAME})
	5	link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
	6	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})
	7	- target_link_libraries(${BINARY_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARY})
	8	+ target_link_libraries(${BINARY_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARY} ${SYSINFO_LIBRARY})
	9
	10	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
	11	SET_TARGET_PROPERTIES(${BINARY_NAME} PROPERTIES LINK_FLAGS -fopenmp)

Return to bug 192046

Lines 1-42 Link Here

(-)nomacs-neu/files/patch-CMakeLists.txt (-42 lines)
1	--- ./CMakeLists.txt.orig 2013-12-02 09:23:52.000000000 -0500
2	+++ ./CMakeLists.txt 2013-12-02 09:25:24.000000000 -0500
3	@@ -208,19 +178,12 @@
4	endif()
5
6	# OpenCV
7	- SET(OpenCV_LIBS "")
8	- if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux with old old opencv systems
9	- pkg_check_modules(OpenCV opencv>=2.1.0)
10	- SET(OpenCV_LIBS ${OpenCV_LIBRARIES})
11	- endif(PKG_CONFIG_FOUND)
12	- IF (OpenCV_LIBS STREQUAL "")
13	- find_package(OpenCV 2.1.0 REQUIRED core imgproc)
14	- ENDIF()
15	+ find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
16	IF (OpenCV_VERSION VERSION_LESS 2.4.0 AND OpenCV_FOUND AND MSVC) # OpenCV didn't allow to define packages before version 2.4.0 ... nomacs was linking against all libs even if they were not compiled -> error
17	string(REGEX REPLACE "\\." "" OpenCV_SHORT_VERSION ${OpenCV_VERSION})
18	SET(OpenCV_LIBS "debug;opencv_imgproc${OpenCV_SHORT_VERSION}d;optimized;opencv_imgproc${OpenCV_SHORT_VERSION};debug;opencv_core${OpenCV_SHORT_VERSION}d;optimized;opencv_core${OpenCV_SHORT_VERSION};")
19	ENDIF()
20	- IF (NOT OpenCV_FOUND)
21	+ IF (NOT OPENCVCORE_FOUND)
22	message(FATAL_ERROR "OpenCV not found. It's mandatory when used with ENABLE_RAW enabled")
23	ELSE()
24	add_definitions(-DWITH_OPENCV)
25	@@ -285,6 +243,8 @@
26
27	ENDIF(ENABLE_TIFF)
28
29	+# sysinfo library
30	+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)
31
32	include_directories (
33	${QT_INCLUDES}
34	@@ -427,7 +387,7 @@
35	set(EXE_NAME ${CMAKE_PROJECT_NAME})
36	link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
37	add_executable(${EXE_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})
38	- target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES})
39	+ target_link_libraries(${EXE_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${SYSINFO_LIBRARY})
40
41	IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
42	SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)

Line 0 Link Here

(-)nomacs-neu/files/patch-Unix-cmake.diff (+30 lines)
	1	--- ./cmake/Unix.cmake.old 2014-07-23 23:36:27.000000000 +0200
	2	+++ ./cmake/Unix.cmake 2014-07-23 23:43:28.000000000 +0200
	3	@@ -36,18 +36,9 @@
	4	# search for opencv
	5	unset(OpenCV_FOUND CACHE)
	6	if(ENABLE_OPENCV)
	7	- set(OpenCV_LIBS "")
	8	- set(OpenCV_FOUND false)
	9	- if(PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux with old old opencv systems
	10	- pkg_check_modules(OpenCV opencv>=2.1.0)
	11	- set(OpenCV_LIBS ${OpenCV_LIBRARIES})
	12	- endif(PKG_CONFIG_FOUND)
	13	-
	14	- if(OpenCV_LIBS STREQUAL "")
	15	- find_package(OpenCV 2.1.0 REQUIRED core imgproc)
	16	- endif(OpenCV_LIBS STREQUAL "")
	17	+ find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
	18
	19	- if(NOT OpenCV_FOUND)
	20	+ if(NOT OPENCVCORE_FOUND)
	21	message(FATAL_ERROR "OpenCV not found.")
	22	else()
	23	add_definitions(-DWITH_OPENCV)
	24	@@ -87,3 +78,6 @@
	25	message(FATAL_ERROR "libtiff was not found. It's mandatory when used with ENABLE_TIFF enabled.")
	26	endif()
	27	endif(ENABLE_TIFF)
	28	+
	29	+# sysinfo library
	30	+FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)