From patchwork Wed Jun 17 17:28:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311358 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=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=ITcmuXWe; dkim-atps=neutral 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 49nBrJ3cBzz9sTH for ; Thu, 18 Jun 2020 03:29:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 22D7289297; Wed, 17 Jun 2020 17:29:02 +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 kFeev6t7iOa0; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C6E3891DB; Wed, 17 Jun 2020 17:29:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 6BC181BF278 for ; Wed, 17 Jun 2020 17:29:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6908A8750F for ; Wed, 17 Jun 2020 17:29:00 +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 gDZtNgqd4FTz for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5FE4F8741F for ; Wed, 17 Jun 2020 17:28:57 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id l17so2651491wmj.0 for ; Wed, 17 Jun 2020 10:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=ITcmuXWeFaCGoBpXdkwLBjUT9fn6+DJHHzP6G+tfZ7JJb89Iya2Ah+VFkGsFer9L4I ktR0x8tykk7YvqHFI8sAkA+XvbmVjQcnDxexhpUEuLyhHv7GsUgKBnXlWVocjWO0HGvt 10sYD+AW0UjJOH58/6wJoIkxltDXnAgn4YK0o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ppHypeDPY4F/0wF7UCnCCKs+bUvkCtt6n8RLRhRVpi4=; b=N8nAd8kD2fMSdRnYxNhfasgGShYO0BozFhxhdSxAWMHZ8b/E8ZDYerNLvjaL6MUhqQ MBX1UZuH00nZBMHLgGCiIU0NOxUNwnbueBq68oCjMMDBrs2cfO3ftoq8F9ATMWPZIgTU RVX81XtYmb12p7Rzjbtw2ftz+Z/RKUwg1jYIFGtFJ8yEIBUAMycbHfXFgg0X1YROVDdG tdw7MKNhRzI7eJ6gbCWJrouKIVbESDzhy69VIywPL3i3n5N21a7YuYTKhGUSg2h4LmvZ Olt4bLfqkeGnzHL+smdppgA+4k2R+HTivsjWRQDOdgv9S+8FI0IWKjAJtgxt24JnXNdS 263Q== X-Gm-Message-State: AOAM531Lqt9a1Jhvg/BqLEYZPNfxgGXxsApQInI31qUrISVns4zBc7v5 uC5wUcPDANopJl/v0HQQT9QPFhv5DaIVCQ== X-Google-Smtp-Source: ABdhPJxCfu5/wQYG7zKQmX0AbTmT41p69TjkmqAN8dk6vLBUMd/p5jVd0E5UhpeYLVyotiS9trQ+KQ== X-Received: by 2002:a7b:cb4c:: with SMTP id v12mr9470350wmj.43.1592414935314; Wed, 17 Jun 2020 10:28:55 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:54 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:44 +0200 Message-Id: <20200617172848.2601-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/6] package/cups-filters: bump to version 1.27.5 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch bumps cups-filters to version 1.27.5. While bumping, fixing also the missing installation for the service files for cups-browsed. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/cups-filters/Config.in | 3 +++ package/cups-filters/S82cups-browsed | 23 +++++++++++++++++++++++ package/cups-filters/cups-filters.hash | 2 +- package/cups-filters/cups-filters.mk | 20 +++++++++++++++++--- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/cups-filters/S82cups-browsed diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index 9e4e37ca6b..26e8d4aa06 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -8,6 +8,9 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_DEJAVU + select BR2_PACKAGE_DEJAVU_SANS + select BR2_PACKAGE_DEJAVU_SERIF select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE diff --git a/package/cups-filters/S82cups-browsed b/package/cups-filters/S82cups-browsed new file mode 100644 index 0000000000..c73ff1fbfa --- /dev/null +++ b/package/cups-filters/S82cups-browsed @@ -0,0 +1,23 @@ +#!/bin/sh + +case "$1" in + start) + printf "Starting cups-browsed: " + start-stop-daemon -S -q -m -p /var/run/cups-browsed.pid \ + -b -x cups-browsed -- -c /etc/cups/cups-browsed.conf + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + printf "Stopping cups-browsed: " + start-stop-daemon -K -q -p /var/run/cups-browsed.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" + ;; + restart) + "$0" stop + sleep 1 + "$0" start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index 9e24abe393..61cb42a438 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ff8679fcd0c31c25d229262c7ad100ba161ef6b2aa455a2df673dd74ef93f488 cups-filters-1.26.0.tar.gz +sha256 08e4081ce50ce2e620af6e950bdcf64cea2ab4c81ab3c5ea05da25d82ad62db6 cups-filters-1.27.5.tar.gz sha256 527463af65312372111804589a9624f4c52813e253062ae351e75af5003f317f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index 1f17018bc5..20d4c68995 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,12 +4,12 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.26.0 +CUPS_FILTERS_VERSION = 1.27.5 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING -CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg +CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg dejavu CUPS_FILTERS_CONF_OPTS = \ --disable-mutool \ @@ -19,7 +19,10 @@ CUPS_FILTERS_CONF_OPTS = \ --with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \ --with-sysroot=$(STAGING_DIR) \ --with-pdftops=pdftops \ - --with-jpeg + --with-jpeg \ + --with-rcdir=no \ + --with-fontdir=$(STAGING_DIR)/usr/share/fonts/ \ + --with-test-font-path=$(STAGING_DIR)/usr/share/fonts/dejavu/DejaVuSans.ttf ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png @@ -71,4 +74,15 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +define CUPS_FILTERS_INSTALL_INIT_SYSV + @$(RM) $(TARGET_DIR)/etc/init.d/cups-browsed + $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ + $(TARGET_DIR)/etc/init.d/S82cups-browsed +endef + +define CUPS_FILTERS_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0755 $(@D)/utils/cups-browsed.service \ + $(TARGET_DIR)/usr/lib/systemd/system/cups-browsed.service +endef + $(eval $(autotools-package))