#21 add WeChat QRCode
Merged 2 years ago by sergiomb. Opened 2 years ago by sergiomb.
Unknown source rawhide  into  rawhide

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

  face_landmark_model.dat.xz

  /b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip

  /fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip

+ /wechat-20230712.git3487ef7.tar.gz

file modified
+11 -1
@@ -91,6 +91,10 @@

  # 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

+ %global wechat_commit 3487ef7cde71d93c6a01bb0b84aa0f22c6128f6b

+ %global wechat_shortcommit %(c=%{wechat_commit}; echo ${c:0:7})

+ %global wechat_gitdate 20230712

+ Source6:        https://github.com/WeChatCV/opencv_3rdparty/archive/%{wechat_commit}/wechat-%{wechat_gitdate}.git%{wechat_shortcommit}.tar.gz

  

  Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch

  Patch3:         opencv.python.patch
@@ -276,7 +280,7 @@

  %prep

  # autosetup doesn't work with 2 sources

  # https://github.com/rpm-software-management/rpm/issues/1204

- %setup -q -a1 %{?with_extras_tests:-a2}

+ %setup -q -a1 %{?with_extras_tests:-a2} -a6

  

  # we don't use pre-built contribs except quirc

  pushd 3rdparty
@@ -300,6 +304,11 @@

    xz -d face_landmark_model.dat.xz

    mv face_landmark_model.dat 7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat

  popd

+ mkdir -p .cache/wechat_qrcode

+ mv opencv_3rdparty-%{wechat_commit}/detect.caffemodel .cache/wechat_qrcode/238e2b2d6f3c18d6c3a30de0c31e23cf-detect.caffemodel

+ mv opencv_3rdparty-%{wechat_commit}/detect.prototxt .cache/wechat_qrcode/6fb4976b32695f9f5c6305c19f12537d-detect.prototxt

+ mv opencv_3rdparty-%{wechat_commit}/sr.caffemodel .cache/wechat_qrcode/cbfcd60361a73beb8c583eea7e8e6664-sr.caffemodel

+ mv opencv_3rdparty-%{wechat_commit}/sr.prototxt .cache/wechat_qrcode/69db99927a70df953b471daaba03fbef-sr.prototxt

  

  # Install ADE, needed for opencv_gapi

  mkdir -p .cache/ade
@@ -518,6 +527,7 @@

  - Update opencv to 4.8.0

  - Use bundle flatbuffers, tried build with flatbuffers from system but doesn't build

  - Use oneVPL instead libmfx

+ - Add WeChat QRCode

  

  * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-15

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

file modified
+1
@@ -2,3 +2,4 @@

  SHA512 (opencv_contrib-clean-4.8.0.tar.gz) = decd6830c533014c0da7162dfaca18ef22a0cd2d10554c3f572c312cf3e76e45666ff5c6e10a4860d4bd4eaf73a1dfc8c8a4e76f49188a19d3de89019a15df3b

  SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307

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

+ SHA512 (wechat-20230712.git3487ef7.tar.gz) = bc4f220465de41df8af0cb35312c1db155976d05f13a60e43c1798b161d8f56388e34a59108fb3e27e8c97b53acfd198256d9ae420b5f70a32ddc1ea65c3c8a6

CNN models for wechat_qrcode module, including the detector model and the super scale model.

https://github.com/WeChatCV/opencv_3rdparty

the WeChatCV project added code in opencv_contrib

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto b8f847f81d8aeb1716d28af4bf3c822e661dc2cb

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

rebased onto 821068ce2815a4a0dd5defea4d01f4a160990f2d

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Can you please:
- Use the full URL for the models in the spec file
- Ask upstream (dddzg) to clarify about the license of the models.

full path is in comments https://src.fedoraproject.org/rpms/opencv/pull-request/21#_2__5
after wget the content we apply xz , so we can't use the full URL for models

rebased onto 279dd21a4c11c5d60432ae84711b9fc959fe6149

2 years ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/0b3f18cd9a4144e3baf380783c73c6ce

rebased onto a34f5271d8c8db20bf6e0b959209117b7c4aa03f

2 years 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/db27847783c34f7dad28788a22df82cf

full path is in comments https://src.fedoraproject.org/rpms/opencv/pull-request/21#_2__5
after wget the content we apply xz , so we can't use the full URL for models

You should use a single archive as tar.gz with commit-id https://github.com/WeChatCV/opencv_3rdparty

ok good point.

Do you think we can add it to Fedora ? in legal point of view

rebased onto 534aee1

2 years 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/a2dbef92ff5c4951ba410bcb390ad687

4 hours ago they add the License
https://github.com/WeChatCV/opencv_3rdparty/blob/wechat_qrcode/LICENSE
Now I feel comfortable to add this to the package

rebased onto f2ccfdd2b855d92881c6f65e4d3bd4955446721d

2 years 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/78af36d1c06a4de19ea690dbdf757d10

rebased onto 871a1959b6d127c76da62a3553ceb702e79e9041

2 years ago

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging src.fedoraproject.org/rpms/opencv for 21,337a1782fc4d49e080c0349978bfbde9d5bc22bf

rebased onto 06c4df6

2 years ago

Pull-Request has been merged by sergiomb

2 years 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/68e9fb03c7e94ce2906ed108a3cdee5e