From 6a90843f0483409ea77a4be14299b6bc8d858d16 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Tue, 6 Aug 2019 20:39:13 +0300 Subject: [PATCH 1/2] Including a custom libjpeg is no longer needed Since https://github.com/opencv/opencv/pull/11497, OpenCV bundles its own --- setup.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/setup.py b/setup.py index 65322dbc..e5d43a34 100644 --- a/setup.py +++ b/setup.py @@ -133,13 +133,6 @@ def main(): cmake_args.append("-DWITH_V4L=ON") cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF") - 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'] - ] - # Fixes for macOS builds if sys.platform == 'darwin': cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see From 43ebd7e8950a9ebbe3a45db2aad31ab27a7220b7 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Thu, 8 Aug 2019 14:06:38 +0300 Subject: [PATCH 2/2] (dummy commit to trigger rebuild)