From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v5 01/13] package/opencv: cleanup spaces at ends of line
Date: Sun, 7 Jun 2015 13:31:32 +0200 [thread overview]
Message-ID: <20150607113132.GB3545@free.fr> (raw)
In-Reply-To: <1433672799-21387-2-git-send-email-s.martin49@gmail.com>
Samuel, All,
On 2015-06-07 12:26 +0200, Samuel Martin spake thusly:
> Nothing more than removing white spaces before '\' characters.
> Of course, 'git diff -w' shows no change at all.
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> changes v4->v5:
> - new patch
> ---
> package/opencv/opencv.mk | 112 +++++++++++++++++++++++------------------------
> 1 file changed, 56 insertions(+), 56 deletions(-)
>
> diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
> index ee84312..9967abc 100644
> --- a/package/opencv/opencv.mk
> +++ b/package/opencv/opencv.mk
> @@ -18,51 +18,51 @@ OPENCV_CONF_OPTS += \
>
> # OpenCV build options
> OPENCV_CONF_OPTS += \
> - -DBUILD_WITH_STATIC_CRT=OFF \
> - -DENABLE_FAST_MATH=ON \
> - -DENABLE_NOISY_WARNINGS=OFF \
> - -DENABLE_OMIT_FRAME_POINTER=ON \
> + -DBUILD_WITH_STATIC_CRT=OFF \
> + -DENABLE_FAST_MATH=ON \
> + -DENABLE_NOISY_WARNINGS=OFF \
> + -DENABLE_OMIT_FRAME_POINTER=ON \
> -DENABLE_PRECOMPILED_HEADERS=OFF \
> - -DENABLE_PROFILING=OFF \
> + -DENABLE_PROFILING=OFF \
> -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
>
> # OpenCV link options
> OPENCV_CONF_OPTS += \
> -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
> - -DCMAKE_SKIP_RPATH=OFF \
> + -DCMAKE_SKIP_RPATH=OFF \
> -DCMAKE_USE_RELATIVE_PATHS=OFF
>
> # OpenCV packaging options:
> OPENCV_CONF_OPTS += \
> - -DBUILD_PACKAGE=OFF \
> + -DBUILD_PACKAGE=OFF \
> -DENABLE_SOLUTION_FOLDERS=OFF \
> -DINSTALL_CREATE_DISTRIB=OFF
>
> # OpenCV module selection
> OPENCV_CONF_OPTS += \
> - -DBUILD_opencv_androidcamera=OFF \
> - -DBUILD_opencv_apps=OFF \
> - -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
> - -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
> - -DBUILD_opencv_core=ON \
> - -DBUILD_opencv_dynamicuda=OFF \
> + -DBUILD_opencv_androidcamera=OFF \
> + -DBUILD_opencv_apps=OFF \
> + -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
> + -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
> + -DBUILD_opencv_core=ON \
> + -DBUILD_opencv_dynamicuda=OFF \
> -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \
> - -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
> - -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
> - -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
> - -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
> - -DBUILD_opencv_java=OFF \
> - -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
> - -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
> - -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
> + -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
> + -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
> + -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
> + -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
> + -DBUILD_opencv_java=OFF \
> + -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
> + -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
> + -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
> -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
> - -DBUILD_opencv_ocl=OFF \
> - -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
> - -DBUILD_opencv_python=OFF \
> + -DBUILD_opencv_ocl=OFF \
> + -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
> + -DBUILD_opencv_python=OFF \
> -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
> -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \
> - -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
> - -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
> + -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
> + -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
> -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \
> -DBUILD_opencv_world=OFF
>
> @@ -72,10 +72,10 @@ OPENCV_CONF_OPTS += \
> # adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
> OPENCV_CONF_OPTS += \
> -DENABLE_POWERPC=OFF \
> - -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
> - -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
> - -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
> - -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
> + -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
> + -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
> + -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
> + -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
> -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
> -DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \
> -DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \
> @@ -84,7 +84,7 @@ OPENCV_CONF_OPTS += \
> # Cuda stuff
> OPENCV_CONF_OPTS += \
> -DWITH_CUBLAS=OFF \
> - -DWITH_CUDA=OFF \
> + -DWITH_CUDA=OFF \
> -DWITH_CUFFT=OFF
>
> # NVidia stuff
> @@ -98,7 +98,7 @@ OPENCV_CONF_OPTS += \
> # Intel stuff
> OPENCV_CONF_OPTS += \
> -DWITH_INTELPERC=OFF \
> - -DWITH_IPP=OFF \
> + -DWITH_IPP=OFF \
> -DWITH_TBB=OFF
>
> # Smartek stuff
> @@ -112,53 +112,53 @@ OPENCV_CONF_OPTS += -DWITH_XIMEA=OFF
>
> # Non-Linux support (Android options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_ANDROID_CAMERA=OFF \
> + -DWITH_ANDROID_CAMERA=OFF \
> -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
> - -DBUILD_ANDROID_EXAMPLES=OFF \
> - -DINSTALL_ANDROID_EXAMPLES=OFF \
> - -DBUILD_FAT_JAVA_LIB=OFF \
> + -DBUILD_ANDROID_EXAMPLES=OFF \
> + -DINSTALL_ANDROID_EXAMPLES=OFF \
> + -DBUILD_FAT_JAVA_LIB=OFF \
> -DBUILD_JAVA_SUPPORT=OFF
>
> # Non-Linux support (Mac OSX options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_AVFOUNDATION=OFF \
> - -DWITH_CARBON=OFF \
> + -DWITH_AVFOUNDATION=OFF \
> + -DWITH_CARBON=OFF \
> -DWITH_QUICKTIME=OFF
>
> # Non-Linux support (Windows options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_VFW=OFF \
> - -DWITH_WIN32UI=OFF \
> + -DWITH_VFW=OFF \
> + -DWITH_WIN32UI=OFF \
> -DWITH_CSTRIPES=OFF \
> - -DWITH_DSHOW=OFF \
> - -DWITH_MSMF=OFF \
> + -DWITH_DSHOW=OFF \
> + -DWITH_MSMF=OFF \
> -DWITH_VIDEOINPUT=OFF
>
> # Software/3rd-party support options.
> OPENCV_CONF_OPTS += \
> - -DBUILD_JASPER=OFF \
> - -DBUILD_JPEG=OFF \
> + -DBUILD_JASPER=OFF \
> + -DBUILD_JPEG=OFF \
> -DBUILD_OPENEXR=OFF \
> - -DBUILD_PNG=OFF \
> - -DBUILD_TIFF=OFF \
> - -DBUILD_ZLIB=OFF \
> + -DBUILD_PNG=OFF \
> + -DBUILD_TIFF=OFF \
> + -DBUILD_ZLIB=OFF \
> -DBUILD_NEW_PYTHON_SUPPORT=OFF \
> - -DINSTALL_C_EXAMPLES=OFF \
> - -DINSTALL_PYTHON_EXAMPLES=OFF \
> + -DINSTALL_C_EXAMPLES=OFF \
> + -DINSTALL_PYTHON_EXAMPLES=OFF \
> -DINSTALL_TO_MANGLED_PATHS=OFF
>
> # Disabled features (mostly because they are not available in Buildroot), but
> # - eigen: OpenCV does not use it, not take any benefit from it.
> OPENCV_CONF_OPTS += \
> - -DWITH_1394=OFF \
> - -DWITH_EIGEN=OFF \
> + -DWITH_1394=OFF \
> + -DWITH_EIGEN=OFF \
> -DWITH_IMAGEIO=OFF \
> - -DWITH_OPENCL=OFF \
> + -DWITH_OPENCL=OFF \
> -DWITH_OPENEXR=OFF \
> - -DWITH_OPENGL=OFF \
> - -DWITH_OPENMP=OFF \
> - -DWITH_OPENNI=OFF \
> - -DWITH_UNICAP=OFF \
> + -DWITH_OPENGL=OFF \
> + -DWITH_OPENMP=OFF \
> + -DWITH_OPENNI=OFF \
> + -DWITH_UNICAP=OFF \
> -DWITH_XINE=OFF
>
> OPENCV_DEPENDENCIES += zlib
> --
> 2.4.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2015-06-07 11:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-07 10:26 [Buildroot] [PATCH v5 00/13] OpenCV bump Samuel Martin
2015-06-07 10:26 ` [Buildroot] [PATCH v5 01/13] package/opencv: cleanup spaces at ends of line Samuel Martin
2015-06-07 11:31 ` Yann E. MORIN [this message]
2015-06-09 20:45 ` Thomas Petazzoni
2015-06-07 10:26 ` [Buildroot] [PATCH v5 02/13] package/opencv: alphabetically sorted each _CONF_OPTS group Samuel Martin
2015-06-07 11:35 ` Yann E. MORIN
2015-06-07 11:49 ` Samuel Martin
2015-06-07 10:26 ` [Buildroot] [PATCH v5 03/13] package/opencv: bump to version 3.0 Samuel Martin
2015-06-07 12:03 ` Yann E. MORIN
2015-06-14 14:05 ` Samuel Martin
2015-06-07 10:26 ` [Buildroot] [PATCH v5 04/13] package/opencv: define modules inter-dependencies Samuel Martin
2015-06-07 12:11 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 05/13] package/opencv: reword modules' prompt and help text Samuel Martin
2015-06-07 12:12 ` Yann E. MORIN
2015-06-09 20:46 ` Thomas Petazzoni
2015-06-07 10:26 ` [Buildroot] [PATCH v5 06/13] package/opencv: add qt5 support Samuel Martin
2015-06-07 12:16 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 07/13] package/opencv: add python support Samuel Martin
2015-06-07 12:22 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 08/13] package/opencv: add gstreamer-1.x support Samuel Martin
2015-06-07 12:34 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 09/13] package/opencv: add opengl support Samuel Martin
2015-06-07 12:41 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 10/13] package/opencv: add openmp support Samuel Martin
2015-06-07 12:43 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 11/13] package/opencv: add gtk3 support Samuel Martin
2015-06-07 13:00 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 12/13] package/vlc: add opencv support Samuel Martin
2015-06-07 13:14 ` Yann E. MORIN
2015-06-07 10:26 ` [Buildroot] [PATCH v5 13/13] package/gstreamer1/gst1-plugins-bad: disable opencv plugin with opencv-3 Samuel Martin
2015-06-07 13:18 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150607113132.GB3545@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.