From patchwork Fri Jun 15 08:10:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arn R X-Patchwork-Id: 165060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5D119B702D for ; Fri, 15 Jun 2012 18:10:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6BE4030F34; Fri, 15 Jun 2012 08:10:34 +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 m4K6SzUBl6hQ; Fri, 15 Jun 2012 08:10:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AA51924CEF; Fri, 15 Jun 2012 08:10:32 +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 2AC1D8F78D for ; Fri, 15 Jun 2012 08:10:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 201F91025EB for ; Fri, 15 Jun 2012 08:10:31 +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 RDzwIuNBneK9 for ; Fri, 15 Jun 2012 08:10:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3446C101DBD for ; Fri, 15 Jun 2012 08:10:30 +0000 (UTC) Received: by pbbrp8 with SMTP id rp8so5515763pbb.33 for ; Fri, 15 Jun 2012 01:10:30 -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:x-mailer; bh=jKdAqYkWZj/0mJudy4W3rZPJGdQ/O5kyGOVMjvaRcLo=; b=gNGn7H/2lWHJhKjdXF6USDpVCcllfwkHyJVUttbqAMD2RZYFw2X+MSt3d3Iz7yg+x7 DIRE7f85TsGl3fesp/xH80gXS5QfQlTTeS4zAFXE/z7UpBqbmGKSoy62JZEFpS7oJMCF 7gZCwTGBV6uEO6U7bVDnE6oM5lrc2ko/uPqHqXJxnv4jFuUfssh3D0ZpkSvJitsSqrq8 3u2uup9TwI8xBcSsfDNSmu98BlxAezsbfWtB3cpHPj6pLRqErSfHxhxIhtFdeoxgCFvm TDtHxVLGxOsp37oNphVCjNmbLRzKxpZTaHZuhf1/zGYMoyWmd5V5mHXYPzvoyRT/eJtU kvDA== Received: by 10.68.233.225 with SMTP id tz1mr191923pbc.4.1339747829866; Fri, 15 Jun 2012 01:10:29 -0700 (PDT) Received: from localhost.localdomain ([202.129.79.128]) by mx.google.com with ESMTPS id x1sm12440952pbp.50.2012.06.15.01.10.27 (version=SSLv3 cipher=OTHER); Fri, 15 Jun 2012 01:10:29 -0700 (PDT) From: Arn R To: buildroot@uclibc.org Date: Fri, 15 Jun 2012 18:10:18 +1000 Message-Id: <1339747818-5118-1-git-send-email-arnerro@gmail.com> X-Mailer: git-send-email 1.7.5.4 Subject: [Buildroot] [PATCH] fbv: Allow selection of supported image formats. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net This removes fbv's compulsory dependency on either libpng and/or libjpeg and/or libungif. The user can choose which compressed image format's fbv should support. By default PNG, JPEG and GIF are selected. Note that BMP format support will still always be included. Signed-off-by: Arn R --- package/fbv/Config.in | 28 +++++++++++++++++++++++++--- package/fbv/fbv.mk | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/package/fbv/Config.in b/package/fbv/Config.in index ea54401..b8a9fe4 100644 --- a/package/fbv/Config.in +++ b/package/fbv/Config.in @@ -1,11 +1,33 @@ config BR2_PACKAGE_FBV bool "fbv" - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBUNGIF help fbv is a very simple graphic file viewer for the framebuffer console, capable of displaying GIF, JPEG, PNG and BMP files using libungif, libjpeg and libpng. http://freshmeat.net/projects/fbv/ + +if BR2_PACKAGE_FBV + +config BR2_PACKAGE_FBV_PNG + bool "PNG support" + default y + select BR2_PACKAGE_LIBPNG + help + Enable support for PNG using libpng. + +config BR2_PACKAGE_FBV_JPEG + bool "JPEG support" + default y + select BR2_PACKAGE_JPEG + help + Enable support for JPEG using IJG's libjpeg. + +config BR2_PACKAGE_FBV_GIF + bool "GIF support" + default y + select BR2_PACKAGE_LIBUNGIF + help + Enable support for GIF using libungif. + +endif # BR2_PACKAGE_FBV diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index 855a0d4..466a708 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -7,7 +7,24 @@ FBV_VERSION:=1.0b FBV_SOURCE:=fbv-$(FBV_VERSION).tar.gz FBV_SITE:=http://s-tech.elsat.net.pl/fbv -FBV_DEPENDENCIES = libpng jpeg libungif +### image format dependencies and configure options +FBV_DEPENDENCIES = # empty +FBV_CONFIGURE_OPTS = # empty +ifeq ($(BR2_PACKAGE_FBV_PNG),y) +FBV_DEPENDENCIES += libpng +else +FBV_CONFIGURE_OPTS += --without-libpng +endif +ifeq ($(BR2_PACKAGE_FBV_JPEG),y) +FBV_DEPENDENCIES += jpeg +else +FBV_CONFIGURE_OPTS += --without-libjpeg +endif +ifeq ($(BR2_PACKAGE_FBV_GIF),y) +FBV_DEPENDENCIES += libungif +else +FBV_CONFIGURE_OPTS += --without-libungif +endif #fbv donesn't support cross-compilation define FBV_CONFIGURE_CMDS @@ -17,6 +34,7 @@ define FBV_CONFIGURE_CMDS ./configure \ --prefix=/usr \ --libs="-lz -lm" \ + $(FBV_CONFIGURE_OPTS) \ ) endef