Attachment 160197 Details for Bug 202559 – Update patch

[patch] Update patch

moo.patch (text/plain), 5.62 KB, created by Jens K. Loewe on 2015-08-22 01:39:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens K. Loewe

Created: 2015-08-22 01:39:35 UTC

Size: 5.62 KB

patch

obsolete

>diff -ruN nomacs/Makefile nomacs-neu/Makefile
>--- nomacs/Makefile	2015-08-20 19:38:54.591422000 +0200
>+++ nomacs-neu/Makefile	2015-08-20 19:52:59.356138000 +0200
>@@ -1,8 +1,8 @@
> # $FreeBSD: head/graphics/nomacs/Makefile 379522 2015-02-21 15:11:52Z makc $
> 
> PORTNAME=	nomacs
>-PORTVERSION=	2.2.0
>-PORTREVISION=	2
>+PORTVERSION=	2.4.6
>+PORTREVISION=	1
> CATEGORIES=	graphics
> MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-source
>diff -ruN nomacs/distinfo nomacs-neu/distinfo
>--- nomacs/distinfo	2015-08-20 19:38:54.592060000 +0200
>+++ nomacs-neu/distinfo	2015-08-20 19:54:59.898087000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (nomacs-2.2.0-source.tar.bz2) = 10825140bd856334aa3ba3a59c93f7205ec9218321d5ded20a70a43af424a884
>-SIZE (nomacs-2.2.0-source.tar.bz2) = 1392489
>+SHA256 (nomacs-2.4.6-source.tar.bz2) = b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960
>+SIZE (nomacs-2.4.6-source.tar.bz2) = 1457529
>diff -ruN nomacs/files/patch-cmake_Unix.cmake nomacs-neu/files/patch-cmake_Unix.cmake
>--- nomacs/files/patch-cmake_Unix.cmake	2015-08-20 20:03:06.146011000 +0200
>+++ nomacs-neu/files/patch-cmake_Unix.cmake	1970-01-01 01:00:00.000000000 +0100
>@@ -1,61 +0,0 @@
>---- cmake/Unix.cmake
>-+++ cmake/Unix.cmake
>-@@ -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)
>-@@ -164,5 +162,7 @@
>-            add_definitions(-DWITH_WEBP)
>-    endif()
>-  else()
>-+        find_package(Threads REQUIRED)
>-+ 
>-        add_definitions(-DNDEBUG -DWEBP_USE_THREAD)
>diff -ruN nomacs/files/patch-cmake_UnixBuildTarget.cmake nomacs-neu/files/patch-cmake_UnixBuildTarget.cmake
>--- nomacs/files/patch-cmake_UnixBuildTarget.cmake	2015-08-20 19:38:54.607539000 +0200
>+++ nomacs-neu/files/patch-cmake_UnixBuildTarget.cmake	1970-01-01 01:00:00.000000000 +0100
>@@ -1,29 +0,0 @@
>---- 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} ${CMAKE_THREAD_LIBS_INIT})
>- 
>-   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)

Actions: View | Diff

Attachments on bug 202559: 160197