From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 5 Jul 2015 11:21:57 +0200 Subject: [Buildroot] [PATCH v7 5/7] package/opencv: add gtk3 support In-Reply-To: <1436036821-10073-6-git-send-email-s.martin49@gmail.com> References: <1436036821-10073-1-git-send-email-s.martin49@gmail.com> <1436036821-10073-6-git-send-email-s.martin49@gmail.com> Message-ID: <20150705092157.GE3647@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Samuel, All, On 2015-07-04 21:06 +0200, Samuel Martin spake thusly: > Fully rework the GTK support in OpenCV because it now supports gtk-2 and > gtk-3 (but only one at the time). > Note that, in the build-system, the gtk support is only available when > Qt support is disabled; so make sure the menuconfig reflects this. > > Signed-off-by: Samuel Martin [--SNIP--] > diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk > index 79cf110..986e7b4 100644 > --- a/package/opencv/opencv.mk > +++ b/package/opencv/opencv.mk > @@ -236,11 +236,18 @@ OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=OFF > OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base > endif > > +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK)$(BR2_PACKAGE_OPENCV_WITH_GTK3),) > +OPENCV_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF > +endif > + > ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y) > OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON So here, this is unlike the GST case, where we need GTK=ON whenever we want to have gtk support, which is gtk3 by default, unless GTK_2=ON is also specified, in which case it's gtk2. Right? If so: Reviewed-by: "Yann E. MORIN" Regards, Yann E. MORIN. > OPENCV_DEPENDENCIES += libgtk2 > -else > -OPENCV_CONF_OPTS += -DWITH_GTK=OFF > +endif > + > +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK3),y) > +OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF > +OPENCV_DEPENDENCIES += libgtk3 > endif > > ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y) > -- > 2.4.5 > > _______________________________________________ > 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. | '------------------------------^-------^------------------^--------------------'