Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opencv: 3.3.1 -> 3.4.0 #33225

Merged
merged 13 commits into from Jan 11, 2018
Merged

opencv: 3.3.1 -> 3.4.0 #33225

merged 13 commits into from Jan 11, 2018

Conversation

basvandijk
Copy link
Member

@basvandijk basvandijk commented Dec 31, 2017

Motivation for this change

https://github.com/opencv/opencv/wiki/ChangeLog#version34

The upgraded ogre-1.10.10 is a dependency of the optional ovis module of opencv-3.4.0.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@orivej
Copy link
Contributor

orivej commented Dec 31, 2017

Please fix build of ogrepaged.

@basvandijk
Copy link
Member Author

@orivej thanks for the heads-up, I should've checked that. I've patched ogrepaged to build with ogre-1.10.

@orivej
Copy link
Contributor

orivej commented Dec 31, 2017

Thanks! Could you also fix the build of mygui with ogre: nix-build -E '(import ./. { }).mygui.override { withOgre = true; }'). (It is needed by rigsofrods and stuntrally.)

@basvandijk
Copy link
Member Author

I pushed a few other fixes. Looking at mygui now...

@basvandijk
Copy link
Member Author

@orivej I kept the old ogre-1.9 around so that mygui, rigsofrods and stuntrally keep building.

@basvandijk basvandijk force-pushed the opencv-3.4.0 branch 3 times, most recently from d04c1c6 to 559e223 Compare January 1, 2018 11:51
Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added fixes for opendungeons and rigsofrods, this seems ready now.

Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not ready yet because it breaks digikam:

[ 68%] Linking CXX shared library libdigikamgui.so                                                                                               
../libs/facesengine/CMakeFiles/digikamfacesenginedatabase_src.dir/recognition-opencv-lbph/opencvlbphfacerecognizer.cpp.o: In function `Digikam::O
penCVLBPHFaceRecognizer::recognize(cv::Mat const&)':                                                                                             
opencvlbphfacerecognizer.cpp:(.text+0x181): undefined reference to `cv::face::FaceRecognizer::predict(cv::_InputArray const&, int&, double&) cons
t'                                                                                                                                               
../libs/facesengine/CMakeFiles/digikamfacesenginedatabase_src.dir/recognition-opencv-lbph/facerec_borrowed.cpp.o: In function `Digikam::LBPHFaceR
ecognizer::create(int, int, int, int, double, Digikam::LBPHFaceRecognizer::PredictionStatistics)':                                               
facerec_borrowed.cpp:(.text+0x6399): undefined reference to `vtable for cv::face::FaceRecognizer'                                                
facerec_borrowed.cpp:(.text+0x6551): undefined reference to `vtable for cv::face::FaceRecognizer'                                                

@basvandijk
Copy link
Member Author

@orivej thanks for the fixes and the heads-up for digikam.

Fortunately digikam released version 5.8.0 a few hours ago with support for opencv-3.4.0. I pushed an upgrade patch.

@basvandijk
Copy link
Member Author

Note that nix-shell -p nox --run "nox-review pr 33225" now returns successfully.

@orivej orivej merged commit 2f6b885 into NixOS:master Jan 11, 2018
@orivej
Copy link
Contributor

orivej commented Jan 11, 2018

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants