Mercurial > mxe-octave

changeset 5395:950a0d9b20f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/openexr.mk: update to v2.5.0, disable docs, examples
author John Donoghue <john.donoghue@ieee.org>
date Mon, 11 May 2020 13:12:55 -0400
parents a26ae4ba84d1
children 3417e1f0d5ed
files src/openexr.mk
diffstat 1 files changed, 10 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/openexr.mk	Mon May 11 10:24:22 2020 -0400
+++ b/src/openexr.mk	Mon May 11 13:12:55 2020 -0400
@@ -3,8 +3,8 @@
 
 PKG             := openexr
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.4.1
-$(PKG)_CHECKSUM := 7a5fc26f7b383fec8bc5a3638ceb7d0b0d1913f7
+$(PKG)_VERSION  := 2.5.0
+$(PKG)_CHECKSUM := 9816265d2cd395f63625f1efc90515388621689f
 $(PKG)_SUBDIR   := openexr-$($(PKG)_VERSION)
 $(PKG)_FILE     := openexr-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/$(PKG)/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
@@ -22,53 +22,35 @@
     cd '$(1)/build' && cmake ..  \
       -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
       -DBUILD_TESTING='OFF' \
+      -DINSTALL_OPENEXR_DOCS='OFF' \
+      -DINSTALL_OPENEXR_EXAMPLES='OFF' \
+      -DOPENEXR_BUILD_UTILS='OFF' \
       -DPYILMBASE_ENABLE='OFF' \
       -DOPENEXR_VIEWERS_ENABLE='OFF'
 
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1
-    $(MAKE) -C '$(1)/build' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=  DESTDIR='$(3)'
+    $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)'
 endef
 
 else
 define $(PKG)_BUILD
-    # native build of parts
-    mkdir '$(1)/native'
-    cd '$(1)/native' && cmake ..  \
-      -DCMAKE_BUILD_TYPE='Release' \
-      -DBUILD_SHARED_LIBS='OFF' \
-      -DBUILD_TESTING='OFF' \
-      -DPYILMBASE_ENABLE='OFF' \
-      -DOPENEXR_VIEWERS_ENABLE='OFF' \
-      -DCMAKE_FIND_ROOT_PATH='$(ROOT_PREFIX)' 
-    $(MAKE) -C '$(1)/native/IlmBase/Half/' eLut toFloat VERBOSE=1
-    $(MAKE) -C '$(1)/native/OpenEXR/IlmImf' dwaLookups b44ExpLogTable VERBOSE=1
-
-    # cross compile part
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake ..  \
       -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
       -DBUILD_TESTING='OFF' \
       -DCMAKE_VERBOSE_MAKEFILE='ON' \
       -DPYILMBASE_ENABLE='OFF' \
+      -DINSTALL_OPENEXR_DOCS='OFF' \
+      -DINSTALL_OPENEXR_EXAMPLES='OFF' \
+      -DOPENEXR_BUILD_UTILS='OFF' \
       -DOPENEXR_VIEWERS_ENABLE='OFF' \
       -DOPENEXR_INSTALL_PKG_CONFIG='ON' \
       -DILMBASE_LIB_SUFFIX='' \
       -DOPENEXR_LIB_SUFFIX='' \
       -DCMAKE_CXX_STANDARD=11 \
       -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500'
-    $(MAKE) -C '$(1)/build/IlmBase/Half/' eLut toFloat VERBOSE=1
-
-    # now use native build generators
-    cd '$(1)/build/IlmBase/Half/' && '$(1)/native/IlmBase/Half/toFloat' > toFloat.h
-    cd '$(1)/build/IlmBase/Half/' && '$(1)/native/IlmBase/Half/eLut' > eLut.h
-
-    $(MAKE) -C '$(1)/build/OpenEXR/IlmImf' dwaLookups b44ExpLogTable VERBOSE=1
-
-    cd '$(1)/build/OpenEXR/IlmImf/' && '$(1)/native/bin/dwaLookups' > dwaLookups.h
-    cd '$(1)/build/OpenEXR/IlmImf/' && '$(1)/native/bin/b44ExpLogTable' > b44ExpLogTable.h
 
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' VERBOSE=1
-    $(MAKE) -C '$(1)/build' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=  DESTDIR='$(3)'
-
+    $(MAKE) -C '$(1)/build' -j 1 install DESTDIR='$(3)'
 endef
 endif