From patchwork Tue Apr 9 12:38:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?0KDRg9GB0LvQsNC9INCY0LbQsdGD0LvQsNGC0L7Qsg==?= X-Patchwork-Id: 10891209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F82A1805 for ; Tue, 9 Apr 2019 12:39:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C3111FF41 for ; Tue, 9 Apr 2019 12:39:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 607CA285AF; Tue, 9 Apr 2019 12:39:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F4F720121 for ; Tue, 9 Apr 2019 12:39:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727110AbfDIMjF (ORCPT ); Tue, 9 Apr 2019 08:39:05 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:42571 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726388AbfDIMjE (ORCPT ); Tue, 9 Apr 2019 08:39:04 -0400 Received: by mail-lj1-f193.google.com with SMTP id v22so14294638lje.9 for ; Tue, 09 Apr 2019 05:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1xN5DUo7WPUJzr6sXLTceZWuvITTVSaglvf0OIWVNdg=; b=o6mA+beiEV0wlmbBwk9Sdkfx8QY63+Stdx66XE3hwak1YDEw6rgU63vHWbwuw8MWEB /2wCjcO+dFSpW+4x+9CDq0IWh9m8KAmIybF4XS6cBWgftmJqXiPfeXEj8d8bhQ4KCigh S3lFMEmT4nkjthtrNGw4rikTfPzePZMRw09YdZ7ArsrE1Mv2cX+hyx2lNtB+L6GUh5Pn Ke/W2ZqoGir3jRhsTvSOSgbO6+m8SdlsZku5Vw/RgzxEIc0aKxHnTEG5Y8zoUq/tp7Bu QF3RKIJpmdidU5IKQD5IbLQn6aUMcLTuQILdRu/UtiVTYDkv0BvDC4hJKGhcu2nwHgwG iHBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1xN5DUo7WPUJzr6sXLTceZWuvITTVSaglvf0OIWVNdg=; b=XgZ90Dd1U4Nj8aF9X8LP37J0eMK2DcygAGueQs5nzUx0eQooh08e42FHRE5BaifE6h Rc/1IR5ShqJBr/rAOAB394Jj86FVtY07q5xuLjkDubg1WTZRf+KOfmG/6WzyBgsz5BFh xG3n7Pt/w8Y2UnxE9e0EWdyTwjgk0LLQYCrfyhwrkaCwqIzkrf5/xkHHC0wsGQbqgO1X po+ylWki+deHCtytfMxBgxLBATbaVIqEKOTmw5ui4dvBnXu3ksKzcn5BozWj7HFbBH6s ReNs3YPq6zZXJ6RjScOds15p5Y1QUJeE+Ouds4fCXxennGmCj07r/0y+GaSI8j35tj7l Jp0w== X-Gm-Message-State: APjAAAUK4XOwAhtrs2hH4VNrWKXUBBpColRn4D/61gfxgD/zQH2TX6lY O58khZgwbgrGoeF5wL+HdKKxBt/Y X-Google-Smtp-Source: APXvYqxEBA2kffCrAX+HHrA1V0Q/rXagzLklt/eFCd4CPsH1DtTOR7QHyqdgwJq102E6mg7va/Lb3g== X-Received: by 2002:a2e:9a0f:: with SMTP id o15mr19374354lji.130.1554813542394; Tue, 09 Apr 2019 05:39:02 -0700 (PDT) Received: from localhost.localdomain (broadband-95-84-200-6.ip.moscow.rt.ru. [95.84.200.6]) by smtp.gmail.com with ESMTPSA id t23sm6749976ljc.13.2019.04.09.05.39.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 05:39:01 -0700 (PDT) From: =?utf-8?b?0KDRg9GB0LvQsNC9INCY0LbQsdGD0LvQsNGC0L7Qsg==?= To: linux-media@vger.kernel.org Subject: [PATCH 4/8] [PATCH for ZBar] Disable zbarcam-gtk on Windows Date: Tue, 9 Apr 2019 12:38:38 +0000 Message-Id: <20190409123842.19600-5-lrn1986@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409123842.19600-1-lrn1986@gmail.com> References: <20190409123842.19600-1-lrn1986@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It requires scan_video.c, which includes linux/videodev2.h, so the code is clearly not meant to be built for Windows, even if GTK is available there. Signed-off-by: Руслан Ижбулатов --- zbarcam/Makefile.am.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zbarcam/Makefile.am.inc b/zbarcam/Makefile.am.inc index b112783..ad16d3c 100644 --- a/zbarcam/Makefile.am.inc +++ b/zbarcam/Makefile.am.inc @@ -5,12 +5,14 @@ zbarcam_zbarcam_LDADD = zbar/libzbar.la CLEANFILES += zbarcam/.libs/zbarcam zbarcam/moc_zbarcam_qt.h if HAVE_GTK +if !WIN32 bin_PROGRAMS += zbarcam/zbarcam-gtk zbarcam_zbarcam_gtk_SOURCES = zbarcam/zbarcam-gtk.c zbarcam/scan_video.c zbarcam_zbarcam_gtk_CPPFLAGS = $(GTK_CFLAGS) $(AM_CPPFLAGS) zbarcam_zbarcam_gtk_LDADD = $(GTK_LIBS) gtk/libzbargtk.la zbar/libzbar.la \ $(AM_LDADD) endif +endif if HAVE_QT bin_PROGRAMS += zbarcam/zbarcam-qt