From patchwork Tue Apr 1 09:43:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jeremie.scheer@armadeus.com X-Patchwork-Id: 335730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 2C64314009C for ; Tue, 1 Apr 2014 21:03:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6DFF58B795; Tue, 1 Apr 2014 10:03:09 +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 CUiQTyApsFYy; Tue, 1 Apr 2014 10:03:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 552388B72D; Tue, 1 Apr 2014 10:03:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 771EE1C2441 for ; Tue, 1 Apr 2014 10:03:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 707508B8B1 for ; Tue, 1 Apr 2014 10:03:04 +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 mn83g3nJSeFZ for ; Tue, 1 Apr 2014 10:03:02 +0000 (UTC) X-Greylist: delayed 00:19:33 by SQLgrey-1.7.6 Received: from mo68.mail-out.ovh.net (6.mo68.mail-out.ovh.net [46.105.63.100]) by whitealder.osuosl.org (Postfix) with ESMTP id 447E48B84B for ; Tue, 1 Apr 2014 10:03:02 +0000 (UTC) Received: from mail96.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo68.mail-out.ovh.net (Postfix) with SMTP id 5E49CFFB33D for ; Tue, 1 Apr 2014 11:43:25 +0200 (CEST) Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 1 Apr 2014 11:43:25 +0200 Received: from ip-83-141-171-91.evc.net (HELO laptop-jeremie-ubuntu.armadeus-office) (83.141.171.91) by ns0.ovh.net with SMTP; 1 Apr 2014 11:43:22 +0200 From: jeremie.scheer@armadeus.com To: buildroot@busybox.net Date: Tue, 1 Apr 2014 11:43:19 +0200 Message-Id: <1396345399-28487-1-git-send-email-jeremie.scheer@armadeus.com> X-Mailer: git-send-email 1.7.9.5 X-Ovh-Tracer-Id: 9959992051043133654 X-Ovh-Remote: 83.141.171.91 (ip-83-141-171-91.evc.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: -100 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeejuddrhedtucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-Spam-Check: DONE|U 0.500032/N X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeejuddrhedtucetufdoteggodetrfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Subject: [Buildroot] [PATCH v2] Compile Poppler over Qt 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 From: Jeremie Scheer Signed-off-by: Jeremie Scheer --- Changes since v1: - Remove dependencies that doesn't depend on Qt from Qt package condition package/poppler/poppler.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 040327f..386e7b8 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -7,10 +7,18 @@ POPPLER_VERSION = 0.24.4 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz POPPLER_SITE = http://poppler.freedesktop.org -POPPLER_DEPENDENCIES = fontconfig POPPLER_LICENSE = GPLv2+ POPPLER_LICENSE_FILES = COPYING POPPLER_CONF_OPT = --with-font-configuration=fontconfig +POPPLER_INSTALL_STAGING = YES + +POPPLER_DEPENDENCIES = fontconfig + +ifeq ($(BR2_PACKAGE_QT),y) + POPPLER_DEPENDENCIES += qt +else + POPPLER_CONF_OPT += --disable-poppler-qt4 +endif ifeq ($(BR2_PACKAGE_LCMS2),y) POPPLER_CONF_OPT += --enable-cms=lcms2