Update to OpenEXR-2.4.1.

This commit is contained in:
ajacoutot 2020-02-15 15:35:33 +00:00
parent 9f4adac1d5
commit cc604a7ae5
5 changed files with 18 additions and 54 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.38 2019/12/18 13:16:15 visa Exp $
# $OpenBSD: Makefile,v 1.39 2020/02/15 15:35:33 ajacoutot Exp $
COMMENT-main= high dynamic range image format
COMMENT-tools= image viewing tools for OpenEXR
COMMENT-doc= developer documentation for OpenEXR
V= 2.4.0
V= 2.4.1
GH_ACCOUNT= openexr
GH_PROJECT= openexr
GH_TAGNAME= v${V}
@ -13,9 +13,6 @@ PKGNAME-main= OpenEXR-${V}
PKGNAME-tools= OpenEXR-tools-${V}
PKGNAME-doc= OpenEXR-doc-${V}
REVISION-main= 1
REVISION-tools= 0
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# XXX /!\ LIBHalf-2_4_VERSION is used for all libs in post-install

View File

@ -1,2 +1,2 @@
SHA256 (openexr-2.4.0.tar.gz) = SQTF6nkUpY9gpeL7w5e+Z+eiXDgNfQfBwxo+7/8ckvE=
SIZE (openexr-2.4.0.tar.gz) = 26806627
SHA256 (openexr-2.4.1.tar.gz) = PrvpqOZ+20oliQuYxZjp/iOxD5bRQW1qP/BzLpnQAcE=
SIZE (openexr-2.4.1.tar.gz) = 26809861

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-IlmBase_config_LibraryDefine_cmake,v 1.1 2019/11/10 15:31:08 ajacoutot Exp $
From 4e54bde78f65c0fef8a9f794aaacea07813fba09 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Sat, 19 Oct 2019 09:58:10 +0200
Subject: [PATCH] Take DESTDIR into account when creating library symlinks
Index: IlmBase/config/LibraryDefine.cmake
--- IlmBase/config/LibraryDefine.cmake.orig
+++ IlmBase/config/LibraryDefine.cmake
@@ -100,7 +100,7 @@ function(ILMBASE_DEFINE_LIBRARY libname)
if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL ""))
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
set(verlibname)
set(baselibname)

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-OpenEXR_config_LibraryDefine_cmake,v 1.1 2019/11/10 15:31:08 ajacoutot Exp $
From 4e54bde78f65c0fef8a9f794aaacea07813fba09 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Sat, 19 Oct 2019 09:58:10 +0200
Subject: [PATCH] Take DESTDIR into account when creating library symlinks
Index: OpenEXR/config/LibraryDefine.cmake
--- OpenEXR/config/LibraryDefine.cmake.orig
+++ OpenEXR/config/LibraryDefine.cmake
@@ -94,7 +94,7 @@ function(OPENEXR_DEFINE_LIBRARY libname)
if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL ""))
set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX})
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
set(verlibname)
set(baselibname)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2019/11/12 20:13:30 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2020/02/15 15:35:33 ajacoutot Exp $
@conflict ilmbase-*
@pkgpath graphics/openexr
@pkgpath graphics/ilmbase
@ -120,7 +120,6 @@ include/OpenEXR/ImfLineOrder.h
include/OpenEXR/ImfLineOrderAttribute.h
include/OpenEXR/ImfLut.h
include/OpenEXR/ImfMatrixAttribute.h
include/OpenEXR/ImfMisc.h
include/OpenEXR/ImfMultiPartInputFile.h
include/OpenEXR/ImfMultiPartOutputFile.h
include/OpenEXR/ImfMultiView.h
@ -216,21 +215,27 @@ lib/cmake/OpenEXR/
lib/cmake/OpenEXR/OpenEXRConfig${MODCMAKE_BUILD_SUFFIX}
lib/cmake/OpenEXR/OpenEXRConfig.cmake
lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
lib/cmake/PyIlmBase/
lib/cmake/PyIlmBase/PyIlmBaseConfig${MODCMAKE_BUILD_SUFFIX}
lib/cmake/PyIlmBase/PyIlmBaseConfig.cmake
lib/cmake/PyIlmBase/PyIlmBaseConfigVersion.cmake
@lib lib/libHalf-2_4.so.${LIBHalf-2_4_VERSION}
lib/libHalf.so
@so lib/libHalf.so
@lib lib/libIex-2_4.so.${LIBIex-2_4_VERSION}
lib/libIex.so
@so lib/libIex.so
@lib lib/libIexMath-2_4.so.${LIBIexMath-2_4_VERSION}
lib/libIexMath.so
@so lib/libIexMath.so
@lib lib/libIlmImf-2_4.so.${LIBIlmImf-2_4_VERSION}
lib/libIlmImf.so
@so lib/libIlmImf.so
@lib lib/libIlmImfUtil-2_4.so.${LIBIlmImfUtil-2_4_VERSION}
lib/libIlmImfUtil.so
@so lib/libIlmImfUtil.so
@lib lib/libIlmThread-2_4.so.${LIBIlmThread-2_4_VERSION}
lib/libIlmThread.so
@so lib/libIlmThread.so
@lib lib/libImath-2_4.so.${LIBImath-2_4_VERSION}
lib/libImath.so
@so lib/libImath.so
@lib lib/libPyIex_Python3_7-2_4.so.${LIBPyIex_Python3_7-2_4_VERSION}
@lib lib/libPyImath_Python3_7-2_4.so.${LIBPyImath_Python3_7-2_4_VERSION}
lib/pkgconfig/IlmBase.pc
lib/pkgconfig/OpenEXR.pc
@so lib/python${MODPY_VERSION}/site-packages/iex.so
@so lib/python${MODPY_VERSION}/site-packages/imath.so