Petr Gajdos
e7ea672b17
2.5.2
* Invalid input could cause a heap-use-after-free error in DeepScanLineInputFile::DeepScanLineInputFile()
* Invalid chunkCount attributes could cause heap buffer overflow in getChunkOffsetTableSize()
* Invalid tiled input file could cause invalid memory access TiledInputFile::TiledInputFile()
* OpenEXRConfig.h now correctly sets OPENEXR_PACKAGE_STRING to "OpenEXR" (rather than "IlmBase")
2.5.1
* A patch release that corrects the SO version for the v2.5 release,
which missed getting bumped in v2.5.0.
* This release also fixes an improper failure in IlmImfTest when running
on ARMv7 and AAarch64.
2.5.0
* No more build-time header generation: toFloat.h, eLut.h,
b44ExpLogTable.h, and dwaLookups.h are now ordinary header files, no
longer generated on the fly.
* New StdISSTream class, an "input" stringstream version of StdOSStream
* New Matrix22 class in Imath
* Chromaticity comparison operator now includes white (formerly ignored)
* Various cmake fixes
* Bug fixes for various memory leaks
* Bug fixes for various invalid memory accesses
* New checks to detect damaged input files
* OpenEXR_Viewers has been deprecated, removed from the top-level
cmake build and documentation.
- modified patches
% 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch (refreshed)
- modified sources
% baselibs.conf
OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=49
61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
From d874a3ce5ad741ea61f42953c779d50ae93b66d6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Mon, 10 Feb 2020 18:37:32 +0100
|
|
Subject: [PATCH] Use absolute CMAKE_INSTALL_FULL_LIBDIR for libdir in
|
|
pkgconfig files
|
|
|
|
According to cmake GNUInstallDirs documentation, CMAKE_INSTALL_LIBDIR
|
|
may be either absolute or relative to CMAKE_INSTALL_PREFIX. Use
|
|
CMAKE_INSTALL_FULL_LIBDIR, which is always the full absolute path.
|
|
|
|
Remove unused exec_prefix variable.
|
|
|
|
Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595
|
|
---
|
|
IlmBase/IlmBase.pc.in | 1 -
|
|
IlmBase/config/CMakeLists.txt | 5 ++---
|
|
OpenEXR/OpenEXR.pc.in | 1 -
|
|
OpenEXR/config/CMakeLists.txt | 5 ++---
|
|
4 files changed, 4 insertions(+), 8 deletions(-)
|
|
|
|
Index: openexr-2.5.2/IlmBase/IlmBase.pc.in
|
|
===================================================================
|
|
--- openexr-2.5.2.orig/IlmBase/IlmBase.pc.in 2020-06-14 03:26:22.000000000 +0200
|
|
+++ openexr-2.5.2/IlmBase/IlmBase.pc.in 2020-06-29 13:41:03.671230961 +0200
|
|
@@ -4,7 +4,6 @@
|
|
##
|
|
|
|
prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
includedir=@includedir@
|
|
libsuffix=@LIB_SUFFIX_DASH@
|
|
Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in
|
|
===================================================================
|
|
--- openexr-2.5.2.orig/OpenEXR/OpenEXR.pc.in 2020-06-14 03:26:22.000000000 +0200
|
|
+++ openexr-2.5.2/OpenEXR/OpenEXR.pc.in 2020-06-29 13:41:03.671230961 +0200
|
|
@@ -4,7 +4,6 @@
|
|
##
|
|
|
|
prefix=@prefix@
|
|
-exec_prefix=@exec_prefix@
|
|
libdir=@libdir@
|
|
includedir=@includedir@
|
|
OpenEXR_includedir=@includedir@/OpenEXR
|
|
Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt
|
|
===================================================================
|
|
--- openexr-2.5.2.orig/OpenEXR/config/CMakeLists.txt 2020-06-29 13:41:03.671230961 +0200
|
|
+++ openexr-2.5.2/OpenEXR/config/CMakeLists.txt 2020-06-29 13:42:39.243805692 +0200
|
|
@@ -72,9 +72,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
|
|
# use a helper function to avoid variable pollution, but pretty simple
|
|
function(openexr_pkg_config_help pcinfile)
|
|
set(prefix ${CMAKE_INSTALL_PREFIX})
|
|
- set(exec_prefix "\${prefix}")
|
|
- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
|
|
- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
|
|
+ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_FULL_LIBDIR}")
|
|
+ set(includedir "\${prefix}/${CMAKE_INSTALL_FULL_INCLUDEDIR}")
|
|
set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
|
|
if(TARGET Threads::Threads)
|
|
# hrm, can't use properties as they end up as generator expressions
|