Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11054037
D11053.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D11053.id.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,6 +1,5 @@
UNKNOWN
-libIex-2_5.so.25
-libIlmImf-2_5.so.25
+libOpenEXR-3_1.so.30
libQt5Concurrent.so.5
libQt5Core.so.5
libQt5Gui.so.5
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -1,3 +1,5 @@
+UNKNOWN:_ZN7Imf_3_114TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEC1ERKS6_
+UNKNOWN:_ZN7Imf_3_114TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcmm
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
@@ -9,43 +11,36 @@
UNKNOWN:_ZTIN5Exiv28AnyErrorE
UNKNOWN:_ZTIN5boost15program_options22error_with_option_nameE
UNKNOWN:_ZTIN5boost15program_options29value_semantic_codecvt_helperIcEE
-UNKNOWN:_ZTIN7Iex_2_57TypeExcE
-UNKNOWN:_ZTIN7Imf_2_59AttributeE
+UNKNOWN:_ZTIN7Imf_3_114TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE
+UNKNOWN:_ZTIN7Imf_3_19AttributeE
UNKNOWN:_ZTVN5boost15program_options13variables_mapE
UNKNOWN:_ZTVN5boost15program_options22error_with_option_nameE
-libIex-2_5.so.25:_ZN7Iex_2_57TypeExcC1EPKc
-libIex-2_5.so.25:_ZN7Iex_2_57TypeExcD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_510OutputFile11writePixelsEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_510OutputFile14setFrameBufferERKNS_11FrameBufferE
-libIlmImf-2_5.so.25:_ZN7Imf_2_510OutputFileC1EPKcRKNS_6HeaderEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_510OutputFileD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_511ChannelList6insertEPKcRKNS_7ChannelE
-libIlmImf-2_5.so.25:_ZN7Imf_2_511FrameBuffer6insertEPKcRKNS_5SliceE
-libIlmImf-2_5.so.25:_ZN7Imf_2_514TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE13readValueFromERNS_7IStreamEii
-libIlmImf-2_5.so.25:_ZN7Imf_2_514TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE14staticTypeNameEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_514whiteLuminanceERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_517globalThreadCountEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_517hasWhiteLuminanceERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_55SliceC1ENS_9PixelTypeEPcmmiidbb
-libIlmImf-2_5.so.25:_ZN7Imf_2_56Header6insertEPKcRKNS_9AttributeE
-libIlmImf-2_5.so.25:_ZN7Imf_2_56Header8channelsEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_56HeaderC1EiifRKN9Imath_2_54Vec2IfEEfNS_9LineOrderENS_11CompressionE
-libIlmImf-2_5.so.25:_ZN7Imf_2_56HeaderD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_57ChannelC1ENS_9PixelTypeEiib
-libIlmImf-2_5.so.25:_ZN7Imf_2_59AttributeC2Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_59AttributeD2Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_59InputFile10readPixelsEii
-libIlmImf-2_5.so.25:_ZN7Imf_2_59InputFile14setFrameBufferERKNS_11FrameBufferE
-libIlmImf-2_5.so.25:_ZN7Imf_2_59InputFileC1EPKci
-libIlmImf-2_5.so.25:_ZN7Imf_2_59InputFileD1Ev
-libIlmImf-2_5.so.25:_ZNK7Imf_2_511ChannelList3endEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_511ChannelList5beginEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_514TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE12writeValueToERNS_7OStreamEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header10dataWindowEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header3endEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header5beginEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header8channelsEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_59InputFile6headerEv
+libOpenEXR-3_1.so.30:_ZN7Imf_3_110OutputFile11writePixelsEi
+libOpenEXR-3_1.so.30:_ZN7Imf_3_110OutputFile14setFrameBufferERKNS_11FrameBufferE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_110OutputFileC1EPKcRKNS_6HeaderEi
+libOpenEXR-3_1.so.30:_ZN7Imf_3_110OutputFileD1Ev
+libOpenEXR-3_1.so.30:_ZN7Imf_3_111ChannelList6insertEPKcRKNS_7ChannelE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_111FrameBuffer6insertEPKcRKNS_5SliceE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_114whiteLuminanceERKNS_6HeaderE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_117globalThreadCountEv
+libOpenEXR-3_1.so.30:_ZN7Imf_3_117hasWhiteLuminanceERKNS_6HeaderE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_15SliceC1ENS_9PixelTypeEPcmmiidbb
+libOpenEXR-3_1.so.30:_ZN7Imf_3_16Header6insertEPKcRKNS_9AttributeE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_16Header8channelsEv
+libOpenEXR-3_1.so.30:_ZN7Imf_3_16HeaderC1EiifRKN9Imath_3_14Vec2IfEEfNS_9LineOrderENS_11CompressionE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_16HeaderD1Ev
+libOpenEXR-3_1.so.30:_ZN7Imf_3_17ChannelC1ENS_9PixelTypeEiib
+libOpenEXR-3_1.so.30:_ZN7Imf_3_19InputFile10readPixelsEii
+libOpenEXR-3_1.so.30:_ZN7Imf_3_19InputFile14setFrameBufferERKNS_11FrameBufferE
+libOpenEXR-3_1.so.30:_ZN7Imf_3_19InputFileC1EPKci
+libOpenEXR-3_1.so.30:_ZN7Imf_3_19InputFileD1Ev
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_111ChannelList3endEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_111ChannelList5beginEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_16Header10dataWindowEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_16Header3endEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_16Header5beginEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_16Header8channelsEv
+libOpenEXR-3_1.so.30:_ZNK7Imf_3_19InputFile6headerEv
libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase10isCanceledEv
libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase11startThreadEv
libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase13waitForResumeEv
diff --git a/files/OpenEXR-instead-of-ilmbase.patch b/files/OpenEXR-instead-of-ilmbase.patch
new file mode 100644
--- /dev/null
+++ b/files/OpenEXR-instead-of-ilmbase.patch
@@ -0,0 +1,47 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,7 +189,7 @@ FIND_PACKAGE(PNG REQUIRED)
+ INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+
+ FIND_PACKAGE(OpenEXR REQUIRED)
+-INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR")
++INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR" "${OPENEXR_INCLUDE_DIR}/Imath")
+
+ FIND_PACKAGE(GSL REQUIRED)
+ INCLUDE_DIRECTORIES(${GSL_INCLUDE_DIR} ${GSLCBLAS_INCLUDE_DIR})
+--- a/build_files/Modules/FindOpenEXR.cmake
++++ b/build_files/Modules/FindOpenEXR.cmake
+@@ -39,20 +39,20 @@ if (NOT OPENEXR_VERSION)
+ endif()
+ if (${OPENEXR_VERSION} VERSION_LESS "2.1")
+ SET(_openexr_FIND_COMPONENTS
+- Half
+ Iex
+- IlmImf
+ IlmThread
+ Imath
++ OpenEXR
++ OpenEXRUtil
+ )
+ else ()
+ string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
+ SET(_openexr_FIND_COMPONENTS
+- Half
+ Iex-${_openexr_libs_ver}
+- IlmImf-${_openexr_libs_ver}
+ IlmThread-${_openexr_libs_ver}
+ Imath-${_openexr_libs_ver}
++ OpenEXR-${_openexr_libs_ver}
++ OpenEXRUtil-${_openexr_libs_ver}
+ )
+ endif ()
+
+@@ -97,7 +97,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEX
+ IF(OPENEXR_FOUND)
+ SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
+ # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
+- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
++ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath)
+ message(STATUS "OpenEXR found")
+ ENDIF()
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : luminance-hdr
version : 2.6.0
-release : 18
+release : 19
source :
- https://github.com/LuminanceHDR/LuminanceHDR/archive/v.2.6.0.tar.gz : c325e0a78a9f2bbfc1af683e09a4eeb412674615a2b17a29f4626962ac3e518c
license : GPL-2.0-only
@@ -28,8 +28,9 @@
- pkgconfig(libturbojpeg)
- libboost-devel
setup : |
- %cmake
+ %patch -p1 < $pkgfiles/OpenEXR-instead-of-ilmbase.patch
+ %cmake_ninja
build : |
- %make
+ %ninja_build
install : |
- %make_install
+ %ninja_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>luminance-hdr</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Packager>
<License>GPL-2.0-only</License>
<PartOf>multimedia.graphics</PartOf>
@@ -154,12 +154,12 @@
</Files>
</Package>
<History>
- <Update release="18">
- <Date>2021-06-23</Date>
+ <Update release="19">
+ <Date>2021-07-30</Date>
<Version>2.6.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Aug 12, 12:20 AM (2 h, 42 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5796827
Default Alt Text
D11053.id.diff (8 KB)
Attached To
Mode
D11053: Rebuild luminance-hdr against openexr
Attached
Detach File
Event Timeline
Log In to Comment