From patchwork Sun Sep 30 19:03:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 976932 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NZZT3jcQz9s4V for ; Mon, 1 Oct 2018 05:03:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A440C888EA; Sun, 30 Sep 2018 19:03:41 +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 vejSprp8T7Qe; Sun, 30 Sep 2018 19:03:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 08219888E4; Sun, 30 Sep 2018 19:03:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C20701C2D2F for ; Sun, 30 Sep 2018 19:03:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BD4A1880D5 for ; Sun, 30 Sep 2018 19:03:38 +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 qwuWyw57xHsC for ; Sun, 30 Sep 2018 19:03:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by whitealder.osuosl.org (Postfix) with ESMTPS id A1E4687F08 for ; Sun, 30 Sep 2018 19:03:36 +0000 (UTC) Received: from fwd11.aul.t-online.de (fwd11.aul.t-online.de [172.20.27.152]) by mailout07.t-online.de (Postfix) with SMTP id DE17942CCF81 for ; Sun, 30 Sep 2018 21:03:33 +0200 (CEST) Received: from fli4l.lan.fli4l (XZVZYkZXrhoQOorYGiAHQBA9vO8n5ZRM4OQRL6QE0gKo+MsuGt4NXrRk44G3GwNwNd@[84.161.176.196]) by fwd11.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1g6h00-0OVpJI0; 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 1g6gzz-0003Xl-Kn 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:20 +0200 Message-Id: <20180930190323.3369-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 X-ID: XZVZYkZXrhoQOorYGiAHQBA9vO8n5ZRM4OQRL6QE0gKo+MsuGt4NXrRk44G3GwNwNd X-TOI-MSGID: 76336dfa-9634-4ac8-8ab1-eb3866d978af Subject: [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version 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" The currently used github repo from oliv3r does not exist anymore. https://sourceforge.net/projects/mjpg-streamer/ shows that the status of the original project site is "Inactive" and points to https://github.com/jacksonliam/mjpg-streamer as the new site. The new maintainer is active so we bump the package to HEAD of its master branch which fixes a glibc-related build error: http://autobuild.buildroot.net/results/4c8/4c8aac898d4580ed0b8b52cef7779d0f6f6a631f/ Further changes due to this bump: - removed patch 0001, fix was applied upstream: https://github.com/jacksonliam/mjpg-streamer/commit/eb4dafd802b366d9b0310e91e7bb93a1082e7657#diff-511ff6908e8db4543e5a59d0ea4a2f1f - switched to CMake Added license hash. Signed-off-by: Bernd Kuhls --- package/mjpg-streamer/0001-musl-pthread.patch | 18 --------------- package/mjpg-streamer/Config.in | 2 +- package/mjpg-streamer/mjpg-streamer.hash | 3 ++- package/mjpg-streamer/mjpg-streamer.mk | 22 +++++-------------- 4 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 package/mjpg-streamer/0001-musl-pthread.patch diff --git a/package/mjpg-streamer/0001-musl-pthread.patch b/package/mjpg-streamer/0001-musl-pthread.patch deleted file mode 100644 index 9e76e760d8..0000000000 --- a/package/mjpg-streamer/0001-musl-pthread.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix musl build - -Patch written by Thomas Petazzoni: -http://patchwork.ozlabs.org/patch/572309/ - -Signed-off-by: Bernd Kuhls - -diff -uNr mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h ---- mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h 2015-11-09 15:56:47.000000000 +0100 -+++ mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h 2016-01-26 20:19:05.884349502 +0100 -@@ -20,6 +20,7 @@ - # # - *******************************************************************************/ - -+#include - #include - #include "../mjpg_streamer.h" - #define INPUT_PLUGIN_PREFIX " i: " diff --git a/package/mjpg-streamer/Config.in b/package/mjpg-streamer/Config.in index f42c2a50db..3587af0288 100644 --- a/package/mjpg-streamer/Config.in +++ b/package/mjpg-streamer/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_MJPG_STREAMER filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software. - http://mjpg-streamer.sourceforge.net + https://github.com/jacksonliam/mjpg-streamer comment "mjpg-streamer needs a toolchain w/ threads, headers >= 3.0, dynamic library" depends on BR2_USE_MMU diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash index 8bbac29e33..f544550c53 100644 --- a/package/mjpg-streamer/mjpg-streamer.hash +++ b/package/mjpg-streamer/mjpg-streamer.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 756a60cbc3404ac21109bb66091774ac8e1d64ebf60e2bf2c0d08a06d1abb9be mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.tar.gz +sha256 094fda686ef63e5167cbef81b5ac6aea74fa98ea2674fa4eba3bc6ba29cc5857 mjpg-streamer-f387bb44e6c087271b763b27da998bf2e06c4f5d.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk index 4fecf69ec9..2941e314b3 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -4,27 +4,15 @@ # ################################################################################ -# Original source is located at -# http://sourceforge.net/p/mjpg-streamer/code/commit_browser -# oliv3r forked the repo to add support for 3.16 and 3.17 kernels: -# http://sourceforge.net/p/mjpg-streamer/patches/14/ -MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b -MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION)) +MJPG_STREAMER_VERSION = f387bb44e6c087271b763b27da998bf2e06c4f5d +MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION)) +MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental MJPG_STREAMER_LICENSE = GPL-2.0+ -MJPG_STREAMER_LICENSE_FILES = LICENSE +MJPG_STREAMER_LICENSE_FILES = $(MJPG_STREAMER_SUBDIR)/LICENSE MJPG_STREAMER_DEPENDENCIES = jpeg ifeq ($(BR2_PACKAGE_LIBV4L),y) MJPG_STREAMER_DEPENDENCIES += libv4l -MJPG_STREAMER_USE_LIBV4L += USE_LIBV4L2=true endif -define MJPG_STREAMER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) $(MJPG_STREAMER_USE_LIBV4L) -endef - -define MJPG_STREAMER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) +$(eval $(cmake-package)) 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)) From patchwork Sun Sep 30 19:03:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 976930 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 42NZZM4XXjz9s4V for ; Mon, 1 Oct 2018 05:03:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAC59880ED; Sun, 30 Sep 2018 19:03:37 +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 u+z-av-m5u1E; Sun, 30 Sep 2018 19:03:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 37D17880C6; Sun, 30 Sep 2018 19:03:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 10B481C2D2F for ; Sun, 30 Sep 2018 19:03:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0D94B87561 for ; Sun, 30 Sep 2018 19:03:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uJxNS9ysnZ0y for ; Sun, 30 Sep 2018 19:03:35 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 2A5EE8755A for ; Sun, 30 Sep 2018 19:03:35 +0000 (UTC) Received: from fwd13.aul.t-online.de (fwd13.aul.t-online.de [172.20.27.62]) by mailout08.t-online.de (Postfix) with SMTP id 54ADE41CCEF4 for ; Sun, 30 Sep 2018 21:03:33 +0200 (CEST) Received: from fli4l.lan.fli4l (VTMJboZJQhwaksFehbQqjUPcMc3RN4mOjmNDjqgJvd59hBI4++68+Kbv-xJIXhFgmB@[84.161.176.196]) by fwd13.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1g6h01-2eTzmK0; Sun, 30 Sep 2018 21:03:25 +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-Gb 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:22 +0200 Message-Id: <20180930190323.3369-3-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: VTMJboZJQhwaksFehbQqjUPcMc3RN4mOjmNDjqgJvd59hBI4++68+Kbv-xJIXhFgmB X-TOI-MSGID: 7ef35308-2154-4aa1-9e46-f4f8420e5feb Subject: [Buildroot] [PATCH 3/4] package/mjpg-streamer: add optional dependency to sdl 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" 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 50ed980b7a..a4f96e1c56 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -22,4 +22,11 @@ else MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF endif +ifeq ($(BR2_PACKAGE_SDL),y) +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_OUTPUT_VIEWER=ON +MJPG_STREAMER_DEPENDENCIES += host-pkgconf sdl +else +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_OUTPUT_VIEWER=OFF +endif + $(eval $(cmake-package)) From patchwork Sun Sep 30 19:03:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 976931 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NZZN01YJz9sBs for ; Mon, 1 Oct 2018 05:03:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1FAB422264; Sun, 30 Sep 2018 19:03:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 009IFnw-4xkV; Sun, 30 Sep 2018 19:03:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 70529220FD; Sun, 30 Sep 2018 19:03:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 29E611C2D2F for ; Sun, 30 Sep 2018 19:03:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 278A887561 for ; Sun, 30 Sep 2018 19:03:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J3A0XvCDNsiZ for ; Sun, 30 Sep 2018 19:03:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E9B018755A for ; Sun, 30 Sep 2018 19:03:28 +0000 (UTC) Received: from fwd40.aul.t-online.de (fwd40.aul.t-online.de [172.20.26.139]) by mailout11.t-online.de (Postfix) with SMTP id F105C421B8C5 for ; Sun, 30 Sep 2018 21:03:26 +0200 (CEST) Received: from fli4l.lan.fli4l (SyBs3oZ-whDulIrS6krMt7dXGDpnPzPUm-l-2HEc+9TCi+tLVj51RbE0GnYAdqOge8@[84.161.176.196]) by fwd40.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1g6h01-2w0j3o0; Sun, 30 Sep 2018 21:03:25 +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 1g6h01-0003Xl-13 for buildroot@buildroot.org; Sun, 30 Sep 2018 21:03:25 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 30 Sep 2018 21:03:23 +0200 Message-Id: <20180930190323.3369-4-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: SyBs3oZ-whDulIrS6krMt7dXGDpnPzPUm-l-2HEc+9TCi+tLVj51RbE0GnYAdqOge8 X-TOI-MSGID: ac41edad-e316-441f-8b81-b53780e51249 Subject: [Buildroot] [PATCH 4/4] package/mjpg-streamer: add optional dependency to libgphoto2 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" 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 a4f96e1c56..111a66ef7e 100644 --- a/package/mjpg-streamer/mjpg-streamer.mk +++ b/package/mjpg-streamer/mjpg-streamer.mk @@ -11,6 +11,13 @@ MJPG_STREAMER_LICENSE = GPL-2.0+ MJPG_STREAMER_LICENSE_FILES = $(MJPG_STREAMER_SUBDIR)/LICENSE MJPG_STREAMER_DEPENDENCIES = jpeg +ifeq ($(BR2_PACKAGE_LIBGPHOTO2),y) +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_PTP2=ON +MJPG_STREAMER_DEPENDENCIES += host-pkgconf libgphoto2 +else +MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_PTP2=OFF +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) MJPG_STREAMER_DEPENDENCIES += libv4l endif