algent-al

opencv-no-py2

Mar 19th, 2021 (edited)
272
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 10.44 KB | None | 0 0
  1.  abi_libs         |   1 -
  2.  abi_symbols      |   4 --
  3.  abi_used_libs    |   1 -
  4.  abi_used_symbols | 124 +++++++++++++++++++++----------------------------------
  5.  package.yml      |   3 +-
  6.  pspec_x86_64.xml |  18 +++-----
  7.  6 files changed, 55 insertions(+), 96 deletions(-)
  8.  
  9. diff --git a/abi_libs b/abi_libs
  10. index e6c2e67..4fc781d 100644
  11. --- a/abi_libs
  12. +++ b/abi_libs
  13. @@ -1,5 +1,4 @@
  14.  cv2.cpython-37m-x86_64-linux-gnu.so
  15. -cv2.so
  16.  libopencv_alphamat.so.4.5
  17.  libopencv_aruco.so.4.5
  18.  libopencv_bgsegm.so.4.5
  19. diff --git a/abi_symbols b/abi_symbols
  20. index 2a6460d..3dd1daa 100644
  21. --- a/abi_symbols
  22. +++ b/abi_symbols
  23. @@ -2,10 +2,6 @@ cv2.cpython-37m-x86_64-linux-gnu.so:PyInit_cv2
  24.  cv2.cpython-37m-x86_64-linux-gnu.so:__bss_start
  25.  cv2.cpython-37m-x86_64-linux-gnu.so:_edata
  26.  cv2.cpython-37m-x86_64-linux-gnu.so:_end
  27. -cv2.so:__bss_start
  28. -cv2.so:_edata
  29. -cv2.so:_end
  30. -cv2.so:initcv2
  31.  libopencv_alphamat.so.4.5:_ZN2cv8alphamat8infoFlowERKNS_11_InputArrayES3_RKNS_12_OutputArrayE
  32.  libopencv_aruco.so.4.5:_ZN2cv5aruco10Dictionary19getBitsFromByteListERKNS_3MatEi
  33.  libopencv_aruco.so.4.5:_ZN2cv5aruco10Dictionary19getByteListFromBitsERKNS_3MatE
  34. diff --git a/abi_used_libs b/abi_used_libs
  35. index bfc590b..e19ffd7 100644
  36. --- a/abi_used_libs
  37. +++ b/abi_used_libs
  38. @@ -32,7 +32,6 @@ libopenblas.so.0
  39.  libopenjp2.so.7
  40.  libpng16.so.16
  41.  libpthread.so.0
  42. -libpython2.7.so.1.0
  43.  libpython3.7m.so.1.0
  44.  libstdc++.so.6
  45.  libswscale.so.5
  46. diff --git a/abi_used_symbols b/abi_used_symbols
  47. index 92fa135..ce72a1b 100644
  48. --- a/abi_used_symbols
  49. +++ b/abi_used_symbols
  50. @@ -1575,113 +1575,83 @@ libpthread.so.0:pthread_mutex_init
  51.  libpthread.so.0:pthread_mutex_lock
  52.  libpthread.so.0:pthread_mutex_unlock
  53.  libpthread.so.0:pthread_setspecific
  54. -libpython2.7.so.1.0:PyArg_ParseTuple
  55. -libpython2.7.so.1.0:PyArg_ParseTupleAndKeywords
  56. -libpython2.7.so.1.0:PyBool_FromLong
  57. -libpython2.7.so.1.0:PyCFunction_NewEx
  58. -libpython2.7.so.1.0:PyCObject_AsVoidPtr
  59. -libpython2.7.so.1.0:PyCObject_Type
  60. -libpython2.7.so.1.0:PyCallable_Check
  61. -libpython2.7.so.1.0:PyCapsule_GetPointer
  62. -libpython2.7.so.1.0:PyComplex_ImagAsDouble
  63. -libpython2.7.so.1.0:PyComplex_RealAsDouble
  64. -libpython2.7.so.1.0:PyComplex_Type
  65. -libpython2.7.so.1.0:PyDict_New
  66. -libpython2.7.so.1.0:PyDict_Next
  67. -libpython2.7.so.1.0:PyDict_SetItemString
  68. -libpython2.7.so.1.0:PyErr_Clear
  69. -libpython2.7.so.1.0:PyErr_Format
  70. -libpython2.7.so.1.0:PyErr_NewException
  71. -libpython2.7.so.1.0:PyErr_Occurred
  72. -libpython2.7.so.1.0:PyErr_Print
  73. -libpython2.7.so.1.0:PyErr_SetString
  74. -libpython2.7.so.1.0:PyEval_RestoreThread
  75. -libpython2.7.so.1.0:PyEval_SaveThread
  76. -libpython2.7.so.1.0:PyExc_AttributeError
  77. -libpython2.7.so.1.0:PyExc_ImportError
  78. -libpython2.7.so.1.0:PyExc_RuntimeError
  79. -libpython2.7.so.1.0:PyExc_TypeError
  80. -libpython2.7.so.1.0:PyFloat_AsDouble
  81. -libpython2.7.so.1.0:PyFloat_FromDouble
  82. -libpython2.7.so.1.0:PyFloat_Type
  83. -libpython2.7.so.1.0:PyGILState_Ensure
  84. -libpython2.7.so.1.0:PyGILState_Release
  85. -libpython2.7.so.1.0:PyImport_AddModule
  86. -libpython2.7.so.1.0:PyImport_ImportModule
  87. -libpython2.7.so.1.0:PyInt_AsLong
  88. -libpython2.7.so.1.0:PyInt_AsUnsignedLongMask
  89. -libpython2.7.so.1.0:PyInt_FromLong
  90. -libpython2.7.so.1.0:PyList_New
  91. -libpython2.7.so.1.0:PyList_SetItem
  92. -libpython2.7.so.1.0:PyLong_AsDouble
  93. -libpython2.7.so.1.0:PyLong_AsLong
  94. -libpython2.7.so.1.0:PyLong_AsLongLong
  95. -libpython2.7.so.1.0:PyLong_AsUnsignedLong
  96. -libpython2.7.so.1.0:PyLong_FromLong
  97. -libpython2.7.so.1.0:PyLong_FromLongLong
  98. -libpython2.7.so.1.0:PyLong_FromSize_t
  99. -libpython2.7.so.1.0:PyLong_FromUnsignedLong
  100. -libpython2.7.so.1.0:PyLong_FromVoidPtr
  101. -libpython2.7.so.1.0:PyMapping_GetItemString
  102. -libpython2.7.so.1.0:PyMapping_HasKeyString
  103. -libpython2.7.so.1.0:PyModule_AddObject
  104. -libpython2.7.so.1.0:PyObject_Call
  105. -libpython2.7.so.1.0:PyObject_CallMethodObjArgs
  106. -libpython2.7.so.1.0:PyObject_CallObject
  107. -libpython2.7.so.1.0:PyObject_Free
  108. -libpython2.7.so.1.0:PyObject_GetAttrString
  109. -libpython2.7.so.1.0:PyObject_Init
  110. -libpython2.7.so.1.0:PyObject_Malloc
  111. -libpython2.7.so.1.0:PyObject_Size
  112. -libpython2.7.so.1.0:PySequence_Check
  113. -libpython2.7.so.1.0:PySequence_GetItem
  114. -libpython2.7.so.1.0:PySequence_Size
  115. -libpython2.7.so.1.0:PyString_AsString
  116. -libpython2.7.so.1.0:PyString_FromString
  117. -libpython2.7.so.1.0:PyTuple_GetItem
  118. -libpython2.7.so.1.0:PyTuple_New
  119. -libpython2.7.so.1.0:PyTuple_SetItem
  120. -libpython2.7.so.1.0:PyTuple_Size
  121. -libpython2.7.so.1.0:PyType_GenericAlloc
  122. -libpython2.7.so.1.0:PyType_GenericNew
  123. -libpython2.7.so.1.0:PyType_IsSubtype
  124. -libpython2.7.so.1.0:PyType_Ready
  125. -libpython2.7.so.1.0:PyType_Type
  126. -libpython2.7.so.1.0:PyUnicodeUCS4_AsUTF8String
  127. -libpython2.7.so.1.0:Py_BuildValue
  128. -libpython2.7.so.1.0:Py_InitModule4_64
  129. -libpython2.7.so.1.0:_Py_NoneStruct
  130. -libpython2.7.so.1.0:_Py_TrueStruct
  131.  libpython3.7m.so.1.0:PyArg_ParseTuple
  132. +libpython3.7m.so.1.0:PyArg_ParseTupleAndKeywords
  133. +libpython3.7m.so.1.0:PyBool_FromLong
  134.  libpython3.7m.so.1.0:PyBool_Type
  135.  libpython3.7m.so.1.0:PyBytes_AsString
  136. +libpython3.7m.so.1.0:PyCFunction_NewEx
  137. +libpython3.7m.so.1.0:PyCallable_Check
  138. +libpython3.7m.so.1.0:PyCapsule_GetPointer
  139.  libpython3.7m.so.1.0:PyCapsule_Type
  140. +libpython3.7m.so.1.0:PyComplex_ImagAsDouble
  141.  libpython3.7m.so.1.0:PyComplex_RealAsDouble
  142. +libpython3.7m.so.1.0:PyComplex_Type
  143.  libpython3.7m.so.1.0:PyDict_GetItemString
  144. +libpython3.7m.so.1.0:PyDict_New
  145.  libpython3.7m.so.1.0:PyDict_Next
  146. +libpython3.7m.so.1.0:PyDict_SetItemString
  147. +libpython3.7m.so.1.0:PyErr_Clear
  148. +libpython3.7m.so.1.0:PyErr_Format
  149. +libpython3.7m.so.1.0:PyErr_NewException
  150. +libpython3.7m.so.1.0:PyErr_Occurred
  151.  libpython3.7m.so.1.0:PyErr_Print
  152. +libpython3.7m.so.1.0:PyErr_SetString
  153. +libpython3.7m.so.1.0:PyEval_RestoreThread
  154.  libpython3.7m.so.1.0:PyEval_SaveThread
  155.  libpython3.7m.so.1.0:PyExc_AttributeError
  156.  libpython3.7m.so.1.0:PyExc_ImportError
  157. +libpython3.7m.so.1.0:PyExc_RuntimeError
  158. +libpython3.7m.so.1.0:PyExc_TypeError
  159.  libpython3.7m.so.1.0:PyFloat_AsDouble
  160. +libpython3.7m.so.1.0:PyFloat_FromDouble
  161. +libpython3.7m.so.1.0:PyFloat_Type
  162. +libpython3.7m.so.1.0:PyGILState_Ensure
  163. +libpython3.7m.so.1.0:PyGILState_Release
  164.  libpython3.7m.so.1.0:PyImport_AddModule
  165. +libpython3.7m.so.1.0:PyImport_ImportModule
  166. +libpython3.7m.so.1.0:PyList_New
  167. +libpython3.7m.so.1.0:PyList_SetItem
  168. +libpython3.7m.so.1.0:PyLong_AsDouble
  169.  libpython3.7m.so.1.0:PyLong_AsLong
  170. +libpython3.7m.so.1.0:PyLong_AsLongLong
  171.  libpython3.7m.so.1.0:PyLong_AsSize_t
  172. +libpython3.7m.so.1.0:PyLong_FromLong
  173.  libpython3.7m.so.1.0:PyLong_FromLongLong
  174. +libpython3.7m.so.1.0:PyLong_FromSize_t
  175. +libpython3.7m.so.1.0:PyLong_FromUnsignedLong
  176. +libpython3.7m.so.1.0:PyLong_FromVoidPtr
  177. +libpython3.7m.so.1.0:PyMapping_GetItemString
  178.  libpython3.7m.so.1.0:PyMapping_HasKeyString
  179. +libpython3.7m.so.1.0:PyModule_AddObject
  180.  libpython3.7m.so.1.0:PyModule_Create2
  181.  libpython3.7m.so.1.0:PyModule_GetDict
  182. +libpython3.7m.so.1.0:PyObject_Call
  183.  libpython3.7m.so.1.0:PyObject_CallMethodObjArgs
  184. +libpython3.7m.so.1.0:PyObject_CallObject
  185. +libpython3.7m.so.1.0:PyObject_Free
  186.  libpython3.7m.so.1.0:PyObject_GetAttrString
  187. +libpython3.7m.so.1.0:PyObject_Init
  188. +libpython3.7m.so.1.0:PyObject_Malloc
  189.  libpython3.7m.so.1.0:PyObject_SetAttrString
  190.  libpython3.7m.so.1.0:PyObject_Size
  191.  libpython3.7m.so.1.0:PySequence_Check
  192. +libpython3.7m.so.1.0:PySequence_GetItem
  193. +libpython3.7m.so.1.0:PySequence_Size
  194.  libpython3.7m.so.1.0:PyTuple_GetItem
  195. +libpython3.7m.so.1.0:PyTuple_New
  196. +libpython3.7m.so.1.0:PyTuple_SetItem
  197. +libpython3.7m.so.1.0:PyTuple_Size
  198. +libpython3.7m.so.1.0:PyType_GenericAlloc
  199. +libpython3.7m.so.1.0:PyType_GenericNew
  200.  libpython3.7m.so.1.0:PyType_IsSubtype
  201.  libpython3.7m.so.1.0:PyType_Ready
  202.  libpython3.7m.so.1.0:PyType_Type
  203.  libpython3.7m.so.1.0:PyUnicode_AsUTF8String
  204.  libpython3.7m.so.1.0:PyUnicode_FromString
  205. +libpython3.7m.so.1.0:Py_BuildValue
  206. +libpython3.7m.so.1.0:_Py_NoneStruct
  207. +libpython3.7m.so.1.0:_Py_TrueStruct
  208.  libstdc++.so.6:_ZNKSt12__basic_fileIcE7is_openEv
  209.  libstdc++.so.6:_ZNKSt5ctypeIcE13_M_widen_initEv
  210.  libstdc++.so.6:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12find_last_ofEPKcmm
  211. diff --git a/package.yml b/package.yml
  212. index 0c73191..e42bfe7 100644
  213. --- a/package.yml
  214. +++ b/package.yml
  215. @@ -74,7 +74,8 @@ setup      : |
  216.          -DOPENCV_ENABLE_NONFREE=ON \
  217.          -DWITH_QT=ON \
  218.          -DOPENCV_FORCE_PYTHON_LIBS=ON \
  219. -        -DENABLE_PRECOMPILED_HEADERS=OFF
  220. +        -DENABLE_PRECOMPILED_HEADERS=OFF \
  221. +        -DBUILD_opencv_python2=OFF
  222.  build      : |
  223.      %ninja_build
  224.  install    : |
  225. diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
  226. index 4b95396..7805ca7 100644
  227. --- a/pspec_x86_64.xml
  228. +++ b/pspec_x86_64.xml
  229. @@ -2,8 +2,8 @@
  230.      <Source>
  231.          <Name>opencv</Name>
  232.          <Packager>
  233. -            <Name>Martin Reboredo</Name>
  234. -            <Email>yakoyoku@gmail.com</Email>
  235. +            <Name>Algent Albrahimi</Name>
  236. +            <Email>algent@protonmail.com</Email>
  237.          </Packager>
  238.          <License>BSD-3-Clause</License>
  239.          <License>EULA</License>
  240. @@ -26,12 +26,6 @@
  241.              <Path fileType="executable">/usr/bin/opencv_visualisation</Path>
  242.              <Path fileType="executable">/usr/bin/opencv_waldboost_detector</Path>
  243.              <Path fileType="executable">/usr/bin/setup_vars_opencv4.sh</Path>
  244. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/__init__.py</Path>
  245. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/config-2.7.py</Path>
  246. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/config.py</Path>
  247. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/load_config_py2.py</Path>
  248. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/load_config_py3.py</Path>
  249. -            <Path fileType="library">/usr/lib/python2.7/site-packages/cv2/python-2.7/cv2.so</Path>
  250.              <Path fileType="library">/usr/lib/python3.7/site-packages/cv2/__init__.py</Path>
  251.              <Path fileType="library">/usr/lib/python3.7/site-packages/cv2/config-3.7.py</Path>
  252.              <Path fileType="library">/usr/lib/python3.7/site-packages/cv2/config.py</Path>
  253. @@ -771,11 +765,11 @@
  254.      </Package>
  255.      <History>
  256.          <Update release="26">
  257. -            <Date>2021-02-27</Date>
  258. +            <Date>2021-03-19</Date>
  259.              <Version>4.5.1</Version>
  260.              <Comment>Packaging update</Comment>
  261. -            <Name>Martin Reboredo</Name>
  262. -            <Email>yakoyoku@gmail.com</Email>
  263. +            <Name>Algent Albrahimi</Name>
  264. +            <Email>algent@protonmail.com</Email>
  265.          </Update>
  266.      </History>
  267. -</PISI>
  268. +</PISI>
  269. \ No newline at end of file
Add Comment
Please, Sign In to add comment