#22 Disable temporarily -Wp,-D_GLIBCXX_ASSERTIONS as requested on bug #2190013
Closed 10 months ago by sergiomb. Opened a year ago by sergiomb.
rpms/ sergiomb/opencv rawhide  into  rawhide

file modified
+4
@@ -3,3 +3,7 @@ 

  face_landmark_model.dat.xz

  /b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip

  /fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip

+ /detect.caffemodel.xz

+ /detect.prototxt.xz

+ /sr.caffemodel.xz

+ /sr.prototxt.xz

file modified
+19 -1
@@ -95,6 +95,12 @@ 

  # mv v0.1.2a.zip $(md5sum v0.1.2a.zip | cut -d' ' -f1)-v0.1.2a.zip

  Source4:        fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip

  Source5:        xorg.conf

+ # from https://github.com/WeChatCV/opencv_3rdparty/tree/4f9044621eb268543421d967cf9a497315540682

+ # wget https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.prototxt

+ Source6:        detect.caffemodel.xz

+ Source7:        detect.prototxt.xz

+ Source8:        sr.caffemodel.xz

+ Source9:        sr.prototxt.xz

  

  Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch

  Patch3:         opencv.python.patch
@@ -302,11 +308,23 @@ 

  

  # Install face_landmark_model

  mkdir -p .cache/data

- install -pm 0644 %{SOURCE3} .cache/data

+ install -pm 0644 %{S:3} .cache/data

  pushd .cache/data

    xz -d face_landmark_model.dat.xz

    mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat

  popd

+ mkdir -p .cache/wechat_qrcode

+ install -pm 0644 %{S:6} %{S:7} %{S:8} %{S:9} .cache/wechat_qrcode

+ pushd .cache/wechat_qrcode

+   xz -d detect.caffemodel.xz

+   mv detect.caffemodel 238e2b2d6f3c18d6c3a30de0c31e23cf-detect.caffemodel

+   xz -d detect.prototxt.xz

+   mv detect.prototxt 6fb4976b32695f9f5c6305c19f12537d-detect.prototxt

+   xz -d sr.caffemodel.xz

+   mv sr.caffemodel cbfcd60361a73beb8c583eea7e8e6664-sr.caffemodel

+   xz -d sr.prototxt.xz

+   mv sr.prototxt 69db99927a70df953b471daaba03fbef-sr.prototxt

+ popd

  

  # Install ADE, needed for opencv_gapi

  mkdir -p .cache/ade

file modified
+5 -1
@@ -1,5 +1,9 @@ 

+ SHA512 (detect.caffemodel.xz) = 66b65df4dbba264b5601e47b92e55e4327e5bf949767347cbe1aaca95f213a6131a88dcb264baf2cec5517df966ef130887cbfe98275092fdc5e4e08eb949a3b

+ SHA512 (detect.prototxt.xz) = d462ec65b255db0381d1fc4e682e202900f07331b04f66e3a2c780d8479c878ed3b52486a051eb07902bc89520da228e8e59b826ada9a779666ce38762f8d221

+ SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307

+ SHA512 (sr.caffemodel.xz) = a4527084e0513a655d6e9f1b55e32e639d14e42c3b0d490414ea159746531c886ccbada0641077263ca61241a67b52c85c44b48cdc40581dfa49ed0b72623948

+ SHA512 (sr.prototxt.xz) = 64b233ab6e07871d51d4bd34f31eedf5951d4df7f5104ceba80156b29455a27f9960241f840b1155b3447584e88772068db3001b702bcde6dfa249f1e7cd5756

  SHA512 (opencv-clean-4.7.0.tar.gz) = 75d33e006f5a00d6eda67076b368bbf7afa7cc2c31b843040f2df54246a978f055c12902ce7a8095cf0ce493a9ebedcbfb12b1e772ed688ef49bc8cb4ce9e57e

  SHA512 (opencv_contrib-clean-4.7.0.tar.gz) = 5eb985d258afa17e50426e19a0172b14036082e7e3b93e05de43734af470edf45db3fabb0eb7a440aa95e9c87f9e94ef4bec19f629f2048ff08a75a01e787608

  SHA512 (opencv_extra-clean-4.7.0.tar.gz) = a2ac18661b7709269b5efc6405080c2df4195b6a0d9e6fa011789f7217fbde90b4c832bafa243e2c6cccfd8fa06fe976e33b7f3f56fd40ab40cbf360c18dbbe1

- SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307

  SHA512 (fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip) = ce5af0bd5d7fb04022f92fed130898959aecb954cc09da2fc923c76b37ee92d2233888592a4c6bca8006ac4d3fda9c6da80f316c924a407a7a5961d9832a681c

Kwizart, fine for you ?

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/23168fb353804d37a82b82c500657b8f

rebased onto a34f527

10 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/8a9c1fe3a8834eb3b9c7cdacf33d6d42

Closing as it's a duplicate for #21

rebased onto 534aee1

10 months ago

Pull-Request has been closed by sergiomb

10 months ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/3a76d78520884e5299b50573d7d065e2