Fix build with OpenEXR>=3; from FreeBSD
This commit is contained in:
parent
c4499d38b1
commit
f11629a912
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.104 2021/05/24 20:08:15 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.105 2021/08/31 07:32:17 ajacoutot Exp $
|
||||
|
||||
ONLY_FOR_ARCHS = amd64
|
||||
DPB_PROPERTIES = parallel
|
||||
@ -6,7 +6,7 @@ DPB_PROPERTIES = parallel
|
||||
COMMENT = 3D creation software
|
||||
|
||||
DISTNAME = blender-2.92.0
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
CATEGORIES = graphics
|
||||
|
||||
@ -18,15 +18,15 @@ MAINTAINER = Dimitri Karamazov <deserter666@danwin1210.me>
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${MODPY_WANTLIB}
|
||||
WANTLIB += ${COMPILER_LIBCXX} Alembic GL GLEW Half-2_5 Iex-2_5
|
||||
WANTLIB += IlmImf-2_5 IlmThread-2_5 Imath-2_5 OpenColorIO OpenImageIO
|
||||
WANTLIB += ${COMPILER_LIBCXX} Alembic GL GLEW Iex-3_1
|
||||
WANTLIB += IlmThread-3_1 Imath-3_1 OpenColorIO OpenImageIO
|
||||
WANTLIB += SDL2 X11 Xfixes Xi Xrender Xxf86vm avcodec avdevice
|
||||
WANTLIB += avformat avutil blosc boost_atomic-mt boost_chrono-mt
|
||||
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_iostreams-mt
|
||||
WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c fftw3
|
||||
WANTLIB += freetype gmp gmpxx jpeg m openal openjp2 openvdb osdCPU
|
||||
WANTLIB += osdGPU png potrace pugixml sndfile swscale tbb tiff
|
||||
WANTLIB += tinyxml util yaml-cpp z
|
||||
WANTLIB += tinyxml util yaml-cpp z OpenEXR-3_1
|
||||
|
||||
MASTER_SITES = https://download.blender.org/source/ \
|
||||
http://mirror.cs.umn.edu/blender.org/source/
|
||||
@ -78,6 +78,8 @@ NO_TEST = Yes
|
||||
|
||||
CXXFLAGS += -I${LOCALBASE}/include -I${X11BASE}/include
|
||||
CFLAGS += -I${LOCALBASE}/include
|
||||
# Fix build with OpenEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/Imath
|
||||
|
||||
MODPY_ADJ_FILES = release/bin/blender-thumbnailer.py \
|
||||
release/scripts/modules/bl_i18n_utils/merge_po.py \
|
||||
|
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-build_files_cmake_Modules_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:17 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: build_files/cmake/Modules/FindOpenEXR.cmake
|
||||
--- build_files/cmake/Modules/FindOpenEXR.cmake.orig
|
||||
+++ build_files/cmake/Modules/FindOpenEXR.cmake
|
||||
@@ -34,9 +34,8 @@ ENDIF()
|
||||
SET(_openexr_libs_ver_init "2.0")
|
||||
|
||||
SET(_openexr_FIND_COMPONENTS
|
||||
- Half
|
||||
Iex
|
||||
- IlmImf
|
||||
+ OpenEXR
|
||||
IlmThread
|
||||
Imath
|
||||
)
|
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-source_blender_imbuf_intern_openexr_openexr_api_cpp,v 1.1 2021/08/31 07:32:17 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: source/blender/imbuf/intern/openexr/openexr_api.cpp
|
||||
--- source/blender/imbuf/intern/openexr/openexr_api.cpp.orig
|
||||
+++ source/blender/imbuf/intern/openexr/openexr_api.cpp
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <ImfChannelList.h>
|
||||
#include <ImfCompression.h>
|
||||
#include <ImfCompressionAttribute.h>
|
||||
+#include <ImfFrameBuffer.h>
|
||||
#include <ImfIO.h>
|
||||
#include <ImfInputFile.h>
|
||||
#include <ImfOutputFile.h>
|
||||
@@ -94,6 +95,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void)
|
||||
|
||||
using namespace Imf;
|
||||
using namespace Imath;
|
||||
+typedef uint64_t Int64;
|
||||
|
||||
extern "C" {
|
||||
/* prototype */
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2020/05/15 15:44:44 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2021/08/31 07:32:17 ajacoutot Exp $
|
||||
|
||||
COMMENT = Color Transformation Language interpreter
|
||||
|
||||
@ -6,7 +6,7 @@ GH_ACCOUNT = ampas
|
||||
GH_PROJECT = CTL
|
||||
GH_TAGNAME = ctl-1.5.2
|
||||
DISTNAME = ${GH_TAGNAME}
|
||||
REVISION = 6
|
||||
REVISION = 7
|
||||
|
||||
SHARED_LIBS += IlmCtl 1.0 # .2.0
|
||||
SHARED_LIBS += IlmCtlMath 1.0 # .2.0
|
||||
@ -19,8 +19,8 @@ HOMEPAGE = https://github.com/ampas/CTL/
|
||||
# 3-clause BSD license
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} Half-2_5 Iex-2_5 IexMath-2_5 IlmImf-2_5
|
||||
WANTLIB += IlmThread-2_5 Imath-2_5 c m tiff
|
||||
WANTLIB += ${COMPILER_LIBCXX} Iex-3_1 IlmThread-3_1 Imath-3_1 c
|
||||
WANTLIB += OpenEXR-3_1 m tiff
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
@ -28,4 +28,10 @@ MODULES = devel/cmake
|
||||
LIB_DEPENDS = graphics/openexr \
|
||||
graphics/tiff
|
||||
|
||||
# Fix build with OpenEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/OpenEXR -I${LOCALBASE}/include/Imath
|
||||
|
||||
pre-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/configure.cmake
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
29
graphics/ctl/patches/patch-cmake_modules_FindIlmBase_cmake
Normal file
29
graphics/ctl/patches/patch-cmake_modules_FindIlmBase_cmake
Normal file
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-cmake_modules_FindIlmBase_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: cmake/modules/FindIlmBase.cmake
|
||||
--- cmake/modules/FindIlmBase.cmake.orig
|
||||
+++ cmake/modules/FindIlmBase.cmake
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
find_package(PkgConfig QUIET)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
- pkg_check_modules(PC_ILMBASE QUIET IlmBase)
|
||||
+ pkg_check_modules(PC_ILMBASE QUIET Imath)
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
@@ -49,11 +49,7 @@ if(IlmBase_INCLUDE_DIR AND EXISTS "${IlmBase_INCLUDE_D
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-if("${IlmBase_VERSION}" VERSION_LESS "2.0.0")
|
||||
- set(IlmBase_ALL_LIBRARIES Imath Half Iex IlmThread)
|
||||
-else()
|
||||
- set(IlmBase_ALL_LIBRARIES Imath Half Iex IexMath IlmThread)
|
||||
-endif()
|
||||
+set(IlmBase_ALL_LIBRARIES Imath Iex IlmThread)
|
||||
foreach(ILMBASE_LIB ${IlmBase_ALL_LIBRARIES})
|
||||
string(TOUPPER ${ILMBASE_LIB} _upper_ilmbase_lib)
|
||||
find_library(IlmBase_${_upper_ilmbase_lib}_LIBRARY
|
24
graphics/ctl/patches/patch-cmake_modules_FindOpenEXR_cmake
Normal file
24
graphics/ctl/patches/patch-cmake_modules_FindOpenEXR_cmake
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-cmake_modules_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: cmake/modules/FindOpenEXR.cmake
|
||||
--- cmake/modules/FindOpenEXR.cmake.orig
|
||||
+++ cmake/modules/FindOpenEXR.cmake
|
||||
@@ -52,14 +52,14 @@ if(OpenEXR_INCLUDE_DIR AND EXISTS "${OpenEXR_INCLUDE_D
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-find_library(OpenEXR_LIBRARY NAMES IlmImf libIlmImf HINTS ${_OpenEXR_HINT_LIB})
|
||||
+find_library(OpenEXR_LIBRARY NAMES OpenEXR libOpenEXR HINTS ${_OpenEXR_HINT_LIB})
|
||||
|
||||
find_package(IlmBase QUIET)
|
||||
|
||||
unset(_OpenEXR_HINT_INCLUDE)
|
||||
unset(_OpenEXR_HINT_LIB)
|
||||
|
||||
-set(OpenEXR_LIBRARIES ${OpenEXR_LIBRARY} ${IlmBase_LIBRARIES} )
|
||||
+set(OpenEXR_LIBRARIES ${OpenEXR_LIBRARY} ${Imath_LIBRARIES} )
|
||||
set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIR} )
|
||||
|
||||
if(NOT PC_OPENEXR_FOUND)
|
@ -1,7 +1,11 @@
|
||||
$OpenBSD: patch-configure_cmake,v 1.1 2015/09/22 18:38:10 pascal Exp $
|
||||
--- configure.cmake.orig Fri Sep 11 13:22:14 2015
|
||||
+++ configure.cmake Fri Sep 11 13:22:35 2015
|
||||
@@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_cmake,v 1.2 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: configure.cmake
|
||||
--- configure.cmake.orig
|
||||
+++ configure.cmake
|
||||
@@ -1,25 +1,25 @@
|
||||
# Until we get some of these modules into the upstream packages, put them here
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
|
||||
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
|
||||
@ -9,3 +13,34 @@ $OpenBSD: patch-configure_cmake,v 1.1 2015/09/22 18:38:10 pascal Exp $
|
||||
|
||||
find_package( PkgConfig QUIET )
|
||||
|
||||
-find_package( IlmBase QUIET )
|
||||
-if(IlmBase_FOUND)
|
||||
- message( STATUS "found IlmBase, version ${IlmBase_VERSION}" )
|
||||
+find_package( Imath QUIET )
|
||||
+if(Imath_FOUND)
|
||||
+ message( STATUS "found Imath, version ${Imath_VERSION}" )
|
||||
###
|
||||
- ### Everyone (well, except for DPX) uses IlmBase, so
|
||||
+ ### Everyone (well, except for DPX) uses Imath (formerly IlmBase), so
|
||||
### make that a global setting
|
||||
###
|
||||
- include_directories( ${IlmBase_INCLUDE_DIRS} )
|
||||
- link_directories( ${IlmBase_LIBRARY_DIRS} )
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" )
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" )
|
||||
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
|
||||
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
|
||||
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
|
||||
+ include_directories( ${Imath_INCLUDE_DIRS} )
|
||||
+ link_directories( ${Imath_LIBRARY_DIRS} "${LOCALBASE}/lib" )
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Imath_CFLAGS}" )
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Imath_CFLAGS}" )
|
||||
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Imath_LDFLAGS}" )
|
||||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${Imath_LDFLAGS}" )
|
||||
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${Imath_LDFLAGS}" )
|
||||
else()
|
||||
- message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" )
|
||||
+ message( SEND_ERROR "Imath not found, please set the include and library paths manually" )
|
||||
endif()
|
||||
|
||||
find_package( TIFF QUIET )
|
||||
|
15
graphics/ctl/patches/patch-ctlrender_exr__file_cc
Normal file
15
graphics/ctl/patches/patch-ctlrender_exr__file_cc
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-ctlrender_exr__file_cc,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
--- ctlrender/exr_file.cc.orig 2014-06-03 01:11:24 UTC
|
||||
+++ ctlrender/exr_file.cc
|
||||
@@ -63,6 +63,8 @@
|
||||
#include <ImfChannelList.h>
|
||||
#include <Iex.h>
|
||||
|
||||
+#include <fstream>
|
||||
+
|
||||
bool exr_read(const char *name, float scale, ctl::dpx::fb<float> *pixels,
|
||||
format_t *format) {
|
||||
std::ifstream ins;
|
24
graphics/ctl/patches/patch-lib_IlmCtlMath_CtlPointTree.h
Normal file
24
graphics/ctl/patches/patch-lib_IlmCtlMath_CtlPointTree.h
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-lib_IlmCtlMath_CtlPointTree.h,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
--- lib/IlmCtlMath/CtlPointTree.h.orig 2014-06-03 01:11:24 UTC
|
||||
+++ lib/IlmCtlMath/CtlPointTree.h
|
||||
@@ -71,6 +71,8 @@
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
namespace Ctl {
|
||||
|
||||
class PointTree
|
||||
@@ -181,7 +183,7 @@ class PointTree
|
||||
double bl = (_points[b] - _center).length2();
|
||||
|
||||
volatile double delta = fabs (al - bl);
|
||||
- const double eps = 2.0 * Imath::limits<double>::epsilon();
|
||||
+ const double eps = 2.0 * std::numeric_limits<double>::epsilon();
|
||||
|
||||
//
|
||||
// Impose strict weak ordering... if the lengths are the same,
|
15
graphics/ctl/patches/patch-lib_IlmCtlSimd_CMakeLists_txt
Normal file
15
graphics/ctl/patches/patch-lib_IlmCtlSimd_CMakeLists_txt
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-lib_IlmCtlSimd_CMakeLists_txt,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
--- lib/IlmCtlSimd/CMakeLists.txt.orig 2021-04-11 04:27:17 UTC
|
||||
+++ lib/IlmCtlSimd/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" )
|
||||
|
||||
add_executable( halfExpLogTable halfExpLogTable.cpp )
|
||||
-target_link_libraries( halfExpLogTable Half )
|
||||
+target_link_libraries( halfExpLogTable Imath )
|
||||
|
||||
add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
|
||||
COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h"
|
15
graphics/ctl/patches/patch-lib_IlmCtl_CMakeLists_txt
Normal file
15
graphics/ctl/patches/patch-lib_IlmCtl_CMakeLists_txt
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-lib_IlmCtl_CMakeLists_txt,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
--- lib/IlmCtl/CMakeLists.txt.orig 2021-04-11 04:25:00 UTC
|
||||
+++ lib/IlmCtl/CMakeLists.txt
|
||||
@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED}
|
||||
)
|
||||
|
||||
target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} )
|
||||
-target_link_libraries( IlmCtl Iex IlmThread Half )
|
||||
+target_link_libraries( IlmCtl Iex IlmThread Imath)
|
||||
|
||||
set_target_properties( IlmCtl PROPERTIES
|
||||
VERSION ${CTL_VERSION}
|
@ -1,15 +1,21 @@
|
||||
$OpenBSD: patch-lib_IlmImfCtl_CMakeLists_txt,v 1.1 2015/09/22 18:38:10 pascal Exp $
|
||||
--- lib/IlmImfCtl/CMakeLists.txt.orig Fri Sep 11 14:04:30 2015
|
||||
+++ lib/IlmImfCtl/CMakeLists.txt Fri Sep 11 14:04:45 2015
|
||||
@@ -7,6 +7,11 @@ add_library( IlmImfCtl ${DO_SHARED}
|
||||
$OpenBSD: patch-lib_IlmImfCtl_CMakeLists_txt,v 1.2 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: lib/IlmImfCtl/CMakeLists.txt
|
||||
--- lib/IlmImfCtl/CMakeLists.txt.orig
|
||||
+++ lib/IlmImfCtl/CMakeLists.txt
|
||||
@@ -7,7 +7,12 @@ add_library( IlmImfCtl ${DO_SHARED}
|
||||
ImfCtlCopyFunctionArg.cpp
|
||||
)
|
||||
|
||||
-target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
|
||||
+set_target_properties( IlmImfCtl PROPERTIES
|
||||
+ VERSION ${CTL_VERSION}
|
||||
+ SOVERSION ${CTL_VERSION}
|
||||
+)
|
||||
+
|
||||
target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
|
||||
+target_link_libraries( IlmImfCtl IlmCtl OpenEXR Iex IlmThread Imath )
|
||||
|
||||
install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.110 2021/07/04 17:23:53 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.111 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= amd64 aarch64
|
||||
|
||||
@ -8,6 +8,7 @@ V= 3.6.0
|
||||
DISTNAME= darktable-$V
|
||||
PORTROACH= limitw:1,even skipv:release-$V
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= graphics x11
|
||||
|
||||
@ -17,14 +18,14 @@ HOMEPAGE= https://www.darktable.org/
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
|
||||
WANTLIB += GraphicsMagick ICE Iex-2_5 IlmImf-2_5 IlmThread-2_5
|
||||
WANTLIB += Imath-2_5 SM X11 Xext Xrandr atk-1.0 avif c cairo cairo-gobject
|
||||
WANTLIB += GraphicsMagick ICE Iex-3_1 IlmThread-3_1
|
||||
WANTLIB += Imath-3_1 SM X11 Xext Xrandr atk-1.0 avif c cairo cairo-gobject
|
||||
WANTLIB += cups curl exiv2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB += gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port gthread-2.0
|
||||
WANTLIB += gtk-3 harfbuzz intl jpeg json-glib-1.0 lcms2 lensfun
|
||||
WANTLIB += m openjp2 osmgpsmap-1.0 pango-1.0 pangocairo-1.0 png
|
||||
WANTLIB += pugixml rsvg-2 secret-1 soup-2.4 sqlite3 tiff webp
|
||||
WANTLIB += xml2 z
|
||||
WANTLIB += xml2 z OpenEXR-3_1 icudata icui18n icuuc
|
||||
|
||||
MASTER_SITES= https://github.com/darktable-org/darktable/releases/download/release-$V/
|
||||
|
||||
@ -82,6 +83,9 @@ CFLAGS+= -msse3
|
||||
CXXFLAGS= ${CFLAGS}
|
||||
.endif
|
||||
|
||||
# Fix build with OpenEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/Imath
|
||||
|
||||
post-install:
|
||||
cd ${PREFIX}/lib && ln -s darktable/libdarktable.so
|
||||
|
||||
|
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-cmake_modules_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: cmake/modules/FindOpenEXR.cmake
|
||||
--- cmake/modules/FindOpenEXR.cmake.orig
|
||||
+++ cmake/modules/FindOpenEXR.cmake
|
||||
@@ -24,9 +24,6 @@ find_path(_OPENEXR_LIB_DIR OpenEXR
|
||||
set(OpenEXR_LIB_DIR ${_OPENEXR_LIB_DIR})
|
||||
mark_as_advanced(OpenEXR_LIB_DIR)
|
||||
|
||||
-find_library(_OPENEXR_LIBRARY_IMIMF IlmImf
|
||||
- HINTS ENV OPENEXR_LIB_DIR)
|
||||
-set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMIMF})
|
||||
find_library(_OPENEXR_LIBRARY_IMATH Imath
|
||||
HINTS ENV OPENEXR_LIB_DIR)
|
||||
set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMATH})
|
@ -1,10 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.72 2021/02/23 19:39:25 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.73 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa
|
||||
|
||||
COMMENT = panorama image stitcher
|
||||
|
||||
DISTNAME = hugin-2020.0.0
|
||||
REVISION = 0
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
# not needed for releases, but makes RCs/betas easier to work with
|
||||
@ -28,8 +29,8 @@ MAINTAINER = Kirill Bychkov <kirby@openbsd.org>
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU Half-2_5 Iex-2_5 IlmImf-2_5
|
||||
WANTLIB += IlmThread-2_5 Imath-2_5 X11 boost_filesystem-mt boost_system-mt
|
||||
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU Iex-3_1 OpenEXR-3_1
|
||||
WANTLIB += IlmThread-3_1 Imath-3_1 X11 boost_filesystem-mt boost_system-mt
|
||||
WANTLIB += c exiv2 fftw3 jpeg lcms2 m pano13 png ${MODPY_WANTLIB} sqlite3
|
||||
WANTLIB += tiff vigraimpex wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
|
||||
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
|
||||
@ -67,6 +68,9 @@ CONFIGURE_ARGS += -DBUILD_HSI=ON \
|
||||
-Wno-dev
|
||||
NO_TEST = Yes
|
||||
|
||||
# Fix build with OpeEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/Imath
|
||||
|
||||
MODPY_ADJ_FILES = src/hugin_script_interface/hpi.py \
|
||||
src/hugin_script_interface/plugins/shooting_pattern.py \
|
||||
src/hugin_script_interface/plugins/woa.py \
|
||||
|
34
graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake
Normal file
34
graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake
Normal file
@ -0,0 +1,34 @@
|
||||
$OpenBSD: patch-CMakeModules_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpeEXR>=3
|
||||
|
||||
Index: CMakeModules/FindOpenEXR.cmake
|
||||
--- CMakeModules/FindOpenEXR.cmake.orig
|
||||
+++ CMakeModules/FindOpenEXR.cmake
|
||||
@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW)
|
||||
include(FindLibraryWithDebug)
|
||||
find_library_with_debug(OPENEXR_HALF_LIBRARY
|
||||
WIN32_DEBUG_POSTFIX d
|
||||
- NAMES Half-2_5 Half-2_4 Half-2_3 Half
|
||||
+ NAMES Imath
|
||||
PATHS
|
||||
${_OPENEXRLinkDir}
|
||||
${SYSTEM_LIB_DIRS}
|
||||
@@ -45,7 +45,7 @@ ENDIF (NOT WIN32 OR MINGW)
|
||||
|
||||
find_library_with_debug(OPENEXR_IEX_LIBRARY
|
||||
WIN32_DEBUG_POSTFIX d
|
||||
- NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
|
||||
+ NAMES Iex
|
||||
PATHS
|
||||
${_OPENEXRLinkDir}
|
||||
${SYSTEM_LIB_DIRS}
|
||||
@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW)
|
||||
|
||||
find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
|
||||
WIN32_DEBUG_POSTFIX d
|
||||
- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
|
||||
+ NAMES OpenEXR
|
||||
PATHS
|
||||
${_OPENEXRLinkDir}
|
||||
${SYSTEM_LIB_DIRS}
|
@ -1,9 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.51 2021/08/06 17:07:53 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.52 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
COMMENT = advanced drawing and image manipulation
|
||||
|
||||
VERSION = 4.4.7
|
||||
DISTNAME = krita-${VERSION}
|
||||
REVISION = 0
|
||||
|
||||
SHARED_LIBS += kritabasicflakes 4.0 # 16.0
|
||||
SHARED_LIBS += kritacolord 1.0 # 16.0
|
||||
@ -43,8 +44,8 @@ MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
|
||||
# GPLv2+, LGPLv2+ and GNU FDLv1.2
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} Half-2_5 ICE Iex-2_5 IlmImf-2_5
|
||||
WANTLIB += IlmThread-2_5 Imath-2_5 KF5Completion KF5ConfigCore
|
||||
WANTLIB += ${COMPILER_LIBCXX} ICE Iex-3_1 OpenEXR-3_1
|
||||
WANTLIB += IlmThread-3_1 Imath-3_1 KF5Completion KF5ConfigCore
|
||||
WANTLIB += KF5ConfigGui KF5CoreAddons KF5Crash KF5GuiAddons KF5I18n
|
||||
WANTLIB += KF5ItemViews KF5WidgetsAddons KF5WindowSystem OpenColorIO
|
||||
WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
|
||||
@ -109,6 +110,9 @@ CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_SIP=ON \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_PyQt5=ON \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON
|
||||
|
||||
# Fix build with OpenEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/Imath
|
||||
|
||||
TEST_IS_INTERACTIVE = X11
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
38
graphics/krita/patches/patch-cmake_modules_FindOpenEXR_cmake
Normal file
38
graphics/krita/patches/patch-cmake_modules_FindOpenEXR_cmake
Normal file
@ -0,0 +1,38 @@
|
||||
$OpenBSD: patch-cmake_modules_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: cmake/modules/FindOpenEXR.cmake
|
||||
--- cmake/modules/FindOpenEXR.cmake.orig
|
||||
+++ cmake/modules/FindOpenEXR.cmake
|
||||
@@ -23,7 +23,7 @@
|
||||
#
|
||||
|
||||
find_path(OPENEXR_INCLUDE_DIR
|
||||
- OpenEXR/half.h
|
||||
+ OpenEXR/ImfHeader.h
|
||||
HINTS
|
||||
"${OPENEXR_LOCATION}"
|
||||
"$ENV{OPENEXR_LOCATION}"
|
||||
@@ -57,11 +57,10 @@ if(OPENEXR_INCLUDE_DIR)
|
||||
endif()
|
||||
|
||||
foreach(OPENEXR_LIB
|
||||
- Half
|
||||
Iex
|
||||
- Imath
|
||||
- IlmImf
|
||||
+ OpenEXR
|
||||
IlmThread
|
||||
+ Imath
|
||||
)
|
||||
|
||||
# OpenEXR libraries may be suffixed with the version number, so we search
|
||||
@@ -87,6 +86,7 @@ endforeach(OPENEXR_LIB)
|
||||
# So #include <half.h> works
|
||||
list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
|
||||
list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/OpenEXR)
|
||||
+list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/Imath)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(OpenEXR
|
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-plugins_impex_exr_exr_converter_cc,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: plugins/impex/exr/exr_converter.cc
|
||||
--- plugins/impex/exr/exr_converter.cc.orig
|
||||
+++ plugins/impex/exr/exr_converter.cc
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
#include <ImfAttribute.h>
|
||||
#include <ImfChannelList.h>
|
||||
+#include <ImfFrameBuffer.h>
|
||||
+#include <ImfHeader.h>
|
||||
#include <ImfInputFile.h>
|
||||
#include <ImfOutputFile.h>
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2020/05/14 12:35:31 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
COMMENT = image processing and analysis library
|
||||
ONLY_FOR_ARCHS = ${CXX11_ARCHS}
|
||||
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = ${CXX11_ARCHS}
|
||||
V = 1-11-1
|
||||
DISTNAME = vigra-${V:S/-/./g}-src
|
||||
PKGNAME = vigra-${V:S/-/./g}
|
||||
REVISION = 4
|
||||
REVISION = 5
|
||||
|
||||
SHARED_LIBS = vigraimpex 0.0 # 5.1
|
||||
|
||||
@ -21,8 +21,8 @@ MASTER_SITES = https://github.com/ukoethe/vigra/releases/download/Version-${V}/
|
||||
# MIT
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} Half-2_5 Iex-2_5 IlmImf-2_5 IlmThread-2_5
|
||||
WANTLIB += Imath-2_5 boost_atomic-mt boost_chrono-mt boost_date_time-mt
|
||||
WANTLIB += ${COMPILER_LIBCXX} Iex-3_1 IlmThread-3_1 OpenEXR-3_1
|
||||
WANTLIB += Imath-3_1 boost_atomic-mt boost_chrono-mt boost_date_time-mt
|
||||
WANTLIB += boost_system-mt boost_thread-mt fftw3 jpeg m png tiff
|
||||
WANTLIB += z
|
||||
|
||||
@ -48,6 +48,8 @@ CONFIGURE_ARGS = -DWITH_VIGRANUMPY=0 \
|
||||
-Wno-dev
|
||||
|
||||
CXXFLAGS += -std=c++11 -pthread
|
||||
# Fix build with OpenEXR>=3 (Imath split)
|
||||
CXXFLAGS += -I${LOCALBASE}/include/Imath
|
||||
|
||||
# Actually, there are tests, but they do work only on GCC.
|
||||
# If you want to play, just add -DAUTOBUILD_TESTS=ON to CONFIGURE_ARGS.
|
||||
|
25
graphics/vigra/patches/patch-config_FindOpenEXR_cmake
Normal file
25
graphics/vigra/patches/patch-config_FindOpenEXR_cmake
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-config_FindOpenEXR_cmake,v 1.1 2021/08/31 07:32:18 ajacoutot Exp $
|
||||
|
||||
Fix build with OpenEXR>=3
|
||||
|
||||
Index: config/FindOpenEXR.cmake
|
||||
--- config/FindOpenEXR.cmake.orig
|
||||
+++ config/FindOpenEXR.cmake
|
||||
@@ -27,7 +27,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFI
|
||||
|
||||
FOREACH(V "" -2_2 -2_1 -2_0 -1_7)
|
||||
if(NOT OPENEXR_ILMIMF_LIBRARY)
|
||||
- FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf${V})
|
||||
+ FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES OpenEXR${V})
|
||||
if(OPENEXR_ILMIMF_LIBRARY)
|
||||
set(OPENEXR_VERSION ${V})
|
||||
endif()
|
||||
@@ -37,7 +37,7 @@ ENDFOREACH(V)
|
||||
FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath${OPENEXR_VERSION})
|
||||
FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex${OPENEXR_VERSION})
|
||||
FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread${OPENEXR_VERSION})
|
||||
-FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half)
|
||||
+FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Imath)
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
|
Loading…
Reference in New Issue
Block a user