From patchwork Mon Oct 6 20:19:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 396930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 9F18C140140 for ; Tue, 7 Oct 2014 07:20:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B0259956FE; Mon, 6 Oct 2014 20:19:55 +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 ua-mK5fCI+Eh; Mon, 6 Oct 2014 20:19:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 004379577D; Mon, 6 Oct 2014 20:19:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 405D91BF83B for ; Mon, 6 Oct 2014 20:19:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3BF4A8AFFF for ; Mon, 6 Oct 2014 20:19:46 +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 zuOzPirTRjjF for ; Mon, 6 Oct 2014 20:19:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9A21F891C1 for ; Mon, 6 Oct 2014 20:19:45 +0000 (UTC) Received: by mail-wi0-f172.google.com with SMTP id n3so5798902wiv.17 for ; Mon, 06 Oct 2014 13:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L9Uhzxx9Ea1bRjfk7e1gqI1xw6SDT/rxmNUhwAwx8kk=; b=TwEGPAY2aG/L8gqRBEvXWeQsCixUxH3WnuV5DWOGEcDpLOswLTvFMake9SpUS30yIm zyVy0I1vvanj1Pbeg2t6DtrEc0KOw/K9FXYNhyDYWu5QUoRrWL4KpAJTXxM4PWg871t4 PlJbbbrGZTPv3ysQYfbSD9p7/N0zN8qiUNSQXs09k9g5SlfKGMrwRYK/sA3tVEw1cRbh UIWl7Vz4i6Dy3d2YIEljH5L9UgX5UWsiIRmVyRoMtmfAwUgEn4zifdww9fwJBJHmOy83 Bo50/OjGskL9e2h4hSc4K015M4BVrwGeT5DagH7uPKm+WWHEMnd7eErhK0cMo2tJpfyi Bpbw== X-Received: by 10.194.156.132 with SMTP id we4mr6846614wjb.101.1412626783768; Mon, 06 Oct 2014 13:19:43 -0700 (PDT) Received: from bobook.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id yr10sm18353386wjc.38.2014.10.06.13.19.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Oct 2014 13:19:43 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.net Date: Mon, 6 Oct 2014 22:19:25 +0200 Message-Id: <1412626766-24683-9-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1412626766-24683-1-git-send-email-s.martin49@gmail.com> References: <1412626766-24683-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v4 8/9] package/vlc: add opencv support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add OpenCV support for video filter in vlc. vlc source code still includes the headers from the deprecated OpenCV API. Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v3 -> v4: - rebase - rename _OPT -> _OPTS changes v2 -> v3: - rebase - update A/R/T tags changes v1 -> v2: - new patch --- package/vlc/Config.in | 1 + package/vlc/vlc.mk | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package/vlc/Config.in b/package/vlc/Config.in index cdb0d16..ede9269 100644 --- a/package/vlc/Config.in +++ b/package/vlc/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_VLC depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS + select BR2_PACKAGE_OPENCV_USE_DEPRECATED_HEADERS if BR2_PACKAGE_OPENCV help VLC is a free and open source cross-platform multimedia player and framework that plays most multimedia files as well as DVD, diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 0b275f2..d884873 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -124,6 +124,13 @@ else VLC_CONF_OPTS += --disable-glx endif +ifeq ($(BR2_PACKAGE_OPENCV),y) +VCL_CONF_OPTS += --with-opencv +VLC_DEPENDENCIES += opencv +else +VLC_CONF_OPTS += --without-opencv +endif + ifeq ($(BR2_PACKAGE_OPUS),y) VLC_CONF_OPTS += --enable-opus VLC_DEPENDENCIES += libvorbis opus