remove opencv patches for now

opencv · Jul 14, 2018 · deafb67 · deafb67
1 parent bf58f7a
commit deafb67
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 138 deletions.
diff --git a/config.sh b/config.sh
@@ -40,7 +40,6 @@ function pre_build {
     echo '-----------------'
   else
     echo "Running for linux"
-    export LDFLAGS="-Wl,--no-as-needed -Wl,--no-undefined ${LDFLAGS}"
   fi
   qmake -query
 }

diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686
@@ -1,10 +1,10 @@
 FROM quay.io/pypa/manylinux1_i686:latest
 
-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 && \
+RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
 	tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
 	cd qt-everywhere* && \
-	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
-	gmake && \
+	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
+	gmake -j5 && \
 	gmake install && \
 	cd .. && \
 	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/
 ENV QTDIR /opt/Qt4.8.7
 ENV PATH "$QTDIR/bin:$PATH"
 
-RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
+RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
 	tar -zxf cmake-3.9.0.tar.gz && \
 	cd cmake-3.9.0 && \
 	yum -y install curl-devel zlib-devel && \

diff --git a/docker/Dockerfile_x86_64 b/docker/Dockerfile_x86_64
@@ -1,10 +1,10 @@
 FROM quay.io/pypa/manylinux1_x86_64:latest
 
-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 && \
+RUN curl -O -L https://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
 	tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
 	cd qt-everywhere* && \
-	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
-	gmake && \
+	./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
+	gmake -j5 && \
 	gmake install && \
 	cd .. && \
 	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/
 ENV QTDIR /opt/Qt4.8.7
 ENV PATH "$QTDIR/bin:$PATH"
 
-RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
+RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
 	tar -zxf cmake-3.9.0.tar.gz && \
 	cd cmake-3.9.0 && \
 	yum -y install curl-devel zlib-devel && \

diff --git a/patches/patch1.patch b/patches/patch1.patch
diff --git a/patches/patch2.patch b/patches/patch2.patch
diff --git a/setup.py b/setup.py
@@ -109,9 +109,6 @@ def main():
     # OS-specific components
     if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
         cmake_args.append("-DWITH_QT=4")
-        # Apply Qt namespace patches to OpenCV GUI code
-        subprocess.check_call("patch -p0 < patches/patch1.patch", shell=True)
-        subprocess.check_call("patch -p0 < patches/patch2.patch", shell=True)
 
     if build_headless:
         # it seems that cocoa cannot be disabled so on macOS the package is not truly headless