From patchwork Mon Jul 13 18:47:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Sierra X-Patchwork-Id: 1328417 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=xes-inc.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B5CML6MYhz9s1x for ; Tue, 14 Jul 2020 04:47:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6BB5989B73; Mon, 13 Jul 2020 18:47:55 +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 EvO9Xe4YTy4h; Mon, 13 Jul 2020 18:47:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8DC6D89B2A; Mon, 13 Jul 2020 18:47:54 +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 EB7BF1BF31B for ; Mon, 13 Jul 2020 18:47:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E4CC389B38 for ; Mon, 13 Jul 2020 18:47:52 +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 e7Q43BvYvAKn for ; Mon, 13 Jul 2020 18:47:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.xes-mad.com (xes-mad.com [162.248.234.2]) by whitealder.osuosl.org (Postfix) with ESMTPS id 620F6887B0 for ; Mon, 13 Jul 2020 18:47:52 +0000 (UTC) Received: from asierra1.xes-mad.com (asierra1.xes-mad.com [10.52.16.65]) by mail.xes-mad.com (Postfix) with ESMTP id C3A11202AF; Mon, 13 Jul 2020 13:47:51 -0500 (CDT) From: Aaron Sierra To: buildroot@buildroot.org Date: Mon, 13 Jul 2020 13:47:50 -0500 Message-Id: <20200713184751.23534-2-asierra@xes-inc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200713184751.23534-1-asierra@xes-inc.com> References: <20200713184751.23534-1-asierra@xes-inc.com> Subject: [Buildroot] [PATCH RESEND 1/2] package/x11r7/xapp_mkfontscale: support bzip2 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: , Cc: Bernd Kuhls , Jordan Speicher MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Support bzip2 compression for PCF fonts, since gzip is not reproducible due to its use of -N/--name by default. Signed-off-by: Aaron Sierra --- package/x11r7/xapp_mkfontscale/Config.in | 1 + package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in index d0a9d89658..02eff4f9f1 100644 --- a/package/x11r7/xapp_mkfontscale/Config.in +++ b/package/x11r7/xapp_mkfontscale/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE bool "mkfontscale" + select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBFONTENC diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index 11d9cc952f..96cde6b942 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -9,9 +9,11 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_LICENSE = MIT XAPP_MKFONTSCALE_LICENSE_FILES = COPYING -XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto +XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2 +XAPP_MKFONTSCALE_DEPENDENCIES = bzip2 zlib freetype xlib_libfontenc xorgproto +HOST_XAPP_MKFONTSCALE_CONF_OPTS = --with-bzip2 HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \ - host-zlib host-freetype host-xlib_libfontenc host-xorgproto + host-bzip2 host-zlib host-freetype host-xlib_libfontenc host-xorgproto $(eval $(autotools-package)) $(eval $(host-autotools-package))