8000 remove opencv patches for now · programersibuhuan/opencv-python@deafb67 · GitHub
[go: up one dir, main page]
Skip to content

Commit deafb67

Browse files
skvarkskvark
committed
remove opencv patches for now
1 parent bf58f7a commit deafb67

File tree

6 files changed

+8
-138
lines changed

6 files changed

+8
-138
lines changed

‎config.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ function pre_build {
4040
echo '-----------------'
4141
else
4242
echo "Running for linux"
43-
export LDFLAGS="-Wl,--no-as-needed -Wl,--no-undefined ${LDFLAGS}"
4443
fi
4544
qmake -query
4645
}

‎docker/Dockerfile_i686

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM quay.io/pypa/manylinux1_i686:latest
22

3-
RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
3+
RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
44
tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
55
cd qt-everywhere* && \
6-
./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
7-
gmake && \
6+
./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
7+
gmake -j5 && \
88
gmake install && \
99
cd .. && \
1010
rm -rf qt-everywhere-opensource-src-4.8.7 && \
@@ -13,7 +13,7 @@ RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/
1313
ENV QTDIR /opt/Qt4.8.7
1414
ENV PATH "$QTDIR/bin:$PATH"
1515

16-
RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
16+
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
1717
tar -zxf cmake-3.9.0.tar.gz && \
1818
cd cmake-3.9.0 && \
1919
yum -y install curl-devel zlib-devel && \

‎docker/Dockerfile_x86_64

Lines changed: 4 additions & 4 deletions

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM quay.io/pypa/manylinux1_x86_64:latest
22

3-
RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
3+
RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
44
tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
55
cd qt-everywhere* && \
6-
./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
7-
gmake && \
6+
./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
7+
gmake -j5 && \
88
gmake install && \
99
cd .. && \
1010
rm -rf qt-everywhere-opensource-src-4.8.7 && \
@@ -13,7 +13,7 @@ RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/
1313
ENV QTDIR /opt/Qt4.8.7
1414
ENV PATH "$QTDIR/bin:$PATH"
1515
16-
RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
16+
RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
1717
tar -zxf cmake-3.9.0.tar.gz && \
1818
cd cmake-3.9.0 && \
1919
yum -y install curl-devel zlib-devel && \

‎patches/patch1.patch

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎patches/patch2.patch

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ def main():
109109
# OS-specific components
110110
if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
111111
cmake_args.append("-DWITH_QT=4")
112-
# Apply Qt namespace patches to OpenCV GUI code
113-
subprocess.check_call("patch -p0 < patches/patch1.patch", shell=True)
114-
subprocess.check_call("patch -p0 < patches/patch2.patch", shell=True)
115112

116113
if build_headless:
117114
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless

0 commit comments

Comments
 (0)
0