| Message ID | 1435262397-888-10-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Samuel, All, On 2015-06-25 21:59 +0200, Samuel Martin spake thusly: > OpenCV 3.0 support both gstreamer-0.10 and gstreamer-1.x, but only one > is used at the time. > > This patch turns the gstreamer support into a choice, in order to prepare > adding the support for gstreamer-1 in a following patch. > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > > --- > changes v5->v6: > - new patch > --- > package/opencv/Config.in | 23 ++++++++++++++++------- > 1 file changed, 16 insertions(+), 7 deletions(-) > > diff --git a/package/opencv/Config.in b/package/opencv/Config.in > index 8ed505e..4b571e0 100644 > --- a/package/opencv/Config.in > +++ b/package/opencv/Config.in > @@ -177,18 +177,27 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG > help > Use ffmpeg from the target system. > > +comment "gstreamer support needs a toolchain w/ wchar, threads" > + depends on BR2_USE_MMU > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS Although I don't like it much, we usually have the comment in the choice itself, see for example the external toolchain choice. > +choice > + prompt "gstreamer support" > + depends on BR2_USE_MMU # libglib2 > + depends on BR2_USE_WCHAR # libglib2 > + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 So, this means the choice will not be visible when gstreamer is missing its dependencies. Instead, I'd do something like is done (in a later patch) for the GUI toolkits, that is always show the choice, but hide whatever entries are not available: choice bool "gstreamer support" config BR2_PKG_OCV_GST_NONE bool "none" config BR2_PKG_OCV_GST_0_10 bool "gstreamer 0.10" depends on BR2_USE_MMU # gst-0.10 depends on BR2_USE_WCHAR # gst-0.10 depends on BR2_TOOLCHAIN_HAS_THREADS # gst-0.10 comment "gst-0.10 support needs a toolchain w/ wxhar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS endchoice Regards, Yann E. MORIN. > +config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER > + bool "none" > + > config BR2_PACKAGE_OPENCV_WITH_GSTREAMER > - bool "gstreamer support" > - depends on BR2_USE_MMU # gstreamer -> libglib2 > - depends on BR2_USE_WCHAR # gstreamer -> libglib2 > - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 > + bool "gstreamer-0.10" > select BR2_PACKAGE_GSTREAMER > select BR2_PACKAGE_GST_PLUGINS_BASE > select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP > > -comment "gstreamer support needs a toolchain w/ wchar, threads" > - depends on BR2_USE_MMU > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > + > +endchoice > > config BR2_PACKAGE_OPENCV_WITH_GTK > bool "gtk support" > -- > 2.4.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 8ed505e..4b571e0 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -177,18 +177,27 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG help Use ffmpeg from the target system. +comment "gstreamer support needs a toolchain w/ wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +choice + prompt "gstreamer support" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + +config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER + bool "none" + config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer support" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 + bool "gstreamer-0.10" select BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP -comment "gstreamer support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +endchoice config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support"
OpenCV 3.0 support both gstreamer-0.10 and gstreamer-1.x, but only one is used at the time. This patch turns the gstreamer support into a choice, in order to prepare adding the support for gstreamer-1 in a following patch. Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- changes v5->v6: - new patch --- package/opencv/Config.in | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)