Page MenuHomeSolus

D11073.id27267.diff
No OneTemporary

D11073.id27267.diff

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -171,6 +171,8 @@
libhuginbase.so.0.0:_ZN11hugin_utils19IsFileTypeSupportedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libhuginbase.so.0.0:_ZN11hugin_utils20GetCurrentTimeStringB5cxx11Ev
libhuginbase.so.0.0:_ZN11hugin_utils23ControlPointErrorColourEdRdS0_S0_
+libhuginbase.so.0.0:_ZN11hugin_utils3gcdEii
+libhuginbase.so.0.0:_ZN11hugin_utils4_gcdEii
libhuginbase.so.0.0:_ZN11hugin_utils5sortdEiPdPi
libhuginbase.so.0.0:_ZN11hugin_utils7StrTrimERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libhuginbase.so.0.0:_ZN11hugin_utils7initGPUEPiPPc
@@ -298,7 +300,7 @@
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20horizontalWarpNeededEv
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20readCropfactorFromDBEv
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20readDistortionFromDBEv
-libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20readProjectionFromDBEv
+libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20readProjectionFromDBEb
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20readVignettingFromDBEv
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage20trustExivOrientationEv
libhuginbase.so.0.0:_ZN9HuginBase12SrcPanoImage21calcExifExposureValueEv
@@ -809,9 +811,6 @@
libhuginbase.so.0.0:_ZThn8_N9HuginBase8Panorama9writeDataERSoNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libhuginbase.so.0.0:_ZThn8_N9HuginBase8PanoramaD0Ev
libhuginbase.so.0.0:_ZThn8_N9HuginBase8PanoramaD1Ev
-libhuginbase.so.0.0:__bss_start
-libhuginbase.so.0.0:_edata
-libhuginbase.so.0.0:_end
libhuginbase.so.0.0:dAx_eq_b_LU_noLapack
libhuginbase.so.0.0:dlevmar_L2nrmxmy
libhuginbase.so.0.0:dlevmar_R2
@@ -886,6 +885,7 @@
libhuginbasewx.so.0.0:_ZN10HuginQueue24GetAssistantCommandQueueERKN9HuginBase8PanoramaERK8wxStringS6_
libhuginbasewx.so.0.0:_ZN10HuginQueue24GetQuotedFilenamesStringERK13wxArrayString
libhuginbasewx.so.0.0:_ZN10HuginQueue24GetStitchingCommandQueueERKN9HuginBase8PanoramaERK8wxStringS6_S6_RS4_R13wxArrayStringS9_RSo
+libhuginbasewx.so.0.0:_ZN10HuginQueue26GetSettingStringTranslatedEP12wxConfigBaseRK8wxStringS2_
libhuginbasewx.so.0.0:_ZN10HuginQueue34GetStitchingCommandQueueUserOutputERKN9HuginBase8PanoramaERK8wxStringS6_S6_S6_RS4_R13wxArrayStringS9_RSo
libhuginbasewx.so.0.0:_ZN10HuginQueue35GetAssistantCommandQueueUserDefinedERKN9HuginBase8PanoramaERK8wxStringS6_S6_R13wxArrayStringRSo
libhuginbasewx.so.0.0:_ZN10HuginQueue6detail10AddToArrayERK13wxArrayStringRS1_
@@ -1019,6 +1019,7 @@
libhuginbasewx.so.0.0:_ZN11PanoCommand24ChangeImageCropFactorCmd15processPanoramaERN9HuginBase8PanoramaE
libhuginbasewx.so.0.0:_ZN11PanoCommand24ChangeImageEMoRParamsCmd15processPanoramaERN9HuginBase8PanoramaE
libhuginbasewx.so.0.0:_ZN11PanoCommand24ChangeImageProjectionCmd15processPanoramaERN9HuginBase8PanoramaE
+libhuginbasewx.so.0.0:_ZN11PanoCommand24GetICCProfileNameCheckedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
libhuginbasewx.so.0.0:_ZN11PanoCommand24UpdateImagesVariablesCmd15processPanoramaERN9HuginBase8PanoramaE
libhuginbasewx.so.0.0:_ZN11PanoCommand24UpdateOptimizerSwitchCmd15processPanoramaERN9HuginBase8PanoramaE
libhuginbasewx.so.0.0:_ZN11PanoCommand25ChangeImageActiveMasksCmd15processPanoramaERN9HuginBase8PanoramaE
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,9 +1,10 @@
UNKNOWN
-libGL.so.1
libGLEW.so.2.1
libGLU.so.1
-libHalf-2_5.so.25
-libIlmImf-2_5.so.25
+libGLX.so.0
+libImath-3_0.so.28
+libOpenEXR-3_0.so.28
+libOpenGL.so.0
libX11.so.6
libboost_filesystem.so.1.72.0
libc.so.6
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -1,70 +1,10 @@
-UNKNOWN:CheckParams
-UNKNOWN:DisposeAlignInfo
-UNKNOWN:PT_setErrorFcn
-UNKNOWN:PT_setInfoDlgFcn
-UNKNOWN:PT_setProgressFcn
-UNKNOWN:ParseScript
-UNKNOWN:RunLMOptimizer
-UNKNOWN:SetAlignParams
-UNKNOWN:SetCorrectDefaults
-UNKNOWN:SetCorrectionRadius
-UNKNOWN:SetGlobalPtr
-UNKNOWN:SetImageDefaults
-UNKNOWN:SetInvMakeParams
-UNKNOWN:SetLMParams
-UNKNOWN:SetMakeParams
-UNKNOWN:_ZN5vigra10getEncoderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_S7_
-UNKNOWN:_ZN5vigra15ImageExportInfo11setPositionERKNS_6Diff2DE
-UNKNOWN:_ZN5vigra15ImageExportInfo12setPixelTypeEPKc
-UNKNOWN:_ZN5vigra15ImageExportInfo13setCanvasSizeERKNS_6Size2DE
-UNKNOWN:_ZN5vigra15ImageExportInfo13setICCProfileERKNS_11ArrayVectorIhSaIhEEE
-UNKNOWN:_ZN5vigra15ImageExportInfo14setCompressionEPKc
-UNKNOWN:_ZN5vigra15ImageExportInfo14setXResolutionEf
-UNKNOWN:_ZN5vigra15ImageExportInfo14setYResolutionEf
-UNKNOWN:_ZN5vigra15ImageExportInfo21setForcedRangeMappingEdddd
-UNKNOWN:_ZN5vigra15ImageExportInfoC1EPKcS2_
-UNKNOWN:_ZN5vigra15ImageExportInfoD1Ev
-UNKNOWN:_ZN5vigra15ImageImportInfoC1EPKcj
-UNKNOWN:_ZN5vigra15ImageImportInfoD1Ev
-UNKNOWN:_ZN5vigra18negotiatePixelTypeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_RS5_
-UNKNOWN:_ZN5vigra19impexListExtensionsB5cxx11Ev
-UNKNOWN:_ZN5vigra20isPixelTypeSupportedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_
-UNKNOWN:_ZN5vigra21isBandNumberSupportedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEi
-UNKNOWN:_ZN5vigra7decoderERKNS_15ImageImportInfoE
-UNKNOWN:_ZN5vigra7encoderERKNS_15ImageExportInfoE
-UNKNOWN:_ZN5vigra7isImageEPKc
-UNKNOWN:_ZNK5vigra15ImageExportInfo10getFromMaxEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo10getFromMinEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo11getFileNameEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo12getPixelTypeEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo21hasForcedRangeMappingEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo8getToMaxEv
-UNKNOWN:_ZNK5vigra15ImageExportInfo8getToMinEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo11getFileNameEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo11getFileTypeEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo11getPositionEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo11isGrayscaleEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo12getPixelTypeEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo13getCanvasSizeEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo13getICCProfileEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo13numExtraBandsEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo14getXResolutionEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo14getYResolutionEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo4sizeEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo5widthEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo6heightEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo7isColorEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo8numBandsEv
-UNKNOWN:_ZNK5vigra15ImageImportInfo9pixelTypeEv
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcmm
-UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEcm
UNKNOWN:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareEPKc
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4swapERS4_
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7reserveEm
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_appendEPKcm
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
-UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm
UNKNOWN:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_mutateEmmPKcm
UNKNOWN:_ZTIN5Exiv28AnyErrorE
UNKNOWN:_ZTIN5boost10filesystem16filesystem_errorE
@@ -128,113 +68,6 @@
UNKNOWN:_ZTVN9HuginBase25SmartPhotometricOptimizerE
UNKNOWN:_ZTVN9HuginBase8PanoramaE
UNKNOWN:_ZTVN9HuginBase8VariableE
-UNKNOWN:deregister
-UNKNOWN:distSquared
-UNKNOWN:erect_albersequalareaconic
-UNKNOWN:erect_arch
-UNKNOWN:erect_hammer
-UNKNOWN:erect_lambert
-UNKNOWN:erect_lambertazimuthal
-UNKNOWN:erect_mercator
-UNKNOWN:erect_millercylindrical
-UNKNOWN:erect_pano
-UNKNOWN:erect_rect
-UNKNOWN:erect_sinusoidal
-UNKNOWN:erect_sphere_tp
-UNKNOWN:erect_stereographic
-UNKNOWN:erect_transmercator
-UNKNOWN:execute_stack_new
-UNKNOWN:fcnPano
-UNKNOWN:horiz
-UNKNOWN:lambertazimuthal_erect
-UNKNOWN:myfree
-UNKNOWN:orthographic_sphere_tp
-UNKNOWN:panoProjectionFeaturesQuery
-UNKNOWN:panoProjectionFormatCount
-UNKNOWN:pano_sphere_tp
-UNKNOWN:persp_sphere
-UNKNOWN:plane_transfer_to_camera
-UNKNOWN:queryFOVLimits
-UNKNOWN:queryFeatureString
-UNKNOWN:radial
-UNKNOWN:rect_sphere_tp
-UNKNOWN:resize
-UNKNOWN:rotate_erect
-UNKNOWN:shear
-UNKNOWN:sphere_tp_equisolid
-UNKNOWN:sphere_tp_erect
-UNKNOWN:sphere_tp_orthographic
-UNKNOWN:sphere_tp_thoby
-UNKNOWN:stereographic_erect
-UNKNOWN:thoby_sphere_tp
-UNKNOWN:vert
-UNKNOWN:vertical
-libGL.so.1:glBegin
-libGL.so.1:glBindTexture
-libGL.so.1:glBlendFunc
-libGL.so.1:glCallList
-libGL.so.1:glCallLists
-libGL.so.1:glClear
-libGL.so.1:glClearColor
-libGL.so.1:glColor3d
-libGL.so.1:glColor3f
-libGL.so.1:glColor3fv
-libGL.so.1:glColor3ub
-libGL.so.1:glColor4f
-libGL.so.1:glCullFace
-libGL.so.1:glDeleteLists
-libGL.so.1:glDeleteTextures
-libGL.so.1:glDisable
-libGL.so.1:glDrawBuffer
-libGL.so.1:glEnable
-libGL.so.1:glEnd
-libGL.so.1:glEndList
-libGL.so.1:glFinish
-libGL.so.1:glFlush
-libGL.so.1:glGenLists
-libGL.so.1:glGenTextures
-libGL.so.1:glGetError
-libGL.so.1:glGetFloatv
-libGL.so.1:glGetIntegerv
-libGL.so.1:glGetString
-libGL.so.1:glGetTexLevelParameteriv
-libGL.so.1:glLineWidth
-libGL.so.1:glListBase
-libGL.so.1:glLoadIdentity
-libGL.so.1:glMatrixMode
-libGL.so.1:glNewList
-libGL.so.1:glOrtho
-libGL.so.1:glPixelStorei
-libGL.so.1:glPolygonMode
-libGL.so.1:glPopMatrix
-libGL.so.1:glPushMatrix
-libGL.so.1:glReadBuffer
-libGL.so.1:glReadPixels
-libGL.so.1:glRotated
-libGL.so.1:glScalef
-libGL.so.1:glScissor
-libGL.so.1:glStencilFunc
-libGL.so.1:glTexCoord2dv
-libGL.so.1:glTexCoord2f
-libGL.so.1:glTexEnvi
-libGL.so.1:glTexImage2D
-libGL.so.1:glTexParameterf
-libGL.so.1:glTexParameterfv
-libGL.so.1:glTexParameteri
-libGL.so.1:glTexSubImage2D
-libGL.so.1:glTranslatef
-libGL.so.1:glVertex2d
-libGL.so.1:glVertex2f
-libGL.so.1:glVertex2i
-libGL.so.1:glVertex3d
-libGL.so.1:glVertex3dv
-libGL.so.1:glVertex3f
-libGL.so.1:glViewport
-libGL.so.1:glXChooseVisual
-libGL.so.1:glXCreateContext
-libGL.so.1:glXDestroyContext
-libGL.so.1:glXMakeCurrent
-libGL.so.1:glXQueryExtension
libGLEW.so.2.1:__GLEW_ARB_imaging
libGLEW.so.2.1:__GLEW_ARB_multitexture
libGLEW.so.2.1:__GLEW_EXT_blend_subtract
@@ -273,20 +106,86 @@
libGLU.so.1:gluPerspective
libGLU.so.1:gluQuadricTexture
libGLU.so.1:gluSphere
-libHalf-2_5.so.25:_ZN4half5_eLutE
-libHalf-2_5.so.25:_ZN4half7convertEi
-libHalf-2_5.so.25:_ZN4half8_toFloatE
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFile10readPixelsEii
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFile14setFrameBufferEPNS_4RgbaEmm
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFileC1EPKci
-libIlmImf-2_5.so.25:_ZN7Imf_2_513RgbaInputFileD0Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFile11writePixelsEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFile14setFrameBufferEPKNS_4RgbaEmm
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFileC1EPKcRKN9Imath_2_53BoxINS3_4Vec2IiEEEES9_NS_12RgbaChannelsEfNS5_IfEEfNS_9LineOrderENS_11CompressionEi
-libIlmImf-2_5.so.25:_ZN7Imf_2_514RgbaOutputFileD1Ev
-libIlmImf-2_5.so.25:_ZN7Imf_2_517globalThreadCountEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_513RgbaInputFile10dataWindowEv
-libIlmImf-2_5.so.25:_ZNK7Imf_2_513RgbaInputFile13displayWindowEv
+libGLX.so.0:glXChooseVisual
+libGLX.so.0:glXCreateContext
+libGLX.so.0:glXDestroyContext
+libGLX.so.0:glXMakeCurrent
+libGLX.so.0:glXQueryExtension
+libImath-3_0.so.28:_ZN9Imath_3_04half5_eLutE
+libImath-3_0.so.28:_ZN9Imath_3_04half7convertEi
+libImath-3_0.so.28:_ZN9Imath_3_04half8_toFloatE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFile10readPixelsEii
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFile14setFrameBufferEPNS_4RgbaEmm
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFileC1EPKci
+libOpenEXR-3_0.so.28:_ZN7Imf_3_013RgbaInputFileD0Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFile11writePixelsEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFile14setFrameBufferEPKNS_4RgbaEmm
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFileC1EPKcRKN9Imath_3_03BoxINS3_4Vec2IiEEEES9_NS_12RgbaChannelsEfNS5_IfEEfNS_9LineOrderENS_11CompressionEi
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014RgbaOutputFileD1Ev
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017globalThreadCountEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_013RgbaInputFile10dataWindowEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_013RgbaInputFile13displayWindowEv
+libOpenGL.so.0:glBegin
+libOpenGL.so.0:glBindTexture
+libOpenGL.so.0:glBlendFunc
+libOpenGL.so.0:glCallList
+libOpenGL.so.0:glCallLists
+libOpenGL.so.0:glClear
+libOpenGL.so.0:glClearColor
+libOpenGL.so.0:glColor3d
+libOpenGL.so.0:glColor3f
+libOpenGL.so.0:glColor3fv
+libOpenGL.so.0:glColor3ub
+libOpenGL.so.0:glColor4f
+libOpenGL.so.0:glCullFace
+libOpenGL.so.0:glDeleteLists
+libOpenGL.so.0:glDeleteTextures
+libOpenGL.so.0:glDisable
+libOpenGL.so.0:glDrawBuffer
+libOpenGL.so.0:glEnable
+libOpenGL.so.0:glEnd
+libOpenGL.so.0:glEndList
+libOpenGL.so.0:glFinish
+libOpenGL.so.0:glFlush
+libOpenGL.so.0:glGenLists
+libOpenGL.so.0:glGenTextures
+libOpenGL.so.0:glGetError
+libOpenGL.so.0:glGetFloatv
+libOpenGL.so.0:glGetIntegerv
+libOpenGL.so.0:glGetString
+libOpenGL.so.0:glGetTexLevelParameteriv
+libOpenGL.so.0:glLineWidth
+libOpenGL.so.0:glListBase
+libOpenGL.so.0:glLoadIdentity
+libOpenGL.so.0:glMatrixMode
+libOpenGL.so.0:glNewList
+libOpenGL.so.0:glOrtho
+libOpenGL.so.0:glPixelStorei
+libOpenGL.so.0:glPolygonMode
+libOpenGL.so.0:glPopMatrix
+libOpenGL.so.0:glPushMatrix
+libOpenGL.so.0:glReadBuffer
+libOpenGL.so.0:glReadPixels
+libOpenGL.so.0:glRotated
+libOpenGL.so.0:glScalef
+libOpenGL.so.0:glScissor
+libOpenGL.so.0:glStencilFunc
+libOpenGL.so.0:glTexCoord2dv
+libOpenGL.so.0:glTexCoord2f
+libOpenGL.so.0:glTexEnvi
+libOpenGL.so.0:glTexImage2D
+libOpenGL.so.0:glTexParameterf
+libOpenGL.so.0:glTexParameterfv
+libOpenGL.so.0:glTexParameteri
+libOpenGL.so.0:glTexSubImage2D
+libOpenGL.so.0:glTranslatef
+libOpenGL.so.0:glVertex2d
+libOpenGL.so.0:glVertex2f
+libOpenGL.so.0:glVertex2i
+libOpenGL.so.0:glVertex3d
+libOpenGL.so.0:glVertex3dv
+libOpenGL.so.0:glVertex3f
+libOpenGL.so.0:glViewport
libX11.so.6:XCloseDisplay
libX11.so.6:XCreateColormap
libX11.so.6:XCreateWindow
@@ -312,6 +211,7 @@
libboost_filesystem.so.1.72.0:_ZN5boost10filesystem6detail6renameERKNS0_4pathES4_PNS_6system10error_codeE
libboost_filesystem.so.1.72.0:_ZN5boost10filesystem6detail6statusERKNS0_4pathEPNS_6system10error_codeE
libboost_filesystem.so.1.72.0:_ZN5boost10filesystem6detail9copy_fileERKNS0_4pathES4_NS1_11copy_optionEPNS_6system10error_codeE
+libboost_filesystem.so.1.72.0:_ZN5boost10filesystem6detail9file_sizeERKNS0_4pathEPNS_6system10error_codeE
libboost_filesystem.so.1.72.0:_ZN5boost10filesystem8absoluteERKNS0_4pathES3_
libboost_filesystem.so.1.72.0:_ZNK5boost10filesystem4path11parent_pathEv
libboost_filesystem.so.1.72.0:_ZNK5boost10filesystem4path7compareERKS1_
@@ -499,6 +399,62 @@
libm.so.6:sqrtf
libm.so.6:tan
libm.so.6:tanh
+libpano13.so.3:CheckParams
+libpano13.so.3:DisposeAlignInfo
+libpano13.so.3:PT_setErrorFcn
+libpano13.so.3:PT_setInfoDlgFcn
+libpano13.so.3:PT_setProgressFcn
+libpano13.so.3:ParseScript
+libpano13.so.3:RunLMOptimizer
+libpano13.so.3:SetAlignParams
+libpano13.so.3:SetCorrectDefaults
+libpano13.so.3:SetCorrectionRadius
+libpano13.so.3:SetGlobalPtr
+libpano13.so.3:SetImageDefaults
+libpano13.so.3:SetInvMakeParams
+libpano13.so.3:SetLMParams
+libpano13.so.3:SetMakeParams
+libpano13.so.3:deregister
+libpano13.so.3:distSquared
+libpano13.so.3:erect_albersequalareaconic
+libpano13.so.3:erect_arch
+libpano13.so.3:erect_hammer
+libpano13.so.3:erect_lambert
+libpano13.so.3:erect_lambertazimuthal
+libpano13.so.3:erect_mercator
+libpano13.so.3:erect_millercylindrical
+libpano13.so.3:erect_pano
+libpano13.so.3:erect_rect
+libpano13.so.3:erect_sinusoidal
+libpano13.so.3:erect_sphere_tp
+libpano13.so.3:erect_stereographic
+libpano13.so.3:erect_transmercator
+libpano13.so.3:execute_stack_new
+libpano13.so.3:fcnPano
+libpano13.so.3:horiz
+libpano13.so.3:lambertazimuthal_erect
+libpano13.so.3:myfree
+libpano13.so.3:orthographic_sphere_tp
+libpano13.so.3:panoProjectionFeaturesQuery
+libpano13.so.3:panoProjectionFormatCount
+libpano13.so.3:pano_sphere_tp
+libpano13.so.3:persp_sphere
+libpano13.so.3:plane_transfer_to_camera
+libpano13.so.3:queryFOVLimits
+libpano13.so.3:queryFeatureString
+libpano13.so.3:radial
+libpano13.so.3:rect_sphere_tp
+libpano13.so.3:resize
+libpano13.so.3:rotate_erect
+libpano13.so.3:shear
+libpano13.so.3:sphere_tp_equisolid
+libpano13.so.3:sphere_tp_erect
+libpano13.so.3:sphere_tp_orthographic
+libpano13.so.3:sphere_tp_thoby
+libpano13.so.3:stereographic_erect
+libpano13.so.3:thoby_sphere_tp
+libpano13.so.3:vert
+libpano13.so.3:vertical
libpthread.so.0:__errno_location
libpthread.so.0:pthread_create
libsqlite3.so.0:sqlite3_bind_double
@@ -524,6 +480,7 @@
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16find_last_not_ofEPKcmm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE17find_first_not_ofEPKcmm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEPKcm
+libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE4findEcm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5rfindEcm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6substrEmm
libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7compareERKS4_
@@ -555,7 +512,6 @@
libstdc++.so.6:_ZNSo9_M_insertImEERSoT_
libstdc++.so.6:_ZNSo9_M_insertIxEERSoT_
libstdc++.so.6:_ZNSo9_M_insertIyEERSoT_
-libstdc++.so.6:_ZNSoC2Ev
libstdc++.so.6:_ZNSolsEPSt15basic_streambufIcSt11char_traitsIcEE
libstdc++.so.6:_ZNSolsEi
libstdc++.so.6:_ZNSolsEs
@@ -592,7 +548,6 @@
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE9pbackfailEi
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE9showmanycEv
libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEE9underflowEv
-libstdc++.so.6:_ZNSt15basic_streambufIcSt11char_traitsIcEEC2Ev
libstdc++.so.6:_ZNSt16invalid_argumentD1Ev
libstdc++.so.6:_ZNSt3_V214error_categoryD2Ev
libstdc++.so.6:_ZNSt3_V216generic_categoryEv
@@ -607,6 +562,7 @@
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6assignEPKc
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE8_M_eraseEmm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_assignERKS4_
+libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_createERmm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1EPKcRKS3_
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1ERKS4_
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEE10_M_replaceEmmPKwm
@@ -633,7 +589,6 @@
libstdc++.so.6:_ZNSt8ios_baseD2Ev
libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E
libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE5clearESt12_Ios_Iostate
-libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEEC2Ev
libstdc++.so.6:_ZNSt9exceptionD1Ev
libstdc++.so.6:_ZNSt9exceptionD2Ev
libstdc++.so.6:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l
@@ -724,6 +679,52 @@
libtiff.so.5:TIFFSetField
libtiff.so.5:TIFFSetWarningHandler
libtiff.so.5:TIFFWriteScanline
+libvigraimpex.so.11:_ZN5vigra10getEncoderERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_S7_
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo11setPositionERKNS_6Diff2DE
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo12setPixelTypeEPKc
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo13setCanvasSizeERKNS_6Size2DE
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo13setICCProfileERKNS_11ArrayVectorIhSaIhEEE
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo14setCompressionEPKc
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo14setXResolutionEf
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo14setYResolutionEf
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfo21setForcedRangeMappingEdddd
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfoC1EPKcS2_
+libvigraimpex.so.11:_ZN5vigra15ImageExportInfoD1Ev
+libvigraimpex.so.11:_ZN5vigra15ImageImportInfoC1EPKcj
+libvigraimpex.so.11:_ZN5vigra15ImageImportInfoD1Ev
+libvigraimpex.so.11:_ZN5vigra16impexListFormatsB5cxx11Ev
+libvigraimpex.so.11:_ZN5vigra18negotiatePixelTypeERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_RS5_
+libvigraimpex.so.11:_ZN5vigra19impexListExtensionsB5cxx11Ev
+libvigraimpex.so.11:_ZN5vigra20isPixelTypeSupportedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_
+libvigraimpex.so.11:_ZN5vigra21isBandNumberSupportedERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEi
+libvigraimpex.so.11:_ZN5vigra7decoderERKNS_15ImageImportInfoE
+libvigraimpex.so.11:_ZN5vigra7encoderERKNS_15ImageExportInfoE
+libvigraimpex.so.11:_ZN5vigra7isImageEPKc
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo10getFromMaxEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo10getFromMinEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo11getFileNameEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo12getPixelTypeEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo21hasForcedRangeMappingEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo8getToMaxEv
+libvigraimpex.so.11:_ZNK5vigra15ImageExportInfo8getToMinEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo11getFileNameEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo11getFileTypeEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo11getPositionEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo11isGrayscaleEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo12getPixelTypeEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo13getCanvasSizeEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo13getICCProfileEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo13getImageIndexEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo13numExtraBandsEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo14getXResolutionEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo14getYResolutionEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo4sizeEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo5widthEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo6heightEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo7isColorEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo8numBandsEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo9numImagesEv
+libvigraimpex.so.11:_ZNK5vigra15ImageImportInfo9pixelTypeEv
libwx_baseu-3.0.so.0:_Z10wxCopyFileRK8wxStringS1_b
libwx_baseu-3.0.so.0:_Z10wxOnAssertPKciS0_S0_PKw
libwx_baseu-3.0.so.0:_Z10wxOnAssertPKciS0_S0_S0_
@@ -932,7 +933,6 @@
libwx_baseu-3.0.so.0:_ZN5wxDir11GetAllFilesERK8wxStringP13wxArrayStringS2_i
libwx_baseu-3.0.so.0:_ZN5wxDir5CloseEv
libwx_baseu-3.0.so.0:_ZN5wxDir6ExistsERK8wxString
-libwx_baseu-3.0.so.0:_ZN5wxDir9FindFirstERK8wxStringS2_i
libwx_baseu-3.0.so.0:_ZN5wxDirC1ERK8wxString
libwx_baseu-3.0.so.0:_ZN5wxLog11ms_logLevelE
libwx_baseu-3.0.so.0:_ZN5wxLog17GetComponentLevelE8wxString
@@ -950,8 +950,6 @@
libwx_baseu-3.0.so.0:_ZN7wxEventaSERKS_
libwx_baseu-3.0.so.0:_ZN7wxMutex4LockEv
libwx_baseu-3.0.so.0:_ZN7wxMutex6UnlockEv
-libwx_baseu-3.0.so.0:_ZN7wxMutexC1E11wxMutexType
-libwx_baseu-3.0.so.0:_ZN7wxMutexD1Ev
libwx_baseu-3.0.so.0:_ZN7wxTimer4InitEv
libwx_baseu-3.0.so.0:_ZN7wxTimer4StopEv
libwx_baseu-3.0.so.0:_ZN7wxTimer5StartEib
@@ -980,12 +978,6 @@
libwx_baseu-3.0.so.0:_ZN8wxThread11TestDestroyEv
libwx_baseu-3.0.so.0:_ZN8wxThread12GetCurrentIdEv
libwx_baseu-3.0.so.0:_ZN8wxThread15ms_idMainThreadE
-libwx_baseu-3.0.so.0:_ZN8wxThread3RunEv
-libwx_baseu-3.0.so.0:_ZN8wxThread4KillEv
-libwx_baseu-3.0.so.0:_ZN8wxThread4WaitE12wxThreadWait
-libwx_baseu-3.0.so.0:_ZN8wxThread5SleepEm
-libwx_baseu-3.0.so.0:_ZN8wxThread6CreateEj
-libwx_baseu-3.0.so.0:_ZN8wxThreadC2E12wxThreadKind
libwx_baseu-3.0.so.0:_ZN8wxThreadD2Ev
libwx_baseu-3.0.so.0:_ZN9wxPrivate18GetUntypedNullDataEv
libwx_baseu-3.0.so.0:_ZN9wxProcess4InitEP12wxEvtHandlerii
@@ -1059,11 +1051,9 @@
libwx_baseu-3.0.so.0:_ZNK8wxString6ToLongEPli
libwx_baseu-3.0.so.0:_ZNK8wxString7compareEPKw
libwx_baseu-3.0.so.0:_ZNK8wxString7compareERKS_
-libwx_baseu-3.0.so.0:_ZNK8wxString8EndsWithERKS_PS_
libwx_baseu-3.0.so.0:_ZNK8wxString8ToDoubleEPd
libwx_baseu-3.0.so.0:_ZNK8wxString9CmpNoCaseERKS_
libwx_baseu-3.0.so.0:_ZNK8wxString9ToCDoubleEPd
-libwx_baseu-3.0.so.0:_ZNK8wxThread9IsRunningEv
libwx_baseu-3.0.so.0:_ZNK9wxProcess12GetClassInfoEv
libwx_baseu-3.0.so.0:_ZNK9wxProcess16IsErrorAvailableEv
libwx_baseu-3.0.so.0:_ZNK9wxProcess16IsInputAvailableEv
@@ -2060,12 +2050,14 @@
libwx_gtk2u_core-3.0.so.0:_ZTV12wxFocusEvent
libwx_gtk2u_core-3.0.so.0:_ZTV12wxSpinButton
libwx_gtk2u_core-3.0.so.0:_ZTV13wxFileHistory
+libwx_gtk2u_core-3.0.so.0:_ZTV13wxNotifyEvent
libwx_gtk2u_core-3.0.so.0:_ZTV13wxScrollEvent
libwx_gtk2u_core-3.0.so.0:_ZTV14wxBitmapButton
libwx_gtk2u_core-3.0.so.0:_ZTV14wxCommandEvent
libwx_gtk2u_core-3.0.so.0:_ZTV14wxListCtrlBase
libwx_gtk2u_core-3.0.so.0:_ZTV14wxScrollHelper
libwx_gtk2u_core-3.0.so.0:_ZTV14wxToggleButton
+libwx_gtk2u_core-3.0.so.0:_ZTV15wxBookCtrlEvent
libwx_gtk2u_core-3.0.so.0:_ZTV15wxComboCtrlBase
libwx_gtk2u_core-3.0.so.0:_ZTV15wxMessageDialog
libwx_gtk2u_core-3.0.so.0:_ZTV15wxUpdateUIEvent
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,92 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -215,6 +215,7 @@ ENDIF()
+ ENDIF()
+
+ FIND_PACKAGE(OpenEXR REQUIRED)
++include_directories(${IMATH_INCLUDE_DIR})
+ include_directories(${OPENEXR_INCLUDE_DIR})
+
+ FIND_PACKAGE(VIGRA 1.9.0 REQUIRED)
+--- a/CMakeModules/FindOpenEXR.cmake
++++ b/CMakeModules/FindOpenEXR.cmake
+@@ -32,17 +32,16 @@ ENDIF (NOT WIN32 OR MINGW)
+ ${SOURCE_BASE_DIR}/Deploy/include
+ )
+
+- include(FindLibraryWithDebug)
+- find_library_with_debug(OPENEXR_HALF_LIBRARY
+- WIN32_DEBUG_POSTFIX d
+- NAMES Half-2_5 Half-2_4 Half-2_3 Half
+- PATHS
+- ${_OPENEXRLinkDir}
+- ${SYSTEM_LIB_DIRS}
+- ${SOURCE_BASE_DIR}/Deploy/lib/
+- ${SOURCE_BASE_DIR}/Deploy/lib/Release
++ FIND_PATH(IMATH_INCLUDE_DIR half.h
++ PATH_SUFFIXES Imath
++ PATHS
++ ${_OpenEXRIncDir}
++ /usr/include
++ /usr/local/include
++ ${SOURCE_BASE_DIR}/Deploy/include
+ )
+-
++
++ include(FindLibraryWithDebug)
+ find_library_with_debug(OPENEXR_IEX_LIBRARY
+ WIN32_DEBUG_POSTFIX d
+ NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex
+@@ -74,9 +73,9 @@ ENDIF (NOT WIN32 OR MINGW)
+ )
+
+
+- find_library_with_debug(OPENEXR_ILMIMF_LIBRARY
++ find_library_with_debug(OPENEXR_OPENEXR_LIBRARY
+ WIN32_DEBUG_POSTFIX d
+- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf
++ NAMES OpenEXR-3_0 OpenEXR
+ PATHS
+ ${_OPENEXRLinkDir}
+ ${SYSTEM_LIB_DIRS}
+@@ -90,12 +89,12 @@ ENDIF (NOT WIN32 OR MINGW)
+
+ FIND_PACKAGE(ZLIB)
+
+- if (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY AND ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)
++ if (OPENEXR_INCLUDE_DIR AND IMATH_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_OPENEXR_LIBRARY AND OPENEXR_IEX_LIBRARY AND ZLIB_INCLUDE_DIR AND ZLIB_LIBRARIES)
+ set(OPENEXR_FOUND TRUE)
+ if (OPENEXR_ILMTHREAD_LIBRARY)
+- set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
++ set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
+ else ()
+- set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
++ set(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_OPENEXR_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
+ endif ()
+ endif ()
+
+@@ -113,11 +112,11 @@ ENDIF (NOT WIN32 OR MINGW)
+
+ MARK_AS_ADVANCED(
+ OPENEXR_INCLUDE_DIR
++ IMATH_INCLUDE_DIR
+ OPENEXR_LIBRARIES
+- OPENEXR_ILMIMF_LIBRARY
++ OPENEXR_OPENEXR_LIBRARY
+ OPENEXR_IMATH_LIBRARY
+ OPENEXR_IEX_LIBRARY
+- OPENEXR_HALF_LIBRARY
+ OPENEXR_ILMTHREAD_LIBRARY )
+
+ endif (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
+--- a/CMakeModules/FindVIGRA.cmake
++++ b/CMakeModules/FindVIGRA.cmake
+@@ -74,7 +74,7 @@ IF (VIGRA_FOUND)
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
+- IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
++ IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr")
+ MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
+ ENDIF()
+ ELSE()
diff --git a/files/hugin-exiv2-0-27-1.patch b/files/hugin-exiv2-0-27-1.patch
deleted file mode 100644
--- a/files/hugin-exiv2-0-27-1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/AboutDialog.cpp
---- a/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/AboutDialog.cpp Wed May 15 17:47:40 2019 +0200
-@@ -42,7 +42,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
-+#include <exiv2/exiv2.hpp>
- #include "lensdb/LensDB.h"
- #include "sqlite3.h"
- #include <lcms2.h>
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/PanoOperation.cpp
---- a/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/PanoOperation.cpp Wed May 15 17:47:40 2019 +0200
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "base_wx/LensTools.h"
- #include "base_wx/wxLensDB.h"
- #include "hugin/ResetDialog.h"
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/RawImport.cpp
---- a/src/hugin1/hugin/RawImport.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/RawImport.cpp Wed May 15 17:47:40 2019 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/TextureManager.cpp
---- a/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/TextureManager.cpp Wed May 15 17:47:40 2019 +0200
-@@ -65,8 +65,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
-
- TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
- {
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/ptbatcher/FindPanoDialog.cpp
---- a/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp Wed May 15 17:47:40 2019 +0200
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
- #ifdef _WIN32
- #include <commctrl.h>
- #endif
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/Exiv2Helper.cpp
---- a/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp Wed May 15 17:47:40 2019 +0200
-@@ -28,8 +28,7 @@
- #include "Exiv2Helper.h"
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"
--#include "exiv2/easyaccess.hpp"
--#include "exiv2/version.hpp"
-+#include <exiv2/exiv2.hpp>
-
- namespace HuginBase
- {
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/SrcPanoImage.cpp
---- a/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp Wed May 15 17:47:40 2019 +0200
-@@ -40,9 +40,7 @@
- #include <vigra/diff2d.hxx>
- #include <vigra/imageinfo.hxx>
- #include <hugin_utils/utils.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <lensdb/LensDB.h>
- #include "Exiv2Helper.h"
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,15 +1,16 @@
name : hugin
-homepage : http://hugin.sourceforge.net/
-version : 2019.0.0
-release : 24
+version : 2020.0.0
+release : 25
source :
- - https://vorboss.dl.sourceforge.net/project/hugin/hugin/hugin-2019.0/hugin-2019.0.0.tar.bz2 : f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1
+ - https://sourceforge.net/projects/hugin/files/hugin/hugin-2020.0/hugin-2020.0.0.tar.bz2 : 283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
+homepage : http://hugin.sourceforge.net/
license : GPL-2.0-or-later
component : multimedia.graphics
summary : Hugin - Panorama photo stitcher
description: |
With Hugin you can assemble a mosaic of photographs into a complete immersive panorama, stitch any series of overlapping pictures and much more.
builddeps :
+ - pkgconfig(OpenEXR)
- pkgconfig(exiv2)
- pkgconfig(fftw3)
- pkgconfig(glew)
@@ -20,7 +21,6 @@
- pkgconfig(libpng)
- pkgconfig(libssh)
- pkgconfig(libtiff-4)
- - pkgconfig(OpenEXR)
- pkgconfig(sqlite3)
- pkgconfig(xi)
- pkgconfig(xmu)
@@ -33,7 +33,7 @@
- lensfun
- perl-image-exiftool
setup : |
- %patch -p1 < $pkgfiles/hugin-exiv2-0-27-1.patch
+ %patch -p1 < $pkgfiles/OpenEXR-instead-of-ilmbase.patch
%cmake_ninja -DUSE_GDKBACKEND_X11=ON
build : |
%ninja_build
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>hugin</Name>
<Homepage>http://hugin.sourceforge.net/</Homepage>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>multimedia.graphics</PartOf>
@@ -57,9 +57,6 @@
<Path fileType="library">/usr/lib/hugin/libhuginbasewx.so.0.0</Path>
<Path fileType="library">/usr/lib/hugin/libicpfindlib.so.0.0</Path>
<Path fileType="library">/usr/lib/hugin/liblocalfeatures.so.0.0</Path>
- <Path fileType="data">/usr/share/appdata/PTBatcherGUI.appdata.xml</Path>
- <Path fileType="data">/usr/share/appdata/calibrate_lens_gui.appdata.xml</Path>
- <Path fileType="data">/usr/share/appdata/hugin.appdata.xml</Path>
<Path fileType="data">/usr/share/applications/PTBatcherGUI.desktop</Path>
<Path fileType="data">/usr/share/applications/calibrate_lens_gui.desktop</Path>
<Path fileType="data">/usr/share/applications/hugin.desktop</Path>
@@ -546,7 +543,7 @@
<Path fileType="data">/usr/share/hugin/xrc/pref_dialog.xrc</Path>
<Path fileType="data">/usr/share/hugin/xrc/preview_frame.xrc</Path>
<Path fileType="data">/usr/share/hugin/xrc/reset_dialog.xrc</Path>
- <Path fileType="data">/usr/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png</Path>
+ <Path fileType="data">/usr/share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/128x128/apps/hugin.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/128x128/apps/ptbatcher.png</Path>
<Path fileType="data">/usr/share/icons/hicolor/16x16/apps/hugin.png</Path>
@@ -596,6 +593,7 @@
<Path fileType="man">/usr/share/man/man1/hugin_executor.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/hugin_hdrmerge.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/hugin_lensdb.1.gz</Path>
+ <Path fileType="man">/usr/share/man/man1/hugin_stacker.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/hugin_stitch_project.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/icpfind.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/linefind.1.gz</Path>
@@ -612,16 +610,19 @@
<Path fileType="man">/usr/share/man/man1/tca_correct.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/verdandi.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/vig_optimize.1.gz</Path>
+ <Path fileType="data">/usr/share/metainfo/PTBatcherGUI.appdata.xml</Path>
+ <Path fileType="data">/usr/share/metainfo/calibrate_lens_gui.appdata.xml</Path>
+ <Path fileType="data">/usr/share/metainfo/hugin.appdata.xml</Path>
<Path fileType="data">/usr/share/mime/packages/hugin.xml</Path>
</Files>
</Package>
<History>
- <Update release="24">
- <Date>2021-01-20</Date>
- <Version>2019.0.0</Version>
+ <Update release="25">
+ <Date>2021-06-17</Date>
+ <Version>2020.0.0</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@getsol.us</Email>
+ <Name>Martin Reboredo</Name>
+ <Email>yakoyoku@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 12, 12:26 AM (2 h, 45 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5854509
Default Alt Text
D11073.id27267.diff (37 KB)

Event Timeline