graphics/openjph: Update to 0.8.1

Changes: https://github.com/aous72/OpenJPH/releases
freebsd · Jan 23, 2022 · 23cc4f1 · 23cc4f1
1 parent a4a86fb
commit 23cc4f1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/graphics/openjph/Makefile b/graphics/openjph/Makefile
@@ -1,7 +1,7 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	openjph
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.1
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/license.txt
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	is currently 64-bit only
 
-USES=		cmake compiler:c++11-lang pathfix
+USES=		cmake compiler:c++11-lang # pathfix
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 

diff --git a/graphics/openjph/distinfo b/graphics/openjph/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618319952
-SHA256 (aous72-OpenJPH-0.7.3_GH0.tar.gz) = 301497896fc04bbd0f12a9c68336f371d2c50389638a60dab47b257e20c2b42c
-SIZE (aous72-OpenJPH-0.7.3_GH0.tar.gz) = 320940
+TIMESTAMP = 1642102141
+SHA256 (aous72-OpenJPH-0.8.1_GH0.tar.gz) = 305d4e3ab3457644721d49586bb32e20258737ed89e085d104664b7badf07762
+SIZE (aous72-OpenJPH-0.8.1_GH0.tar.gz) = 265468
diff --git a/graphics/openjph/files/patch-CMakeLists.txt b/graphics/openjph/files/patch-CMakeLists.txt
@@ -1,25 +1,16 @@
---- CMakeLists.txt.orig	2021-03-12 02:16:50 UTC
+--- CMakeLists.txt.orig	2022-01-03 05:55:29 UTC
 +++ CMakeLists.txt
-@@ -29,7 +29,7 @@ if (MSVC)
- 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /D \"_CRT_SECURE_NO_WARNINGS\"")
- endif()
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
--  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fexceptions -Wall -Wextra -Wconversion -Wunused-parameter")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -Wall -Wextra -Wconversion -Wunused-parameter")
- endif()
-
- if (OJPH_DISABLE_INTEL_SIMD)
-@@ -40,9 +40,6 @@ if (OJPH_DISABLE_INTEL_SIMD)
- 	endif()
+@@ -54,9 +54,6 @@ if (OJPH_CODE_COVERAGE AND NOT MSVC)
+ 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
  endif()
 
 -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin)
 -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../bin)
 -
- include_directories(src/core/common)
- include_directories(src/apps/common)
- file(GLOB SOURCES "src/core/coding/*.cpp" "src/core/others/*.cpp" "src/core/codestream/*.cpp" "src/core/transform/ojph_colour.cpp" "src/core/transform/ojph_transform.cpp")
-@@ -53,7 +50,7 @@ file(GLOB AVX2_SOURCES "src/core/transform/*_avx2.cpp"
+ ############################################################
+ if( OJPH_ENABLE_TIFF_SUPPORT )
+
+@@ -103,7 +100,7 @@ file(GLOB AVX2_SOURCES "src/core/transform/*_avx2.cpp"
 
  CONFIGURE_FILE(
    "${CMAKE_CURRENT_SOURCE_DIR}/src/pkg-config.pc.cmake"
@@ -28,8 +19,12 @@
  )
 
  if (OJPH_DISABLE_INTEL_SIMD)
-@@ -69,10 +66,10 @@ set_target_properties(openjph
-     OUTPUT_NAME "openjph"
+@@ -116,13 +113,13 @@ target_include_directories(openjph PUBLIC src/core/com
+
+ set_target_properties(openjph
+   PROPERTIES
+-    OUTPUT_NAME "openjph.${OPENJPH_VERSION_MAJOR}.${OPENJPH_VERSION_MINOR}.${OPENJPH_VERSION_PATCH}"
++    OUTPUT_NAME "openjph"
  )
 
 -if (OPENJPH_VERSION AND CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -41,11 +36,14 @@
  endif()
 
  if (MSVC)
-@@ -107,6 +104,6 @@ INSTALL (DIRECTORY src/core/common/
+@@ -165,8 +162,8 @@ INSTALL (DIRECTORY src/core/common/
    FILES_MATCHING
    PATTERN "*.h")
 
 -INSTALL(FILES "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${PROJECT_NAME}.pc"
+-        DESTINATION lib/pkgconfig)
 +INSTALL(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
-         DESTINATION lib/pkgconfig)
++        DESTINATION libdata/pkgconfig)
 
+ ################################################################################################
+ # Testing