-
Notifications
You must be signed in to change notification settings - Fork 0
Cleanup r1 #4
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
Cleanup r1 #4
Conversation
git install fails in i686, too
* rm it after library build
and the separate's onre buid fails dueto expired certificate at https://kent.dl.sourceforge.net
@native-api Thanks so much for this, but we need some additional changes as you remove |
No need for changes. The build logic will detect that relevant envvars are no longer present and use the one bundled with OpenCV. |
I deleted libjpeg-turbo from dockerfile because it was failing the build, see commit message. |
@native-api Change this part here from if all(v in os.environ for v in ('JPEG_INCLUDE_DIR', 'JPEG_LIBRARY')):
cmake_args += [
"-DBUILD_JPEG=OFF",
"-DJPEG_INCLUDE_DIR=%s" % os.environ['JPEG_INCLUDE_DIR'],
"-DJPEG_LIBRARY=%s" % os.environ['JPEG_LIBRARY']
] to cmake_args += ["-DBUILD_JPEG=ON"] Or simply just remove it entirely, as |
@native-api This change is very important as build will fail if no jpeg libs are found. |
if all(v in os.environ for v in ('JPEG_INCLUDE_DIR', 'JPEG_LIBRARY')): this ensures that a custom JPEG library is only used if |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
As it is now, the bundled jpeg-turbo is already used, I checked:
|
If you can't understand why there's no problem due to #4 (comment) , just trust me on this. |
@native-api ooh, I misread that comment. My apologies. I'll merge it. |
This fixes and cleans up dockerfiles.
Let's get this over with.