Native binaries (libmysqlclient, vtk, vtk6) still build with `cmake`
instead of the cmake wrapper. Note that even in these cases MXE's cmake
is used (not system cmake), because $(PREFIX)/$(BUILD)/bin is added to
PATH by Makefile and MXE's cmake binary exists there.
The following script was applied:
sed ':a;/part of MXE.$/{N;s/\n//;ba}' -i $(git grep -l 'part of MXE')
sed 's/\(part of MXE\).*\(See index.html\)/\1. \2/' -i \
$(git grep -l 'part of MXE.*See index.html')
before='This file is part of MXE. See index.html for further information.'
after='This file is part of MXE. See LICENSE.md for licensing information.'
sed "s/$before/$after/" -i $(git grep -l 'part of MXE')
Then git grep 'index.html for further information' revealed two other files.
One of them was patched manually (patch.mk). Makefile has text
"See index.html for further information" unrelated to licensing.
See https://github.com/mxe/mxe/issues/1500#issuecomment-241340792
Tested with x86_64-w64-mingw32.static and x86_64-w64-mingw32.shared.
Cherrypicks an upstream commit that cleanups the pkg-config file.
Also removes the version postfix on Windows dll's (matching other platforms).
These changes allows us to easilly support shared builds.
Removing the postfix avoids breaking programs that only link
to a subset of opencv modules, everytime a new version is released.
It should be noted that OpenCV forces static linking of libopencv_ts.
There are also 3 files that are left at usr/<triplet>/ that this commit does not
attempt to fix (LICENSE, OpenCVConfig.cmake and OpenCVConfig-version.cmake).
They cannot be moved to lib/ because a different OpenCVConfig.cmake is placed
there. On Ubuntu, for example, those cmake files are in /usr/share/OpenCV/.
I intentionally didn't merge this when merging stable, but seems like this
fix is necessary for master too.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Most of the automatic conversion was done using the following Python script:
import os
import re
pkgs = sorted(mkfile[:-len('.mk')] for mkfile in os.listdir('src') if mkfile.endswith('.mk'))
with open('index.html', 'rb') as f:
index = f.read()
pkgs_index = re.findall('<td class="package">([^<]*)</td>', index)
assert pkgs_index == pkgs
versions = dict(re.findall('<td id="([^"]*)-version">([^<]*)</td>', index))
assert sorted(versions.keys()) == pkgs
for pkg in pkgs:
version = versions[pkg]
with open('src/' + pkg + '.mk', 'rb') as f:
mk = f.read()
checksumpos = mk.index('\n$(PKG)_CHECKSUM ')
versionline = '\n$(PKG)_VERSION := %(version)s' % {'version': version}
newmk = mk[:checksumpos] + versionline + mk[checksumpos:]
with open('src/' + pkg + '.mk', 'wb') as f:
f.write(newmk)
OpenCV (Open Source Computer Vision Library) is an open source computer vision and machine learning software library.
See more: http://opencv.org/about.html
Boris Pek
Mark Brand
Tony Theodore
Viktor Szakats
Boris Nagaev
Gregorio Litenstein
Sérgio Faria
Timothy Gu
Andrew Hankins
Volker Grabsch
Luis Saavedra