From patchwork Wed Nov 6 21:10:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1190683 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 477fM004n5z9sP7 for ; Thu, 7 Nov 2019 08:10:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5EBAB8A8A9; Wed, 6 Nov 2019 21:10:14 +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 zl+2kWwbQxvU; Wed, 6 Nov 2019 21:10:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A5B668A923; Wed, 6 Nov 2019 21:10:13 +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 D09761BF488 for ; Wed, 6 Nov 2019 21:10:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD3DC89F68 for ; Wed, 6 Nov 2019 21:10:12 +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 2nL8QGkqV1Bn for ; Wed, 6 Nov 2019 21:10:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8B8D389E15 for ; Wed, 6 Nov 2019 21:10:11 +0000 (UTC) Received: from fwd26.aul.t-online.de (fwd26.aul.t-online.de [172.20.26.131]) by mailout03.t-online.de (Postfix) with SMTP id 602DE420914F for ; Wed, 6 Nov 2019 22:10:09 +0100 (CET) Received: from fli4l.lan.fli4l (bRJ+-aZHQhkeElFsWjImFVEOv8MN+WodPrK-GVQglnwFJqB6CmPk0ea9q3fNUJZwRc@[84.161.180.222]) by fwd26.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iSSZ4-4Eo50S0; Wed, 6 Nov 2019 22:10:06 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:51804) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iSSZ3-0004NJ-7F for buildroot@buildroot.org; Wed, 06 Nov 2019 22:10:05 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 6 Nov 2019 22:10:04 +0100 Message-Id: <20191106211005.16734-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: bRJ+-aZHQhkeElFsWjImFVEOv8MN+WodPrK-GVQglnwFJqB6CmPk0ea9q3fNUJZwRc X-TOI-MSGID: f093540c-a8f2-4a27-8540-3f82d578ab6a Subject: [Buildroot] [PATCH/next 1/2] package/ghostscript: add optional dependency to jbig2dec X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 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" Remove jbig2dec source files included in upstream tarball as well. Needs http://patchwork.ozlabs.org/patch/1161981/ Signed-off-by: Bernd Kuhls --- package/ghostscript/ghostscript.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index a6e85d9894..d0f46187c3 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -27,8 +27,8 @@ GHOSTSCRIPT_DEPENDENCIES = \ # Inspired by linuxfromscratch: # http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html define GHOSTSCRIPT_REMOVE_LIBS - rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2mt \ - $(@D)/libpng $(@D)/tiff $(@D)/zlib + rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jbig2dec $(@D)/jpeg \ + $(@D)/lcms2mt $(@D)/libpng $(@D)/tiff $(@D)/zlib endef GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS @@ -43,10 +43,16 @@ GHOSTSCRIPT_CONF_OPTS = \ --with-fontpath=/usr/share/fonts \ --enable-freetype \ --disable-gtk \ - --without-jbig2dec \ --without-libpaper \ --with-system-libtiff +ifeq ($(BR2_PACKAGE_JBIG2DEC),y) +GHOSTSCRIPT_DEPENDENCIES += jbig2dec +GHOSTSCRIPT_CONF_OPTS += --with-jbig2dec +else +GHOSTSCRIPT_CONF_OPTS += --without-jbig2dec +endif + ifeq ($(BR2_PACKAGE_LIBIDN),y) GHOSTSCRIPT_DEPENDENCIES += libidn GHOSTSCRIPT_CONF_OPTS += --with-libidn