Accepting request 818885 from home:StefanBruens:branches:graphics

- Fix 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch
  so pkgconfig file has no duplicate prefix.
- Run test suite also on all other archs but i586 and ppc64(be)

OBS-URL: https://build.opensuse.org/request/show/818885
OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=50

0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch

@@ -1,4 +1,4 @@
-From d874a3ce5ad741ea61f42953c779d50ae93b66d6 Mon Sep 17 00:00:00 2001
+From e1084440d543f3045038cc4e5fdc0a67eabf06d6 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
@@ -12,16 +12,17 @@ Remove unused exec_prefix variable.
 
 Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595
 ---
- IlmBase/IlmBase.pc.in         | 1 -
+ IlmBase/IlmBase.pc.in           | 1 -
- IlmBase/config/CMakeLists.txt | 5 ++---
+ IlmBase/config/CMakeLists.txt   | 4 ++--
- OpenEXR/OpenEXR.pc.in         | 1 -
+ OpenEXR/OpenEXR.pc.in           | 1 -
- OpenEXR/config/CMakeLists.txt | 5 ++---
+ OpenEXR/config/CMakeLists.txt   | 5 ++---
- 4 files changed, 4 insertions(+), 8 deletions(-)
+ PyIlmBase/config/CMakeLists.txt | 4 ++--
+ 5 files changed, 6 insertions(+), 9 deletions(-)
 
-Index: openexr-2.5.2/IlmBase/IlmBase.pc.in
+diff --git a/IlmBase/IlmBase.pc.in b/IlmBase/IlmBase.pc.in
-===================================================================
+index 45fc4de..1edd055 100644
---- openexr-2.5.2.orig/IlmBase/IlmBase.pc.in	2020-06-14 03:26:22.000000000 +0200
+--- a/IlmBase/IlmBase.pc.in
-+++ openexr-2.5.2/IlmBase/IlmBase.pc.in	2020-06-29 13:41:03.671230961 +0200
++++ b/IlmBase/IlmBase.pc.in
 @@ -4,7 +4,6 @@
  ##
  
@@ -30,10 +31,25 @@ Index: openexr-2.5.2/IlmBase/IlmBase.pc.in
  libdir=@libdir@
  includedir=@includedir@
  libsuffix=@LIB_SUFFIX_DASH@
-Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in
+diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt
-===================================================================
+index d9c5ae4..fc161b0 100644
---- openexr-2.5.2.orig/OpenEXR/OpenEXR.pc.in	2020-06-14 03:26:22.000000000 +0200
+--- a/IlmBase/config/CMakeLists.txt
-+++ openexr-2.5.2/OpenEXR/OpenEXR.pc.in	2020-06-29 13:41:03.671230961 +0200
++++ b/IlmBase/config/CMakeLists.txt
+@@ -76,8 +76,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG)
+   function(ilmbase_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 "${CMAKE_INSTALL_FULL_LIBDIR}")
++    set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+     set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX})
+     if(TARGET Threads::Threads)
+       # hrm, can't use properties as they end up as generator expressions
+diff --git a/OpenEXR/OpenEXR.pc.in b/OpenEXR/OpenEXR.pc.in
+index cf72f88..4df6035 100644
+--- a/OpenEXR/OpenEXR.pc.in
++++ b/OpenEXR/OpenEXR.pc.in
 @@ -4,7 +4,6 @@
  ##
  
@@ -42,10 +58,10 @@ Index: openexr-2.5.2/OpenEXR/OpenEXR.pc.in
  libdir=@libdir@
  includedir=@includedir@
  OpenEXR_includedir=@includedir@/OpenEXR
-Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt
+diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt
-===================================================================
+index b52ad0d..59f4916 100644
---- openexr-2.5.2.orig/OpenEXR/config/CMakeLists.txt	2020-06-29 13:41:03.671230961 +0200
+--- a/OpenEXR/config/CMakeLists.txt
-+++ openexr-2.5.2/OpenEXR/config/CMakeLists.txt	2020-06-29 13:42:39.243805692 +0200
++++ b/OpenEXR/config/CMakeLists.txt
 @@ -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)
@@ -53,8 +69,26 @@ Index: openexr-2.5.2/OpenEXR/config/CMakeLists.txt
 -    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(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
-+    set(includedir "\${prefix}/${CMAKE_INSTALL_FULL_INCLUDEDIR}")
++    set(includedir "${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
+diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt
+index 1872c89..a971723 100644
+--- a/PyIlmBase/config/CMakeLists.txt
++++ b/PyIlmBase/config/CMakeLists.txt
+@@ -16,8 +16,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
+   function(pyilmbase_pkg_config_help pcinfile)
+     set(prefix ${CMAKE_INSTALL_PREFIX})
+     set(exec_prefix ${CMAKE_INSTALL_BINDIR})
+-    set(libdir ${CMAKE_INSTALL_LIBDIR})
+-    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
++    set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++    set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
+     string(REPLACE ".in" "" pcout ${pcinfile})
+     configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
+-- 
+2.27.0
+

openexr.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jul  5 22:46:48 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch
+  so pkgconfig file has no duplicate prefix.
+- Run test suite also on all other archs but i586 and ppc64(be)
+
 -------------------------------------------------------------------
 Mon Jun 29 12:44:02 UTC 2020 - pgajdos@suse.com
 

openexr.spec

@@ -102,7 +102,7 @@ Industrial Light & Magic for use in computer imaging applications.
 This package contains header files.
 
 %package doc
-Summary:        Documentatino for the 16-bit FP EXR picture handling library
+Summary:        Documentation for the 16-bit FP EXR picture handling library
 Group:          Documentation/Other
 Obsoletes:      OpenEXR-doc <= 1.6.1
 Provides:       OpenEXR-doc = %{version}
@@ -137,7 +137,7 @@ for i in $(find -name Makefile); do
          $i
 done
 %endif
-make %{?_smp_mflags}
+%cmake_build
 popd
 
 %install
@@ -146,9 +146,9 @@ pushd OpenEXR
 popd
 
 %check
-%ifarch x86_64
+%ifnarch i586 ppc64
 pushd OpenEXR
-export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="%{buildroot}/%{_libdir}"
 # tests can take longer than the default timeout of 25 minutes
 %if 0%{?suse_version} < 1550
 # HACK - older versions of the ctest macro do not allow passing additional parameters

v2.4.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-size 26809861