Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11054101
D10994.id26998.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
27 KB
Referenced Files
None
Subscribers
None
D10994.id26998.diff
View Options
diff --git a/abi_libs b/abi_libs
--- a/abi_libs
+++ b/abi_libs
@@ -38,6 +38,7 @@
libopencv_reg.so.4.5
libopencv_rgbd.so.4.5
libopencv_saliency.so.4.5
+libopencv_sfm.so.4.5
libopencv_shape.so.4.5
libopencv_stereo.so.4.5
libopencv_stitching.so.4.5
@@ -50,6 +51,7 @@
libopencv_videoio.so.4.5
libopencv_videostab.so.4.5
libopencv_wechat_qrcode.so.4.5
+libopencv_xfeatures2d.so.4.5
libopencv_ximgproc.so.4.5
libopencv_xobjdetect.so.4.5
libopencv_xphoto.so.4.5
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -4989,6 +4989,41 @@
libopencv_saliency.so.4.5:_ZTv0_n88_N2cv8saliency25StaticSaliencyFineGrained19computeSaliencyImplERKNS_11_InputArrayERKNS_12_OutputArrayE
libopencv_saliency.so.4.5:_ZTv0_n88_N2cv8saliency28MotionSaliencyBinWangApr201419computeSaliencyImplERKNS_11_InputArrayERKNS_12_OutputArrayE
libopencv_saliency.so.4.5:_ZTv0_n88_N2cv8saliency30StaticSaliencySpectralResidual19computeSaliencyImplERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm11reconstructERKNS_11_InputArrayERKNS_12_OutputArrayES6_RKNS_17_InputOutputArrayES6_b
+libopencv_sfm.so.4.5:_ZN2cv3sfm11reconstructERKNS_11_InputArrayERKNS_12_OutputArrayES6_RKNS_17_InputOutputArrayEb
+libopencv_sfm.so.4.5:_ZN2cv3sfm11reconstructESt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EERKNS_12_OutputArrayESC_RKNS_17_InputOutputArrayESC_b
+libopencv_sfm.so.4.5:_ZN2cv3sfm11reconstructESt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS7_EERKNS_12_OutputArrayESC_RKNS_17_InputOutputArrayEb
+libopencv_sfm.so.4.5:_ZN2cv3sfm15essentialFromRtERKNS_11_InputArrayES3_S3_S3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm15normalizePointsERKNS_11_InputArrayERKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm17KRtFromProjectionERKNS_11_InputArrayERKNS_12_OutputArrayES6_S6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm17projectionFromKRtERKNS_11_InputArrayES3_S3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm17triangulatePointsERKNS_11_InputArrayES3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm18computeOrientationERKNS_11_InputArrayES3_RKNS_12_OutputArrayES6_d
+libopencv_sfm.so.4.5:_ZN2cv3sfm19motionFromEssentialERKNS_11_InputArrayERKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm20importReconstructionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKNS_12_OutputArrayESB_SB_SB_i
+libopencv_sfm.so.4.5:_ZN2cv3sfm20normalizeFundamentalERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm20relativeCameraMotionERKNS_11_InputArrayES3_S3_S3_RKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm22euclideanToHomogeneousERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm22homogeneousToEuclideanERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm24essentialFromFundamentalERKNS_11_InputArrayES3_S3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm24fundamentalFromEssentialERKNS_11_InputArrayES3_S3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm24meanAndVarianceAlongRowsERKNS_11_InputArrayERKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm24normalizeIsotropicPointsERKNS_11_InputArrayERKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm24preconditionerFromPointsERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm26fundamentalFromProjectionsERKNS_11_InputArrayES3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm26normalizedEightPointSolverERKNS_11_InputArrayES3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm26projectionsFromFundamentalERKNS_11_InputArrayERKNS_12_OutputArrayES6_
+libopencv_sfm.so.4.5:_ZN2cv3sfm27applyTransformationToPointsERKNS_11_InputArrayES3_RKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm31SFMLibmvEuclideanReconstruction6createERKNS0_29libmv_CameraIntrinsicsOptionsERKNS0_27libmv_ReconstructionOptionsE
+libopencv_sfm.so.4.5:_ZN2cv3sfm33isotropicPreconditionerFromPointsERKNS_11_InputArrayERKNS_12_OutputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm33motionFromEssentialChooseSolutionERKNS_11_InputArrayES3_S3_S3_S3_S3_
+libopencv_sfm.so.4.5:_ZN2cv3sfm42fundamentalFromCorrespondences7PointRobustERKNS_11_InputArrayES3_dRKNS_12_OutputArrayES6_d
+libopencv_sfm.so.4.5:_ZN2cv3sfm42fundamentalFromCorrespondences8PointRobustERKNS_11_InputArrayES3_dRKNS_12_OutputArrayES6_d
+libopencv_sfm.so.4.5:_ZN2cv3sfm4skewERKNS_11_InputArrayE
+libopencv_sfm.so.4.5:_ZN2cv3sfm5depthERKNS_11_InputArrayES3_S3_
+libopencv_sfm.so.4.5:__bss_start
+libopencv_sfm.so.4.5:_edata
+libopencv_sfm.so.4.5:_end
libopencv_shape.so.4.5:_ZN2cv23createAffineTransformerEb
libopencv_shape.so.4.5:_ZN2cv31createChiHistogramCostExtractorEif
libopencv_shape.so.4.5:_ZN2cv31createEMDHistogramCostExtractorEiif
@@ -5951,6 +5986,53 @@
libopencv_wechat_qrcode.so.4.5:_ZN2cv13wechat_qrcode12WeChatQRCode4Impl7cropObjERKNS_3MatES5_RNS0_5AlignE
libopencv_wechat_qrcode.so.4.5:_ZN2cv13wechat_qrcode12WeChatQRCodeC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_S9_S9_
libopencv_wechat_qrcode.so.4.5:_ZN2cv13wechat_qrcode12WeChatQRCodeC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES9_S9_S9_
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d10matchLOGOSERKSt6vectorINS_8KeyPointESaIS2_EES6_RKS1_IiSaIiEESA_RS1_INS_6DMatchESaISB_EE
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d11MSDDetector6createEiiiififib
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d12StarDetector6createEiiiii
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d13PCTSignatures13drawSignatureERKNS_11_InputArrayES4_RKNS_12_OutputArrayEfi
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d13PCTSignatures18generateInitPointsERSt6vectorINS_6Point_IfEESaIS4_EEii
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d13PCTSignatures6createERKSt6vectorINS_6Point_IfEESaIS4_EERKS2_IiSaIiEE
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d13PCTSignatures6createERKSt6vectorINS_6Point_IfEESaIS4_EEi
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d13PCTSignatures6createEiii
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d15AffineFeature2D6createENS_3PtrINS_9Feature2DEEES4_
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d15FASTForPointSetERKNS_11_InputArrayERSt6vectorINS_8KeyPointESaIS5_EEibNS_19FastFeatureDetector12DetectorTypeE
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointC1ENS_6Point_IfEEfNS_5Size_IiEEff
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointC1Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointC2ENS_6Point_IfEEfNS_5Size_IiEEff
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointC2Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointD0Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointD1Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17Elliptic_KeyPointD2Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d17PCTSignaturesSQFD6createEiif
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d24BriefDescriptorExtractor6createEib
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d28HarrisLaplaceFeatureDetector6createEiffii
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d3VGG6createEifbbfb
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d4SURF6createEdiibb
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d4TBMR6createEiffi
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d5DAISY6createEfiiiNS1_17NormalizationTypeERKNS_11_InputArrayEbb
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d5DAISY7computeERKNS_11_InputArrayERSt6vectorIS5_INS_8KeyPointESaIS6_EESaIS8_EERKNS_12_OutputArrayE
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d5FREAK6createEbbfiRKSt6vectorIiSaIiEE
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d5LATCH6createEibid
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d5LUCID6createEii
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d6BEBLID6createEfi
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d8matchGMSERKNS_5Size_IiEES4_RKSt6vectorINS_8KeyPointESaIS6_EESA_RKS5_INS_6DMatchESaISB_EERSD_bbd
+libopencv_xfeatures2d.so.4.5:_ZN2cv11xfeatures2d9BoostDesc6createEibf
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDA13releaseMemoryEv
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDA15uploadKeypointsERKSt6vectorINS_8KeyPointESaIS3_EERNS0_6GpuMatE
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDA17downloadKeypointsERKNS0_6GpuMatERSt6vectorINS_8KeyPointESaIS6_EE
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDA19downloadDescriptorsERKNS0_6GpuMatERSt6vectorIfSaIfEE
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDA6createEdiibfb
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAC1Ediibfb
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAC1Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAC2Ediibfb
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAC2Ev
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAclERKNS0_6GpuMatES4_RS2_
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAclERKNS0_6GpuMatES4_RS2_S5_b
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAclERKNS0_6GpuMatES4_RSt6vectorINS_8KeyPointESaIS6_EE
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAclERKNS0_6GpuMatES4_RSt6vectorINS_8KeyPointESaIS6_EERS2_b
+libopencv_xfeatures2d.so.4.5:_ZN2cv4cuda9SURF_CUDAclERKNS0_6GpuMatES4_RSt6vectorINS_8KeyPointESaIS6_EERS5_IfSaIfEEb
+libopencv_xfeatures2d.so.4.5:_ZNK2cv4cuda9SURF_CUDA11defaultNormEv
+libopencv_xfeatures2d.so.4.5:_ZNK2cv4cuda9SURF_CUDA14descriptorSizeEv
libopencv_ximgproc.so.4.5:_ZN2cv8ximgproc10computeMSEERKNS_11_InputArrayES3_NS_5Rect_IiEE
libopencv_ximgproc.so.4.5:_ZN2cv8ximgproc11BrightEdgesERNS_3MatES2_iii
libopencv_ximgproc.so.4.5:_ZN2cv8ximgproc11EdgeDrawing6Params4readERKNS_8FileNodeE
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,7 +1,7 @@
UNKNOWN
ld-linux-x86-64.so.2
libGLX.so.0
-libIlmImf-2_5.so.25
+libOpenEXR-3_0.so.28
libOpenGL.so.0
libQt5Core.so.5
libQt5Gui.so.5
@@ -12,11 +12,14 @@
libavformat.so.58
libavutil.so.56
libc.so.6
+libceres.so.2
libdc1394.so.25
libdl.so.2
libfreetype.so.6
libgcc_s.so.1
+libgflags.so.2.2
libglib-2.0.so.0
+libglog.so.0
libgobject-2.0.so.0
libgphoto2.so.6
libgphoto2_port.so.12
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -55,31 +55,31 @@
libGLX.so.0:glXGetCurrentContext
libGLX.so.0:glXGetCurrentDisplay
libGLX.so.0:glXGetProcAddressARB
-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_511FrameBuffer3endEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_511FrameBuffer5beginEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_511FrameBuffer6insertEPKcRKNS_5SliceE
-libIlmImf-2_5.so.25:_ZN7Imf_2_514ChromaticitiesC1ERKN9Imath_2_54Vec2IfEES5_S5_S5_
-libIlmImf-2_5.so.25:_ZN7Imf_2_514chromaticitiesERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_517globalThreadCountEv
-libIlmImf-2_5.so.25:_ZN7Imf_2_517hasChromaticitiesERKNS_6HeaderE
-libIlmImf-2_5.so.25:_ZN7Imf_2_55SliceC1ENS_9PixelTypeEPcmmiidbb
-libIlmImf-2_5.so.25:_ZN7Imf_2_56Header11compressionEv
-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_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_511ChannelList11findChannelEPKc
-libIlmImf-2_5.so.25:_ZNK7Imf_2_56Header10dataWindowEv
-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_011FrameBuffer3endEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_011FrameBuffer5beginEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_011FrameBuffer6insertEPKcRKNS_5SliceE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014ChromaticitiesC1ERKN9Imath_3_04Vec2IfEES5_S5_S5_
+libOpenEXR-3_0.so.28:_ZN7Imf_3_014chromaticitiesERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017globalThreadCountEv
+libOpenEXR-3_0.so.28:_ZN7Imf_3_017hasChromaticitiesERKNS_6HeaderE
+libOpenEXR-3_0.so.28:_ZN7Imf_3_05SliceC1ENS_9PixelTypeEPcmmiidbb
+libOpenEXR-3_0.so.28:_ZN7Imf_3_06Header11compressionEv
+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:_ZNK7Imf_3_011ChannelList11findChannelEPKc
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header10dataWindowEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_06Header8channelsEv
+libOpenEXR-3_0.so.28:_ZNK7Imf_3_09InputFile6headerEv
libOpenGL.so.0:glClear
libOpenGL.so.0:glEnable
libOpenGL.so.0:glFrustum
@@ -1213,6 +1213,18 @@
libc.so.6:usleep
libc.so.6:wcslen
libc.so.6:wmemcpy
+libceres.so.2:_ZN5ceres22SubsetParameterizationC1EiRKSt6vectorIiSaIiEE
+libceres.so.2:_ZN5ceres5SolveERKNS_6Solver7OptionsEPNS_7ProblemEPNS0_7SummaryE
+libceres.so.2:_ZN5ceres7Problem16AddResidualBlockEPNS_12CostFunctionEPNS_12LossFunctionEPKPdi
+libceres.so.2:_ZN5ceres7Problem19SetParameterizationEPdPNS_21LocalParameterizationE
+libceres.so.2:_ZN5ceres7Problem25SetParameterBlockConstantEPKd
+libceres.so.2:_ZN5ceres7Problem25SetParameterBlockVariableEPd
+libceres.so.2:_ZN5ceres7Problem8EvaluateERKNS0_15EvaluateOptionsEPdPSt6vectorIdSaIdEES8_PNS_9CRSMatrixE
+libceres.so.2:_ZN5ceres7ProblemC1ERKNS0_7OptionsE
+libceres.so.2:_ZN5ceres7ProblemC1Ev
+libceres.so.2:_ZN5ceres7ProblemD1Ev
+libceres.so.2:_ZNK5ceres6Solver7Summary10FullReportB5cxx11Ev
+libceres.so.2:_ZNK5ceres6Solver7Summary16IsSolutionUsableEv
libdc1394.so.25:dc1394_camera_enumerate
libdc1394.so.25:dc1394_camera_free
libdc1394.so.25:dc1394_camera_free_list
@@ -1268,6 +1280,7 @@
libgcc_s.so.1:__muldc3
libgcc_s.so.1:__mulsc3
libgcc_s.so.1:__popcountdi2
+libgflags.so.2.2:_ZN6google20SetCommandLineOptionB5cxx11EPKcS1_
libglib-2.0.so.0:g_clear_error
libglib-2.0.so.0:g_free
libglib-2.0.so.0:g_main_loop_new
@@ -1275,6 +1288,16 @@
libglib-2.0.so.0:g_main_loop_run
libglib-2.0.so.0:g_main_loop_unref
libglib-2.0.so.0:g_strdup
+libglog.so.0:_ZN3fLI7FLAGS_vE
+libglog.so.0:_ZN6google10LogMessage6streamEv
+libglog.so.0:_ZN6google10LogMessageC1EPKci
+libglog.so.0:_ZN6google10LogMessageC1EPKcii
+libglog.so.0:_ZN6google10LogMessageD1Ev
+libglog.so.0:_ZN6google11InitVLOG3__EPPiS0_PKci
+libglog.so.0:_ZN6google15LogMessageFatalC1EPKci
+libglog.so.0:_ZN6google15LogMessageFatalD1Ev
+libglog.so.0:_ZN6google17InitGoogleLoggingEPKc
+libglog.so.0:_ZN6google21kLogSiteUninitializedE
libgobject-2.0.so.0:g_object_get
libgobject-2.0.so.0:g_object_ref_sink
libgobject-2.0.so.0:g_object_set
@@ -1856,6 +1879,7 @@
libstdc++.so.6:_ZNSt6thread20hardware_concurrencyEv
libstdc++.so.6:_ZNSt6thread4joinEv
libstdc++.so.6:_ZNSt6thread6_StateD2Ev
+libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_replaceEmmPKcm
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructEmc
libstdc++.so.6:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_S_copy_charsEPcPKcS7_
@@ -1897,6 +1921,7 @@
libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE15_M_cache_localeERKSt6locale
libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E
libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE5clearESt12_Ios_Iostate
+libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE7copyfmtERKS2_
libstdc++.so.6:_ZNSt9exceptionD2Ev
libstdc++.so.6:_ZSt11_Hash_bytesPKvmm
libstdc++.so.6:_ZSt11__once_call
@@ -1979,6 +2004,7 @@
libstdc++.so.6:_ZTVSt9basic_iosIcSt11char_traitsIcEE
libstdc++.so.6:_ZdaPv
libstdc++.so.6:_ZdlPv
+libstdc++.so.6:_ZdlPvm
libstdc++.so.6:_Znam
libstdc++.so.6:_Znwm
libstdc++.so.6:_ZnwmRKSt9nothrow_t
diff --git a/files/Support-building-with-OpenEXR-3.patch b/files/Support-building-with-OpenEXR-3.patch
new file mode 100644
--- /dev/null
+++ b/files/Support-building-with-OpenEXR-3.patch
@@ -0,0 +1,52 @@
+From 4aa7fc0cbf5259f388d777f2a4d0bf2252c2158f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 12:07:48 +0200
+Subject: [PATCH 1/2] Support OpenEXR 3.0
+
+Try to find OpenEXR 3.0 using the upstream cmake config, and fallback to the previous algorithm if not found
+---
+ cmake/OpenCVFindOpenEXR.cmake | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake
+index ef633e853adc..133468243a84 100644
+--- a/cmake/OpenCVFindOpenEXR.cmake
++++ b/cmake/OpenCVFindOpenEXR.cmake
+@@ -9,6 +9,14 @@
+ # OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
+ #
+
++find_package(OpenEXR 3.0 CONFIG QUIET)
++if(TARGET OpenEXR::OpenEXR)
++ SET(OPENEXR_FOUND TRUE)
++ SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++ SET(OPENEXR_VERSION ${OpenEXR_VERSION})
++ return()
++endif()
++
+ SET(OPENEXR_LIBRARIES "")
+ SET(OPENEXR_LIBSEARCH_SUFFIXES "")
+ file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
+
+From 032339ab950fd05c5577765b86498e97623a09db Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 12:09:51 +0200
+Subject: [PATCH 2/2] Add explicit ImfFrameBuffer.h include
+
+This was transitively included with OpenEXR 2.x, but that's no longer the case with OpenEXR 3.x
+---
+ modules/imgcodecs/src/grfmt_exr.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp
+index 9242871f8dde..aaf28eead6f7 100644
+--- a/modules/imgcodecs/src/grfmt_exr.cpp
++++ b/modules/imgcodecs/src/grfmt_exr.cpp
+@@ -56,6 +56,7 @@
+ #include <iostream>
+ #include <stdexcept>
+
++#include <ImfFrameBuffer.h>
+ #include <ImfHeader.h>
+ #include <ImfInputFile.h>
+ #include <ImfOutputFile.h>
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,11 +1,13 @@
name : opencv
version : 4.5.2
-release : 26
+release : 27
source :
- https://github.com/opencv/opencv/archive/refs/tags/4.5.2.tar.gz : ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8
- https://github.com/opencv/opencv_contrib/archive/4.5.2/opencv_contrib-4.5.2.tar.gz : 9f52fd3114ac464cb4c9a2a6a485c729a223afb57b9c24848484e55cef0b5c2a
- https://raw.githubusercontent.com/opencv/opencv_3rdparty/ippicv/master_20191018/ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz : 08627fa5660d52d59309a572dd7db5b9c8aea234cfa5aee0942a1dd903554246
- https://github.com/opencv/ade/archive/v0.1.1f.zip : 956e2e51da455ebb3d3ed1269dda44d233a2de620e5bdbdb32e0c0bb84b2c912
+ - https://github.com/opencv/opencv_3rdparty/archive/34e4206aef44d50e6bbcd0ab06354b52e7466d26/opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz : d93c783cdf799da7e4a9209d169390424c4c198c1c9b5eeb78ffc890afe5f332
+ - https://github.com/opencv/opencv_3rdparty/archive/fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d/opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz : e9abccbabcace092e5424073168cc86d422585d15d25569f01fb6503b109e0e1
license :
- BSD-3-Clause
- EULA # ippicv
@@ -16,7 +18,6 @@
builddeps :
- pkgconfig(OpenEXR)
- pkgconfig(Qt5Core)
- - pkgconfig(eigen3)
- pkgconfig(freetype2)
- pkgconfig(glu)
- pkgconfig(gstreamer-plugins-base-1.0)
@@ -30,11 +31,11 @@
- pkgconfig(libturbojpeg)
- pkgconfig(libv4l2)
- pkgconfig(libwebp)
- - pkgconfig(openblas)
- pkgconfig(protobuf)
- pkgconfig(python3)
- pkgconfig(sm)
- pkgconfig(xmu)
+ - ceres-solver-devel
- intel-tbb-devel
- numpy
- unzip
@@ -49,13 +50,35 @@
IPPMD5SUM=$(md5sum $sources/$IPPNAME | cut -d " " -f1)
mkdir -p .cache/ippicv
cp $sources/$IPPNAME .cache/ippicv/$IPPMD5SUM-$IPPNAME
+
ADENAME=$(basename $sources/v0.1.1f.zip)
ADEMD5SUM=$(md5sum $sources/$ADENAME | cut -d " " -f1)
mkdir -p .cache/ade
cp $sources/$ADENAME .cache/ade/$ADEMD5SUM-$ADENAME
+
+ mkdir boostdesc
+ mkdir -p .cache/xfeatures2d/boostdesc
+ tar xf $sources/opencv_3rdparty-34e4206*.tar.gz --strip-components=1 -C boostdesc
+ for int in boostdesc/boostdesc_*.i; do
+ BOOSTDESCNAME=$(basename $int)
+ BOOSTDESCMD5SUM=$(md5sum $int | cut -d " " -f1)
+ cp $int .cache/xfeatures2d/boostdesc/$BOOSTDESCMD5SUM-$BOOSTDESCNAME
+ done
+
+ mkdir vgg
+ mkdir -p .cache/xfeatures2d/vgg
+ tar xf $sources/opencv_3rdparty-fccf7cd*.tar.gz --strip-components=1 -C vgg
+ for int in vgg/vgg_*.i; do
+ VGGNAME=$(basename $int)
+ VGGMD5SUM=$(md5sum $int | cut -d " " -f1)
+ cp $int .cache/xfeatures2d/vgg/$VGGMD5SUM-$VGGNAME
+ done
+
tar xf $sources/opencv_contrib-*.tar.gz
mv opencv_contrib* contrib
+ %patch -p1 < $pkgfiles/Support-building-with-OpenEXR-3.patch
+
%cmake_ninja \
-DOPENCV_GENERATE_PKGCONFIG=ON \
-DOPENCV_EXTRA_MODULES_PATH=$workdir/contrib/modules \
@@ -73,7 +96,6 @@
-DBUILD_DOCS=OFF \
-DBUILD_WITH_DEBUG_INFO=OFF \
-DBUILD_opencv_python2=OFF \
- -DBUILD_opencv_xfeatures2d=OFF \
-DENABLE_SOLUTION_FOLDERS=ON \
-DOPENCV_ENABLE_NONFREE=ON \
-DWITH_QT=ON \
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -111,6 +111,8 @@
<Path fileType="library">/usr/lib64/libopencv_rgbd.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_saliency.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_saliency.so.4.5.2</Path>
+ <Path fileType="library">/usr/lib64/libopencv_sfm.so.4.5</Path>
+ <Path fileType="library">/usr/lib64/libopencv_sfm.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_shape.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_shape.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_stereo.so.4.5</Path>
@@ -135,12 +137,18 @@
<Path fileType="library">/usr/lib64/libopencv_videostab.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_wechat_qrcode.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_wechat_qrcode.so.4.5.2</Path>
+ <Path fileType="library">/usr/lib64/libopencv_xfeatures2d.so.4.5</Path>
+ <Path fileType="library">/usr/lib64/libopencv_xfeatures2d.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_ximgproc.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_ximgproc.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_xobjdetect.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_xobjdetect.so.4.5.2</Path>
<Path fileType="library">/usr/lib64/libopencv_xphoto.so.4.5</Path>
<Path fileType="library">/usr/lib64/libopencv_xphoto.so.4.5.2</Path>
+ <Path fileType="library">/usr/lib64/opencv4/3rdparty/libcorrespondence.a</Path>
+ <Path fileType="library">/usr/lib64/opencv4/3rdparty/libmultiview.a</Path>
+ <Path fileType="library">/usr/lib64/opencv4/3rdparty/libnumeric.a</Path>
+ <Path fileType="library">/usr/lib64/opencv4/3rdparty/libsimple_pipeline.a</Path>
<Path fileType="data">/usr/share/licenses/opencv4/SoftFloat-COPYING.txt</Path>
<Path fileType="data">/usr/share/licenses/opencv4/ade-LICENSE</Path>
<Path fileType="data">/usr/share/licenses/opencv4/ippicv-EULA.txt</Path>
@@ -190,7 +198,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="26">opencv</Dependency>
+ <Dependency release="27">opencv</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/opencv4/opencv2/alphamat.hpp</Path>
@@ -616,6 +624,16 @@
<Path fileType="header">/usr/include/opencv4/opencv2/saliency.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/saliency/saliencyBaseClasses.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/saliency/saliencySpecializedClasses.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/conditioning.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/fundamental.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/io.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/numeric.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/projection.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/reconstruct.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/robust.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/sfm/triangulation.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/shape.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/shape/emdL1.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/shape/hist_cost.hpp</Path>
@@ -694,6 +712,9 @@
<Path fileType="header">/usr/include/opencv4/opencv2/videostab/stabilizer.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/videostab/wobble_suppression.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/wechat_qrcode.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/xfeatures2d.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/xfeatures2d/cuda.hpp</Path>
+ <Path fileType="header">/usr/include/opencv4/opencv2/xfeatures2d/nonfree.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/ximgproc.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/ximgproc/brightedges.hpp</Path>
<Path fileType="header">/usr/include/opencv4/opencv2/ximgproc/color_match.hpp</Path>
@@ -769,6 +790,7 @@
<Path fileType="library">/usr/lib64/libopencv_reg.so</Path>
<Path fileType="library">/usr/lib64/libopencv_rgbd.so</Path>
<Path fileType="library">/usr/lib64/libopencv_saliency.so</Path>
+ <Path fileType="library">/usr/lib64/libopencv_sfm.so</Path>
<Path fileType="library">/usr/lib64/libopencv_shape.so</Path>
<Path fileType="library">/usr/lib64/libopencv_stereo.so</Path>
<Path fileType="library">/usr/lib64/libopencv_stitching.so</Path>
@@ -781,6 +803,7 @@
<Path fileType="library">/usr/lib64/libopencv_videoio.so</Path>
<Path fileType="library">/usr/lib64/libopencv_videostab.so</Path>
<Path fileType="library">/usr/lib64/libopencv_wechat_qrcode.so</Path>
+ <Path fileType="library">/usr/lib64/libopencv_xfeatures2d.so</Path>
<Path fileType="library">/usr/lib64/libopencv_ximgproc.so</Path>
<Path fileType="library">/usr/lib64/libopencv_xobjdetect.so</Path>
<Path fileType="library">/usr/lib64/libopencv_xphoto.so</Path>
@@ -788,8 +811,8 @@
</Files>
</Package>
<History>
- <Update release="26">
- <Date>2021-04-24</Date>
+ <Update release="27">
+ <Date>2021-05-30</Date>
<Version>4.5.2</Version>
<Comment>Packaging update</Comment>
<Name>Martin Reboredo</Name>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Aug 12, 12:23 AM (2 h, 43 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5813095
Default Alt Text
D10994.id26998.diff (27 KB)
Attached To
Mode
D10994: Update opencv to 4.5.3
Attached
Detach File
Event Timeline
Log In to Comment