From patchwork Sun Sep 30 19:03:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 976929 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NZZF3L2lz9s4V for ; Mon, 1 Oct 2018 05:03:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 83A5687F92; Sun, 30 Sep 2018 19:03:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TTSP-eX7shqL; Sun, 30 Sep 2018 19:03:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A6FE987F08; Sun, 30 Sep 2018 19:03:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 82E581C2D2F for ; Sun, 30 Sep 2018 19:03:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 80234888E4 for ; Sun, 30 Sep 2018 19:03:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LC8DPtyb-Hsn for ; Sun, 30 Sep 2018 19:03:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by hemlock.osuosl.org (Postfix) with ESMTPS id 52BE8888DE for ; Sun, 30 Sep 2018 19:03:27 +0000 (UTC) Received: from fwd00.aul.t-online.de (fwd00.aul.t-online.de [172.20.26.147]) by mailout08.t-online.de (Postfix) with SMTP id E550B41CCEEE for ; Sun, 30 Sep 2018 21:03:24 +0200 (CEST) Received: from fli4l.lan.fli4l (rfchYkZ1YhlAV+UF+Joc5tAUC-+mr4aTHXjVNsTItmg1jHjdmNIM8S1EfsDqiTbZs+@[84.161.176.196]) by fwd00.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1g6h00-1726F60; Sun, 30 Sep 2018 21:03:24 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:55456 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1g6h00-0003Xl-5H for buildroot@buildroot.org; Sun, 30 Sep 2018 21:03:24 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 30 Sep 2018 21:03:21 +0200 Message-Id: <20180930190323.3369-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180930190323.3369-1-bernd.kuhls@t-online.de> References: <20180930190323.3369-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: rfchYkZ1YhlAV+UF+Joc5tAUC-+mr4aTHXjVNsTItmg1jHjdmNIM8S1EfsDqiTbZs+ X-TOI-MSGID: 62d20e8b-cd8c-4ee4-aa3f-883e7d20b789 Subject: [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" According to https://github.com/jacksonliam/mjpg-streamer/blob/master/mjpg-streamer-experimental/plugins/input_opencv/README.md the plugin does not support OpenCV 2.x. Signed-off-by: Bernd Kuhls --- package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk index 2941e314b3..50ed980b7a 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -15,4 +15,11 @@ ifeq ($(BR2_PACKAGE_LIBV4L),y) MJPG_STREAMER_DEPENDENCIES += libv4l endif +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),yyy) +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=ON +MJPG_STREAMER_DEPENDENCIES += host-pkgconf opencv3 +else +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF +endif + $(eval $(cmake-package))