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_0.so.28 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,15 +1,5 @@ -UNKNOWN:_ZN6LibRaw10cameraListEv -UNKNOWN:_ZN6LibRaw11cameraCountEv -UNKNOWN:_ZN6LibRaw13dcraw_processEv -UNKNOWN:_ZN6LibRaw15dcraw_clear_memEP24libraw_processed_image_t -UNKNOWN:_ZN6LibRaw20dcraw_make_mem_imageEPi -UNKNOWN:_ZN6LibRaw22adjust_sizes_info_onlyEv -UNKNOWN:_ZN6LibRaw6unpackEv -UNKNOWN:_ZN6LibRaw7recycleEv -UNKNOWN:_ZN6LibRaw7versionEv -UNKNOWN:_ZN6LibRaw9open_fileEPKcx -UNKNOWN:_ZN6LibRawC1Ej -UNKNOWN:_ZN6LibRawD1Ev +UNKNOWN:_ZN7Imf_3_014TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEC1ERKS6_ +UNKNOWN:_ZN7Imf_3_014TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcmm UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEcm UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc @@ -24,84 +14,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_014TypedAttributeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE +UNKNOWN:_ZTIN7Imf_3_09AttributeE UNKNOWN:_ZTVN5boost15program_options13variables_mapE UNKNOWN:_ZTVN5boost15program_options22error_with_option_nameE -UNKNOWN:ffclos -UNKNOWN:ffgerr -UNKNOWN:ffgknj -UNKNOWN:ffgkye -UNKNOWN:ffgkyj -UNKNOWN:ffgpv -UNKNOWN:ffopentest -UNKNOWN:gsl_blas_daxpy -UNKNOWN:gsl_blas_dcopy -UNKNOWN:gsl_blas_ddot -UNKNOWN:gsl_blas_dgemm -UNKNOWN:gsl_blas_dgemv -UNKNOWN:gsl_blas_dscal -UNKNOWN:gsl_blas_dsymv -UNKNOWN:gsl_error -UNKNOWN:gsl_linalg_LU_decomp -UNKNOWN:gsl_linalg_LU_solve -UNKNOWN:gsl_matrix_alloc -UNKNOWN:gsl_matrix_calloc -UNKNOWN:gsl_matrix_free -UNKNOWN:gsl_matrix_memcpy -UNKNOWN:gsl_matrix_set_all -UNKNOWN:gsl_matrix_set_identity -UNKNOWN:gsl_matrix_set_zero -UNKNOWN:gsl_matrix_submatrix -UNKNOWN:gsl_matrix_transpose_memcpy -UNKNOWN:gsl_permutation_alloc -UNKNOWN:gsl_permutation_free -UNKNOWN:gsl_poly_complex_solve -UNKNOWN:gsl_poly_complex_workspace_alloc -UNKNOWN:gsl_poly_complex_workspace_free -UNKNOWN:gsl_set_error_handler -UNKNOWN:gsl_vector_add_constant -UNKNOWN:gsl_vector_alloc -UNKNOWN:gsl_vector_calloc -UNKNOWN:gsl_vector_free -UNKNOWN:gsl_vector_memcpy -UNKNOWN:gsl_vector_min -UNKNOWN:gsl_vector_set_all -UNKNOWN:gsl_vector_set_zero -UNKNOWN:gsl_vector_subvector -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_0.so.28:_ZN7Imf_3_010OutputFile11writePixelsEi +libOpenEXR-3_0.so.28:_ZN7Imf_3_010OutputFile14setFrameBufferERKNS_11FrameBufferE +libOpenEXR-3_0.so.28:_ZN7Imf_3_010OutputFileC1EPKcRKNS_6HeaderEi +libOpenEXR-3_0.so.28:_ZN7Imf_3_010OutputFileD1Ev +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_014whiteLuminanceERKNS_6HeaderE +libOpenEXR-3_0.so.28:_ZN7Imf_3_017globalThreadCountEv +libOpenEXR-3_0.so.28:_ZN7Imf_3_017hasWhiteLuminanceERKNS_6HeaderE +libOpenEXR-3_0.so.28:_ZN7Imf_3_05SliceC1ENS_9PixelTypeEPcmmiidbb +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_09InputFile10readPixelsEii +libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFile14setFrameBufferERKNS_11FrameBufferE +libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFileC1EPKci +libOpenEXR-3_0.so.28:_ZN7Imf_3_09InputFileD1Ev +libOpenEXR-3_0.so.28:_ZNK7Imf_3_011ChannelList3endEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_011ChannelList5beginEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header10dataWindowEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header3endEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header5beginEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header8channelsEv +libOpenEXR-3_0.so.28:_ZNK7Imf_3_09InputFile6headerEv libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase10isCanceledEv libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase11startThreadEv libQt5Concurrent.so.5:_ZN12QtConcurrent16ThreadEngineBase13waitForResumeEv @@ -1681,6 +1623,13 @@ libc.so.6:strtof libc.so.6:strtok libc.so.6:tolower +libcfitsio.so.9:ffclos +libcfitsio.so.9:ffgerr +libcfitsio.so.9:ffgknj +libcfitsio.so.9:ffgkye +libcfitsio.so.9:ffgkyj +libcfitsio.so.9:ffgpv +libcfitsio.so.9:ffopentest libexiv2.so.27:_ZN5Exiv212ImageFactory4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb libexiv2.so.27:_ZN5Exiv27ExifKeyC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libexiv2.so.27:_ZN5Exiv27ExifKeyD1Ev @@ -1729,6 +1678,40 @@ libgomp.so.1:omp_get_num_threads libgomp.so.1:omp_get_thread_num libgomp.so.1:omp_set_nested +libgsl.so.25:gsl_blas_daxpy +libgsl.so.25:gsl_blas_dcopy +libgsl.so.25:gsl_blas_ddot +libgsl.so.25:gsl_blas_dgemm +libgsl.so.25:gsl_blas_dgemv +libgsl.so.25:gsl_blas_dscal +libgsl.so.25:gsl_blas_dsymv +libgsl.so.25:gsl_error +libgsl.so.25:gsl_linalg_LU_decomp +libgsl.so.25:gsl_linalg_LU_solve +libgsl.so.25:gsl_matrix_alloc +libgsl.so.25:gsl_matrix_calloc +libgsl.so.25:gsl_matrix_free +libgsl.so.25:gsl_matrix_memcpy +libgsl.so.25:gsl_matrix_set_all +libgsl.so.25:gsl_matrix_set_identity +libgsl.so.25:gsl_matrix_set_zero +libgsl.so.25:gsl_matrix_submatrix +libgsl.so.25:gsl_matrix_transpose_memcpy +libgsl.so.25:gsl_permutation_alloc +libgsl.so.25:gsl_permutation_free +libgsl.so.25:gsl_poly_complex_solve +libgsl.so.25:gsl_poly_complex_workspace_alloc +libgsl.so.25:gsl_poly_complex_workspace_free +libgsl.so.25:gsl_set_error_handler +libgsl.so.25:gsl_vector_add_constant +libgsl.so.25:gsl_vector_alloc +libgsl.so.25:gsl_vector_calloc +libgsl.so.25:gsl_vector_free +libgsl.so.25:gsl_vector_memcpy +libgsl.so.25:gsl_vector_min +libgsl.so.25:gsl_vector_set_all +libgsl.so.25:gsl_vector_set_zero +libgsl.so.25:gsl_vector_subvector libjpeg.so.8:jpeg_CreateCompress libjpeg.so.8:jpeg_CreateDecompress libjpeg.so.8:jpeg_destroy_compress @@ -1811,6 +1794,18 @@ libpthread.so.0:pthread_mutex_init libpthread.so.0:pthread_mutex_lock libpthread.so.0:pthread_mutex_unlock +libraw_r.so.19:_ZN6LibRaw10cameraListEv +libraw_r.so.19:_ZN6LibRaw11cameraCountEv +libraw_r.so.19:_ZN6LibRaw13dcraw_processEv +libraw_r.so.19:_ZN6LibRaw15dcraw_clear_memEP24libraw_processed_image_t +libraw_r.so.19:_ZN6LibRaw20dcraw_make_mem_imageEPi +libraw_r.so.19:_ZN6LibRaw22adjust_sizes_info_onlyEv +libraw_r.so.19:_ZN6LibRaw6unpackEv +libraw_r.so.19:_ZN6LibRaw7recycleEv +libraw_r.so.19:_ZN6LibRaw7versionEv +libraw_r.so.19:_ZN6LibRaw9open_fileEPKcx +libraw_r.so.19:_ZN6LibRawC1Ej +libraw_r.so.19:_ZN6LibRawD1Ev libstdc++.so.6:_ZNKSt11logic_error4whatEv libstdc++.so.6:_ZNKSt12__basic_fileIcE7is_openEv libstdc++.so.6:_ZNKSt13runtime_error4whatEv 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 and #include :( +- 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 : 17 +release : 18 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 @@ luminance-hdr - Joshua Strobl - joshua@getsol.us + Martin Reboredo + yakoyoku@gmail.com GPL-2.0-only multimedia.graphics @@ -154,12 +154,12 @@ - - 2021-01-20 + + 2021-05-30 2.6.0 Packaging update - Joshua Strobl - joshua@getsol.us + Martin Reboredo + yakoyoku@gmail.com \ No newline at end of file