File tree Expand file tree Collapse file tree 3 files changed +33
-5
lines changed
Expand file tree Collapse file tree 3 files changed +33
-5
lines changed Original file line number Diff line number Diff line change 11FROM quay.io/pypa/manylinux2014_i686:latest
22
3- RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel blas-devel lapack-devel atlas-devel -y
3+ RUN yum install freetype-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel bzip2-devel curl-devel blas-devel lapack-devel atlas-devel -y
4+
5+ RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6+ tar -xf qt-everywhere-src-5.15.0.tar.xz && \
7+ cd qt-everywhere* && \
8+ export MAKEFLAGS=-j$(nproc) && \
9+ # OpenCV only links against QtCore, QtGui, QtTest
10+ ./configure -prefix /opt/Qt5.15.0 -release -opensource -confirm-license -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
11+ make && \
12+ make install && \
13+ cd .. && \
14+ rm -rf qt-everywhere-src-5.15.0 && \
15+ rm qt-everywhere-src-5.15.0.tar.xz
16+
17+ ENV QTDIR /opt/Qt5.15.0
18+ ENV PATH "$QTDIR/bin:$PATH"
419
520RUN mkdir ~/ffmpeg_sources && \
621 cd ~/ffmpeg_sources && \
Original file line number Diff line number Diff line change 11FROM quay.io/pypa/manylinux2014_x86_64:latest
22
3- RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel blas-devel lapack-devel atlas-devel -y
3+ RUN yum install freetype-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel bzip2-devel curl-devel blas-devel lapack-devel atlas-devel -y
4+
5+ RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6+ tar -xf qt-everywhere-src-5.15.0.tar.xz && \
7+ cd qt-everywhere* && \
8+ export MAKEFLAGS=-j$(nproc) && \
9+ # OpenCV only links against QtCore, QtGui, QtTest
10+ ./configure -prefix /opt/Qt5.15.0 -release -opensource -confirm-license -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
11+ make && \
12+ make install && \
13+ cd .. && \
14+ rm -rf qt-everywhere-src-5.15.0 && \
15+ rm qt-everywhere-src-5.15.0.tar.xz
16+
17+ ENV QTDIR /opt/Qt5.15.0
18+ ENV PATH "$QTDIR/bin:$PATH"
419
520RUN mkdir ~/ffmpeg_sources && \
621 cd ~/ffmpeg_sources && \
Original file line number Diff line number Diff line change 1- Submodule opencv contains untracked content
2- Submodule opencv contains modified content
31diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
42index 4c0b3880fc..54da25f151 100644
53--- a/opencv/CMakeLists.txt
@@ -12,7 +10,7 @@ index 4c0b3880fc..54da25f151 100644
1210+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
1311+ endif()
1412+ if(UNIX AND NOT APPLE)
15- + install(DIRECTORY ${Qt5_DIR}/../../qt5 /plugins DESTINATION lib/qt)
13+ + install(DIRECTORY /opt/Qt5.15.0 /plugins DESTINATION lib/qt)
1614+ endif()
1715 elseif(HAVE_QT)
1816 status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
You can’t perform that action at this time.
0 commit comments