Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11053981
D11070.id27254.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D11070.id27254.diff
View Options
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -895,9 +895,9 @@
libdarktable.so:_ZGVeN8vva64_dt_bilateral_splat
libdarktable.so:_ZGVeN8vva64va64v_dt_bilateral_slice
libdarktable.so:_ZGVeN8vva64va64v_dt_bilateral_slice_to_output
-libdarktable.so:_ZN7Imf_2_514TypedAttributeINS_4BlobEE13readValueFromERNS_7IStreamEii
-libdarktable.so:_ZN7Imf_2_514TypedAttributeINS_4BlobEE14staticTypeNameEv
-libdarktable.so:_ZNK7Imf_2_514TypedAttributeINS_4BlobEE12writeValueToERNS_7OStreamEi
+libdarktable.so:_ZN7Imf_3_014TypedAttributeINS_4BlobEE13readValueFromERNS_7IStreamEii
+libdarktable.so:_ZN7Imf_3_014TypedAttributeINS_4BlobEE14staticTypeNameEv
+libdarktable.so:_ZNK7Imf_3_014TypedAttributeINS_4BlobEE12writeValueToERNS_7OStreamEi
libdarktable.so:__bss_start
libdarktable.so:_accel_connect_actions_iop
libdarktable.so:_accel_register_actions_iop
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,8 +1,8 @@
UNKNOWN
ld-linux-x86-64.so.2
libGraphicsMagick.so.3
-libIex-2_5.so.25
-libIlmImf-2_5.so.25
+libIex-3_0.so.28
+libOpenEXR-3_0.so.28
libX11.so.6
libXrandr.so.2
libc.so.6
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_014TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEC1ERKS6_
+UNKNOWN:_ZN7Imf_3_014TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcmm
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
@@ -5,8 +7,8 @@
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
UNKNOWN:_ZTIN5Exiv28AnyErrorE
-UNKNOWN:_ZTIN7Iex_2_57TypeExcE
-UNKNOWN:_ZTIN7Imf_2_59AttributeE
+UNKNOWN:_ZTIN7Iex_3_07TypeExcE
+UNKNOWN:_ZTIN7Imf_3_09AttributeE
UNKNOWN:_ZTVN5Exiv212XmpTextValueE
UNKNOWN:_ZTVN5Exiv28XmpValueE
ld-linux-x86-64.so.2:__tls_get_addr
@@ -21,55 +23,52 @@
libGraphicsMagick.so.3:GetExceptionInfo
libGraphicsMagick.so.3:InitializeMagick
libGraphicsMagick.so.3:ReadImage
-libIex-2_5.so.25:_ZN7Iex_2_57TypeExcC1EPKc
-libIex-2_5.so.25:_ZN7Iex_2_57TypeExcD1Ev
-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_513isOpenExrFileEPKcRb
-libIlmImf-2_5.so.25:_ZN7Imf_2_514ChromaticitiesC1ERKN9Imath_2_54Vec2IfEES5_S5_S5_
-libIlmImf-2_5.so.25:_ZN7Imf_2_514TiledInputFile14setFrameBufferERKNS_11FrameBufferE
-libIlmImf-2_5.so.25:_ZN7Imf_2_514TiledInputFile9readTilesEiiiii
-libIlmImf-2_5.so.25:_ZN7Imf_2_514TiledInputFileC1EPKci
-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_514chromaticitiesERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_514whiteLuminanceERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_515TiledOutputFile10writeTilesEiiiii
-libIlmImf-2_5.so.25:_ZN7Imf_2_515TiledOutputFile14setFrameBufferERKNS_11FrameBufferE
-libIlmImf-2_5.so.25:_ZN7Imf_2_515TiledOutputFileC1EPKcRKNS_6HeaderEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_515TiledOutputFileD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_517addChromaticitiesERNS_6HeaderERKNS_14ChromaticitiesE
-libIlmImf-2_5.so.25:_ZN7Imf_2_517addWhiteLuminanceERNS_6HeaderERKf
-libIlmImf-2_5.so.25:_ZN7Imf_2_517globalThreadCountEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_517hasChromaticitiesERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_517hasWhiteLuminanceERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_520setGlobalThreadCountEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_55SliceC1ENS_9PixelTypeEPcmmiidbb
-libIlmImf-2_5.so.25:_ZN7Imf_2_56Header18setTileDescriptionERKNS_15TileDescriptionE
-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_58RGBtoXYZERKNS_14ChromaticitiesEf
-libIlmImf-2_5.so.25:_ZN7Imf_2_59Attribute21registerAttributeTypeEPKcPFPS0_vE
-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:_ZNK7Imf_2_511ChannelList3endEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_511ChannelList5beginEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_514TiledInputFile6headerEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_514TiledInputFile9numXTilesEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_514TiledInputFile9numYTilesEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_514TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE12writeValueToERNS_7OStreamEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_515TiledOutputFile9numXTilesEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_515TiledOutputFile9numYTilesEi
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header10dataWindowEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header13displayWindowEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header8channelsEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_59InputFile6headerEv
+libIex-3_0.so.28:_ZN7Iex_3_07TypeExcC1EPKc
+libIex-3_0.so.28:_ZN7Iex_3_07TypeExcD1Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_011ChannelList6insertEPKcRKNS_7ChannelE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_011FrameBuffer6insertEPKcRKNS_5SliceE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013isOpenExrFileEPKcRb
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014ChromaticitiesC1ERKN9Imath_3_04Vec2IfEES5_S5_S5_
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014TiledInputFile14setFrameBufferERKNS_11FrameBufferE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014TiledInputFile9readTilesEiiiii
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014TiledInputFileC1EPKci
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014chromaticitiesERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014whiteLuminanceERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_015TiledOutputFile10writeTilesEiiiii
+libOpenEXR-3_0.so.28:_ZN7Imf_3_015TiledOutputFile14setFrameBufferERKNS_11FrameBufferE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_015TiledOutputFileC1EPKcRKNS_6HeaderEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_015TiledOutputFileD1Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017addChromaticitiesERNS_6HeaderERKNS_14ChromaticitiesE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017addWhiteLuminanceERNS_6HeaderERKf
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017globalThreadCountEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017hasChromaticitiesERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017hasWhiteLuminanceERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_020setGlobalThreadCountEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_05SliceC1ENS_9PixelTypeEPcmmiidbb
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06Header18setTileDescriptionERKNS_15TileDescriptionE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06Header6insertEPKcRKNS_9AttributeE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06Header8channelsEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06HeaderC1EiifRKN9Imath_3_04Vec2IfEEfNS_9LineOrderENS_11CompressionE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06HeaderD1Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_07ChannelC1ENS_9PixelTypeEiib
+libOpenEXR-3_0.so.28:_ZN7Imf_3_08RGBtoXYZERKNS_14ChromaticitiesEf
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09Attribute21registerAttributeTypeEPKcPFPS0_vE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09AttributeC2Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09AttributeD2Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFile10readPixelsEii
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFile14setFrameBufferERKNS_11FrameBufferE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFileC1EPKci
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_011ChannelList3endEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_011ChannelList5beginEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_014TiledInputFile6headerEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_014TiledInputFile9numXTilesEi
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_014TiledInputFile9numYTilesEi
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_015TiledOutputFile9numXTilesEi
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_015TiledOutputFile9numYTilesEi
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header10dataWindowEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header13displayWindowEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header8channelsEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_09InputFile6headerEv
libX11.so.6:XCloseDisplay
libX11.so.6:XDisplayName
libX11.so.6:XFree
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,27 @@
+--- a/cmake/modules/FindOpenEXR.cmake
++++ b/cmake/modules/FindOpenEXR.cmake
+@@ -15,7 +15,11 @@ find_path(_OPENEXR_INCLUDE_DIR OpenEXR
+ PATHS /usr/include
+ /usr/include/OpenEXR
+ HINTS ENV OPENEXR_INCLUDE_DIR)
+-set(OpenEXR_INCLUDE_DIR ${_OPENEXR_INCLUDE_DIR} ${_OPENEXR_INCLUDE_DIR}/OpenEXR)
++find_path(_IMATH_INCLUDE_DIR Imath
++ PATHS /usr/include
++ /usr/include/Imath
++ HINTS ENV IMATH_INCLUDE_DIR)
++set(OpenEXR_INCLUDE_DIR ${_OPENEXR_INCLUDE_DIR} ${_OPENEXR_INCLUDE_DIR}/OpenEXR ${_IMATH_INCLUDE_DIR} ${_IMATH_INCLUDE_DIR}/Imath)
+ mark_as_advanced(OpenEXR_INCLUDE_DIR)
+
+ # Find libraries and add them to OpenEXR_LIBRARY
+@@ -24,9 +28,9 @@ find_path(_OPENEXR_LIB_DIR OpenEXR
+ set(OpenEXR_LIB_DIR ${_OPENEXR_LIB_DIR})
+ mark_as_advanced(OpenEXR_LIB_DIR)
+
+-find_library(_OPENEXR_LIBRARY_IMIMF IlmImf
++find_library(_OPENEXR_LIBRARY_OPENEXR OpenEXR
+ HINTS ENV OPENEXR_LIB_DIR)
+-set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMIMF})
++set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_OPENEXR})
+ find_library(_OPENEXR_LIBRARY_IMATH Imath
+ HINTS ENV OPENEXR_LIB_DIR)
+ set(OpenEXR_LIBRARY ${OpenEXR_LIBRARY} ${_OPENEXR_LIBRARY_IMATH})
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : darktable
version : 3.4.1.1
-release : 54
+release : 55
source :
- https://github.com/darktable-org/darktable/releases/download/release-3.4.1/darktable-3.4.1.1.tar.xz : 00d57a6c3b86f4eb1791128b612e762f69df4be2c110965afac1fdcca5678143
license : GPL-3.0-or-later
@@ -39,6 +39,7 @@
rundeps :
- gtk-engines
setup : |
+ %patch -p1 < $pkgfiles/OpenEXR-instead-of-ilmbase.patch
mkdir build && cd build
%cmake -DBINARY_PACKAGE_BUILD=ON -DLIB_SUFFIX=%LIBSUFFIX% ..
build : |
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>darktable</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>multimedia.graphics</PartOf>
@@ -417,12 +417,12 @@
</Files>
</Package>
<History>
- <Update release="54">
- <Date>2021-06-14</Date>
+ <Update release="55">
+ <Date>2021-06-17</Date>
<Version>3.4.1.1</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:16 AM (2 h, 41 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5836069
Default Alt Text
D11070.id27254.diff (11 KB)
Attached To
Mode
D11070: Rebuild darktable against OpenEXR
Attached
Detach File
Event Timeline
Log In to Comment