From afafacabbbfe613f37ca896f3f939a6d04f0845d Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 30 Aug 2020 18:23:23 -0700 Subject: [PATCH] Remove opencv from phonelibs (#2107) * remove opencv from phonelibs * clean that up too old-commit-hash: 63436373d22566a13f4f6afbcb4acb742227d09d --- SConstruct | 1 - phonelibs/opencv/include/opencv2/core/affine.hpp | 3 --- phonelibs/opencv/include/opencv2/core/core.hpp | 3 --- phonelibs/opencv/include/opencv2/core/core_c.h | 3 --- phonelibs/opencv/include/opencv2/core/cuda_devptrs.hpp | 3 --- phonelibs/opencv/include/opencv2/core/devmem2d.hpp | 3 --- phonelibs/opencv/include/opencv2/core/eigen.hpp | 3 --- phonelibs/opencv/include/opencv2/core/gpumat.hpp | 3 --- phonelibs/opencv/include/opencv2/core/internal.hpp | 3 --- phonelibs/opencv/include/opencv2/core/mat.hpp | 3 --- phonelibs/opencv/include/opencv2/core/opengl_interop.hpp | 3 --- .../opencv/include/opencv2/core/opengl_interop_deprecated.hpp | 3 --- phonelibs/opencv/include/opencv2/core/operations.hpp | 3 --- phonelibs/opencv/include/opencv2/core/types_c.h | 3 --- phonelibs/opencv/include/opencv2/core/version.hpp | 3 --- phonelibs/opencv/include/opencv2/core/wimage.hpp | 3 --- phonelibs/opencv/include/opencv2/features2d/features2d.hpp | 3 --- phonelibs/opencv/include/opencv2/highgui/cap_ios.h | 3 --- phonelibs/opencv/include/opencv2/highgui/highgui.hpp | 3 --- phonelibs/opencv/include/opencv2/highgui/highgui_c.h | 3 --- phonelibs/opencv/include/opencv2/highgui/ios.h | 3 --- phonelibs/opencv/include/opencv2/imgproc/imgproc.hpp | 3 --- phonelibs/opencv/include/opencv2/imgproc/imgproc_c.h | 3 --- phonelibs/opencv/include/opencv2/imgproc/types_c.h | 3 --- selfdrive/camerad/SConscript | 2 +- 25 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 phonelibs/opencv/include/opencv2/core/affine.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/core.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/core_c.h delete mode 100644 phonelibs/opencv/include/opencv2/core/cuda_devptrs.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/devmem2d.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/eigen.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/gpumat.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/internal.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/mat.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/opengl_interop.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/opengl_interop_deprecated.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/operations.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/types_c.h delete mode 100644 phonelibs/opencv/include/opencv2/core/version.hpp delete mode 100644 phonelibs/opencv/include/opencv2/core/wimage.hpp delete mode 100644 phonelibs/opencv/include/opencv2/features2d/features2d.hpp delete mode 100644 phonelibs/opencv/include/opencv2/highgui/cap_ios.h delete mode 100644 phonelibs/opencv/include/opencv2/highgui/highgui.hpp delete mode 100644 phonelibs/opencv/include/opencv2/highgui/highgui_c.h delete mode 100644 phonelibs/opencv/include/opencv2/highgui/ios.h delete mode 100644 phonelibs/opencv/include/opencv2/imgproc/imgproc.hpp delete mode 100644 phonelibs/opencv/include/opencv2/imgproc/imgproc_c.h delete mode 100644 phonelibs/opencv/include/opencv2/imgproc/types_c.h diff --git a/SConstruct b/SConstruct index 3dffd914ad..9f781309d6 100644 --- a/SConstruct +++ b/SConstruct @@ -143,7 +143,6 @@ env = Environment( "#phonelibs/openmax/include", "#phonelibs/json11", "#phonelibs/curl/include", - #"#phonelibs/opencv/include", # use opencv4 instead "#phonelibs/libgralloc/include", "#phonelibs/android_frameworks_native/include", "#phonelibs/android_hardware_libhardware/include", diff --git a/phonelibs/opencv/include/opencv2/core/affine.hpp b/phonelibs/opencv/include/opencv2/core/affine.hpp deleted file mode 100644 index 1c578e549a..0000000000 --- a/phonelibs/opencv/include/opencv2/core/affine.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dcb8ca33f1f17279f71db2c4ffcece164810209f0c2aedd6d1484ff2615c001 -size 15499 diff --git a/phonelibs/opencv/include/opencv2/core/core.hpp b/phonelibs/opencv/include/opencv2/core/core.hpp deleted file mode 100644 index e1c0cc381f..0000000000 --- a/phonelibs/opencv/include/opencv2/core/core.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9d0aafa1cd8bd807ff43c192a9eeebac808914a7250b2ab6c3ef3d08be32209 -size 191037 diff --git a/phonelibs/opencv/include/opencv2/core/core_c.h b/phonelibs/opencv/include/opencv2/core/core_c.h deleted file mode 100644 index 22fe53705a..0000000000 --- a/phonelibs/opencv/include/opencv2/core/core_c.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2ba37186b55108133822468ccc8790936e54d34c5f10c7178d80485e1249057 -size 78509 diff --git a/phonelibs/opencv/include/opencv2/core/cuda_devptrs.hpp b/phonelibs/opencv/include/opencv2/core/cuda_devptrs.hpp deleted file mode 100644 index f996df19f5..0000000000 --- a/phonelibs/opencv/include/opencv2/core/cuda_devptrs.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:743949eff04459f228871e833b4ab3547a6940af38fdd459b309e9325ec2905f -size 7685 diff --git a/phonelibs/opencv/include/opencv2/core/devmem2d.hpp b/phonelibs/opencv/include/opencv2/core/devmem2d.hpp deleted file mode 100644 index 1525d18378..0000000000 --- a/phonelibs/opencv/include/opencv2/core/devmem2d.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cd642fba2f5971b5df9814e36e0ac8c981b7bbd743622ea840ea358b17b4f10 -size 2198 diff --git a/phonelibs/opencv/include/opencv2/core/eigen.hpp b/phonelibs/opencv/include/opencv2/core/eigen.hpp deleted file mode 100644 index 72b0303e9b..0000000000 --- a/phonelibs/opencv/include/opencv2/core/eigen.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f436da2144aa968e84442556cc069a28d72f9487bb1b33b1ed0412498d179e1 -size 9464 diff --git a/phonelibs/opencv/include/opencv2/core/gpumat.hpp b/phonelibs/opencv/include/opencv2/core/gpumat.hpp deleted file mode 100644 index feddcf3635..0000000000 --- a/phonelibs/opencv/include/opencv2/core/gpumat.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:321a81aa9c601333cec65646599e0e2952c6d0469dd8167a163e55388669dba6 -size 18654 diff --git a/phonelibs/opencv/include/opencv2/core/internal.hpp b/phonelibs/opencv/include/opencv2/core/internal.hpp deleted file mode 100644 index 2944c3b257..0000000000 --- a/phonelibs/opencv/include/opencv2/core/internal.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48c940d234e87220fe1379c5dc8d37647349fc4c9867c51536dac95daa2dfddd -size 34520 diff --git a/phonelibs/opencv/include/opencv2/core/mat.hpp b/phonelibs/opencv/include/opencv2/core/mat.hpp deleted file mode 100644 index d5fb338d94..0000000000 --- a/phonelibs/opencv/include/opencv2/core/mat.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5644c79706bb287afe40fe3461675f217e63db34ca5796858cd02c509a7a3b47 -size 81037 diff --git a/phonelibs/opencv/include/opencv2/core/opengl_interop.hpp b/phonelibs/opencv/include/opencv2/core/opengl_interop.hpp deleted file mode 100644 index a04211b5eb..0000000000 --- a/phonelibs/opencv/include/opencv2/core/opengl_interop.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16f7aa7afa0205a7fe88dd7241081f512b268d93f517360b79155aad31410f0c -size 9346 diff --git a/phonelibs/opencv/include/opencv2/core/opengl_interop_deprecated.hpp b/phonelibs/opencv/include/opencv2/core/opengl_interop_deprecated.hpp deleted file mode 100644 index e1bed9e515..0000000000 --- a/phonelibs/opencv/include/opencv2/core/opengl_interop_deprecated.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bd4088321e12aca447cdfe3c4a57ad8e9fa34095ca3a5f640e42024247b3bed -size 9489 diff --git a/phonelibs/opencv/include/opencv2/core/operations.hpp b/phonelibs/opencv/include/opencv2/core/operations.hpp deleted file mode 100644 index 9afef5aee0..0000000000 --- a/phonelibs/opencv/include/opencv2/core/operations.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31709f70a12894b51eb10847d30f1e0f2f7054175e40f8f1464aa32b96f4122d -size 134393 diff --git a/phonelibs/opencv/include/opencv2/core/types_c.h b/phonelibs/opencv/include/opencv2/core/types_c.h deleted file mode 100644 index b10407a3fb..0000000000 --- a/phonelibs/opencv/include/opencv2/core/types_c.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cedf6c4e05d74dac57a8f251e8f0db314efc5736342c2071253e05f058213e0 -size 58492 diff --git a/phonelibs/opencv/include/opencv2/core/version.hpp b/phonelibs/opencv/include/opencv2/core/version.hpp deleted file mode 100644 index 30dfc2b3b7..0000000000 --- a/phonelibs/opencv/include/opencv2/core/version.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:256db2652272a341bd5f0155eec568b0d5a940223ed7736f4ddbbf69a1e71ac1 -size 3018 diff --git a/phonelibs/opencv/include/opencv2/core/wimage.hpp b/phonelibs/opencv/include/opencv2/core/wimage.hpp deleted file mode 100644 index 8858249ae7..0000000000 --- a/phonelibs/opencv/include/opencv2/core/wimage.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:773e4a6d3668907538b2942f9f732f01097370877b7a34e8a9388fb535e2517c -size 20743 diff --git a/phonelibs/opencv/include/opencv2/features2d/features2d.hpp b/phonelibs/opencv/include/opencv2/features2d/features2d.hpp deleted file mode 100644 index 005ffbf720..0000000000 --- a/phonelibs/opencv/include/opencv2/features2d/features2d.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa211c3f1f7c474556641e023fcc6b83bcfad9e580605457010b9ba1b5798373 -size 62606 diff --git a/phonelibs/opencv/include/opencv2/highgui/cap_ios.h b/phonelibs/opencv/include/opencv2/highgui/cap_ios.h deleted file mode 100644 index 89d59f49b1..0000000000 --- a/phonelibs/opencv/include/opencv2/highgui/cap_ios.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ec0d5584de6806f8c7b90cae34a0e6149e501921cb85dbf3ab91cab90f0f033 -size 5460 diff --git a/phonelibs/opencv/include/opencv2/highgui/highgui.hpp b/phonelibs/opencv/include/opencv2/highgui/highgui.hpp deleted file mode 100644 index db77526047..0000000000 --- a/phonelibs/opencv/include/opencv2/highgui/highgui.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af97d100ead741f447a787cc859ca54190727a5416d971d274a063639d827bd5 -size 9162 diff --git a/phonelibs/opencv/include/opencv2/highgui/highgui_c.h b/phonelibs/opencv/include/opencv2/highgui/highgui_c.h deleted file mode 100644 index 1c1742d43c..0000000000 --- a/phonelibs/opencv/include/opencv2/highgui/highgui_c.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7a8d3b34cf7101c5bcdc7acbb5d51c443d37f65b8113442ebef24ea7472371d -size 28439 diff --git a/phonelibs/opencv/include/opencv2/highgui/ios.h b/phonelibs/opencv/include/opencv2/highgui/ios.h deleted file mode 100644 index b612a28703..0000000000 --- a/phonelibs/opencv/include/opencv2/highgui/ios.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a84425db28709f0f04c0171fea2a74097015d8014659bd167d0b96ff5e17e12 -size 2375 diff --git a/phonelibs/opencv/include/opencv2/imgproc/imgproc.hpp b/phonelibs/opencv/include/opencv2/imgproc/imgproc.hpp deleted file mode 100644 index 72840db74f..0000000000 --- a/phonelibs/opencv/include/opencv2/imgproc/imgproc.hpp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75a1f108efd205a7868a8acb110e37cd15bdd9017db11097e1e66d7f92b72491 -size 56254 diff --git a/phonelibs/opencv/include/opencv2/imgproc/imgproc_c.h b/phonelibs/opencv/include/opencv2/imgproc/imgproc_c.h deleted file mode 100644 index fc1f9a013a..0000000000 --- a/phonelibs/opencv/include/opencv2/imgproc/imgproc_c.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3166687d1dbc3f5b71ac6f2418aa59ed46ec648d67b699fe7b76fb57f6b010f0 -size 30336 diff --git a/phonelibs/opencv/include/opencv2/imgproc/types_c.h b/phonelibs/opencv/include/opencv2/imgproc/types_c.h deleted file mode 100644 index 74fd29cbb9..0000000000 --- a/phonelibs/opencv/include/opencv2/imgproc/types_c.h +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6911ed83383faacc1a0650e3a4b0ffcc8e55e1c6f0b18c3d5391cb94d1ff5f43 -size 16436 diff --git a/selfdrive/camerad/SConscript b/selfdrive/camerad/SConscript index 18754ca811..7a81b76c8d 100644 --- a/selfdrive/camerad/SConscript +++ b/selfdrive/camerad/SConscript @@ -24,8 +24,8 @@ else: env.Append(CFLAGS = '-DWEBCAM') env.Append(CPPPATH = '/usr/local/include/opencv4') else: - libs += [] cameras = ['cameras/camera_frame_stream.cc'] + if arch == "Darwin": del libs[libs.index('OpenCL')] env = env.Clone()