Mercurial > mxe-octave
changeset 2844:e7027f79cdcd
update package vigra
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Tue, 06 Nov 2012 22:13:45 +0100 |
| parents | 3e0cb61c076d |
| children | c2642e72482c |
| files | index.html src/vigra-1-cmake-static-linking.patch src/vigra.mk |
| diffstat | 3 files changed, 2 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Mon Nov 05 21:21:19 2012 +0100 +++ b/index.html Tue Nov 06 22:13:45 2012 +0100 @@ -1915,7 +1915,7 @@ </tr> <tr> <td id="vigra-package">vigra</td> - <td id="vigra-version">1.8.0</td> + <td id="vigra-version">1.9.0</td> <td id="vigra-website"><a href="http://hci.iwr.uni-heidelberg.de/vigra">vigra</a></td> </tr> <tr>
--- a/src/vigra-1-cmake-static-linking.patch Mon Nov 05 21:21:19 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -https://github.com/ukoethe/vigra/pull/115 - -From 88437f115f797c14692b06b20629c3b2fc2c6256 Mon Sep 17 00:00:00 2001 -From: Joachim Schleicher <J.Schleicher@stud.uni-heidelberg.de> -Date: Thu, 26 Apr 2012 19:00:27 +0200 -Subject: [PATCH] modify cmake files for static linking - -* add definition -DVIGRA_STATIC_LIB if library is imported using cmake -* change order of imports that is relevant if linking static ---- - config/FindOpenEXR.cmake | 9 +++++---- - config/VigraConfig.cmake.in | 5 +++++ - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/config/FindOpenEXR.cmake b/config/FindOpenEXR.cmake -index 0733d10..1e405b5 100644 ---- a/config/FindOpenEXR.cmake -+++ b/config/FindOpenEXR.cmake -@@ -25,11 +25,11 @@ - - FIND_PATH(OPENEXR_INCLUDE_DIR ImfRgbaFile.h PATH_SUFFIXES OpenEXR) - -+FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf) -+FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath) - FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half) - FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex) - FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread) --FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath) --FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf) - - INCLUDE(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG -@@ -38,6 +38,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENEXR DEFAULT_MSG - ) - - IF(OPENEXR_FOUND) -- SET(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} -- ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY}) -+ SET(OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} -+ ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_HALF_LIBRARY} -+ ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ) - ENDIF(OPENEXR_FOUND) -diff --git a/config/VigraConfig.cmake.in b/config/VigraConfig.cmake.in -index f2af5dd..ddcae12 100644 ---- a/config/VigraConfig.cmake.in -+++ b/config/VigraConfig.cmake.in -@@ -2,4 +2,9 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(Vigra_TOP_DIR "${SELF_DIR}/../../" ABSOLUTE) - - include(${SELF_DIR}/vigra-targets.cmake) -+get_target_property(VIGRA_TYPE vigraimpex TYPE) -+if(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY") -+ SET(VIGRA_STATIC_LIB True) -+ ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) -+endif(${VIGRA_TYPE} STREQUAL "STATIC_LIBRARY") - get_filename_component(Vigra_INCLUDE_DIRS "${Vigra_TOP_DIR}/include/" ABSOLUTE) --- -1.7.2.5 -
--- a/src/vigra.mk Mon Nov 05 21:21:19 2012 +0100 +++ b/src/vigra.mk Tue Nov 06 22:13:45 2012 +0100 @@ -3,7 +3,7 @@ PKG := vigra $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2 +$(PKG)_CHECKSUM := 6e4981f4ce75932ec62df6523f577c327f885ba0 $(PKG)_SUBDIR := vigra-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := vigra-$($(PKG)_VERSION)-src.tar.gz $(PKG)_URL := http://hci.iwr.uni-heidelberg.de/vigra/$($(PKG)_FILE)