Attachment 150223 Details for Bug 192046 – Patch to update nomacs to 2.2.0

[patch] Patch to update nomacs to 2.2.0

nomacs-2.2.0.diff (text/plain), 9.21 KB, created by Rodrigo Osorio on 2014-12-05 12:51:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodrigo Osorio

Created: 2014-12-05 12:51:57 UTC

Size: 9.21 KB

patch

obsolete

>Index: graphics/nomacs/Makefile
>===================================================================
>--- graphics/nomacs/Makefile	(revision 373406)
>+++ graphics/nomacs/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nomacs
>-PORTVERSION=	1.6.4
>-PORTREVISION=	1
>+PORTVERSION=	2.2.0
> CATEGORIES=	graphics
> MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-source
>Index: graphics/nomacs/distinfo
>===================================================================
>--- graphics/nomacs/distinfo	(revision 373406)
>+++ graphics/nomacs/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (nomacs-1.6.4-source.tar.bz2) = 85bb13567165af08f699ee87630151bf2a81d77cd75e025a7a332ab9c9022a94
>-SIZE (nomacs-1.6.4-source.tar.bz2) = 1173684
>+SHA256 (nomacs-2.2.0-source.tar.bz2) = 10825140bd856334aa3ba3a59c93f7205ec9218321d5ded20a70a43af424a884
>+SIZE (nomacs-2.2.0-source.tar.bz2) = 1392489
>Index: graphics/nomacs/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/nomacs/files/patch-CMakeLists.txt	(revision 373406)
>+++ graphics/nomacs/files/patch-CMakeLists.txt	(working copy)
>@@ -1,42 +0,0 @@
>---- ./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} -pthread)
>- 
>- 		IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
>- 			SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -fopenmp)
>Index: graphics/nomacs/files/patch-cmake_Unix.cmake
>===================================================================
>--- graphics/nomacs/files/patch-cmake_Unix.cmake	(revision 0)
>+++ graphics/nomacs/files/patch-cmake_Unix.cmake	(working copy)
>@@ -0,0 +1,54 @@
>+--- cmake/Unix.cmake.orig	2014-11-11 12:00:55.000000000 +0000
>++++ cmake/Unix.cmake	2014-12-05 08:24:29.222613898 +0000
>+@@ -34,17 +34,15 @@
>+ endif(NOT EXIV2_FOUND)
>+ 
>+ # search for opencv
>+-unset(OpenCV_FOUND CACHE)
>++unset(OPENCVCORE_FOUND CACHE)
>+ if(ENABLE_OPENCV)
>+-	find_package(OpenCV 2.1.0 REQUIRED core imgproc)
>+-	if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv)
>+-		# Older OpenCV versions only supplied pkg-config files
>+-		if(PKG_CONFIG_FOUND)
>+-			pkg_check_modules(OpenCV opencv>=2.1.0)
>+-		endif()
>++	find_package(OpenCVCore COMPONENTS core imgproc REQUIRED)
>++
>++	if (NOT OPENCV_CORE_LIBRARY)
>++		message(FATAL_ERROR "OpenCV libraries not found, but requested.")
>+ 	endif()
>+ 
>+-	if(NOT OpenCV_FOUND)
>++	if (NOT OPENCVCORE_FOUND)
>+ 		message(FATAL_ERROR "OpenCV not found, but requested.")
>+ 	endif()
>+ 
>+@@ -56,7 +54,7 @@
>+ 
>+ # search for libraw
>+ if(ENABLE_RAW)
>+-	if(NOT OpenCV_FOUND)
>++	if(NOT OPENCVCORE_FOUND)
>+ 		message(FATAL_ERROR "OpenCV is mandotory when enabling RAW. You have to enable ENABLE_OPENCV")
>+ 	endif()
>+ 
>+@@ -72,7 +70,7 @@
>+ unset(TIFF_INCLUDE_DIR CACHE)
>+ unset(TIFF_LIBRARY CACHE)
>+ if(ENABLE_TIFF)
>+-	if(NOT OpenCV_FOUND)
>++	if(NOT OPENCVCORE_FOUND)
>+ 		message(FATAL_ERROR "OpenCV is mandotory when enabling TIFF. You have to enable ENABLE_OPENCV")
>+ 	endif()
>+ 	find_package(TIFF)
>+@@ -84,6 +82,9 @@
>+ 	endif()
>+ endif(ENABLE_TIFF)
>+ 
>++# sysinfo library
>++FIND_LIBRARY(SYSINFO_LIBRARY NAMES sysinfo)
>++
>+ #search for quazip
>+ unset(QUAZIP_SOURCE_DIRECTORY CACHE)
>+ unset(QUAZIP_INCLUDE_DIRECTORY CACHE)
>
>Property changes on: graphics/nomacs/files/patch-cmake_Unix.cmake
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
>===================================================================
>--- graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake	(revision 0)
>+++ graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake	(working copy)
>@@ -0,0 +1,29 @@
>+--- cmake/UnixBuildTarget.cmake.orig	2014-12-04 21:12:50.516406428 +0000
>++++ cmake/UnixBuildTarget.cmake	2014-12-04 21:14:12.825377661 +0000
>+@@ -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})
>+ 
>+   if(CMAKE_SYSTEM_NAME MATCHES "Linux")
>+ 	  SET_TARGET_PROPERTIES(${BINARY_NAME} PROPERTIES LINK_FLAGS -fopenmp)
>+@@ -49,7 +49,7 @@
>+   set(DLL_NAME lib${CMAKE_PROJECT_NAME})
>+   #set(LIB_NAME optimized ${DLL_NAME}.lib debug ${DLL_NAME}d.lib)
>+   LIST(REMOVE_ITEM NOMACS_SOURCES ${CMAKE_SOURCE_DIR}/src/main.cpp)
>+-  link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR})
>++  link_directories(${LIBRAW_LIBRARY_DIRS} ${SYSINFO_LIBRARY_DIRS}  ${OPENCV_CORE_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR})
>+   add_executable(${BINARY_NAME} WIN32  MACOSX_BUNDLE src/main.cpp ${NOMACS_MOC_SRC_SU} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${NOMACS_RC})
>+   target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${VERSION_LIB} ${DLL_NAME})
>+ 
>+@@ -57,7 +57,7 @@
>+   set_target_properties(${BINARY_NAME} PROPERTIES IMPORTED_IMPLIB "")
>+ 		  
>+   add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE}  ${QUAZIP_SOURCES} ${QUAZIP_MOC_SRC})
>+-  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS})
>++  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${SYSINFO_LIBRARY} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS})
>+   add_dependencies(${BINARY_NAME} ${DLL_NAME})
>+ 
>+   if (ENABLE_QT5)
>
>Property changes on: graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/nomacs/pkg-plist
>===================================================================
>--- graphics/nomacs/pkg-plist	(revision 373406)
>+++ graphics/nomacs/pkg-plist	(working copy)
>@@ -1,5 +1,4 @@
> bin/nomacs
>-man/man1/nomacs.1.gz
> share/applications/nomacs.desktop
> %%DATADIR%%/translations/nomacs_als.qm
> %%DATADIR%%/translations/nomacs_az.qm

Actions: View | Diff

Attachments on bug 192046: 144893 | 144922 | 144934 | 144941 | 145612 | 145999 | 150223