From patchwork Wed Jan 20 22:17:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Schonken X-Patchwork-Id: 570935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 62EA0140C05 for ; Thu, 21 Jan 2016 09:18:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=V/GuiP9u; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A308193743; Wed, 20 Jan 2016 22:18:25 +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 Eybaqs-5KoVp; Wed, 20 Jan 2016 22:18:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AB00F938E2; Wed, 20 Jan 2016 22:18:23 +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 02F3C1BFC09 for ; Wed, 20 Jan 2016 22:18:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CB77986CFD for ; Wed, 20 Jan 2016 22:18:18 +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 CnPRZF1-rDdK for ; Wed, 20 Jan 2016 22:18:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 84F77878B0 for ; Wed, 20 Jan 2016 22:18:16 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id b14so7016449wmb.1 for ; Wed, 20 Jan 2016 14:18:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z5lVKwOCBdNPmqL67tWXklQfPycorweHwNXG2gCCEww=; b=V/GuiP9ue8iGxk6LjICfZNmM76xrnnRfjwWZYICsEE8EXYHbwVKSLHX2u/3D5JnWJO gY1kvdRexTZqOttNQNFey8RzI1y1E594aXFAvQTdayFJ8SuzV8Rg/1ov0kcTCYZiXAnT nVOm6tHnNSYfQONOYUCaqSYqWIJMkeDWLdxZS+V5g6weo0OmLDewjtmNLHxCKK+jY/84 DX/4ZudFaDOxVnq07aGK+J/jqlqKRUeJZNfAuqh7sVkQXYkwmQE90pTxPCrFKkpmTJft cz+TgLWf6Bwus6iUWvJhCuo59LxbNqa4cCgwknOVRMEUCUg2U4T75VKYySa5gojCN3YU KSbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z5lVKwOCBdNPmqL67tWXklQfPycorweHwNXG2gCCEww=; b=dWmWQ2mTYV6jHHfQ7nSR+3v9K5uv0Fs2PVVOHVbh3P8UBA/Z+mvpQmRBxo0Y9rCMYo i2XWqMlyps+5iB0salADINH24LesFliiNhR82B3CmRmdA63OshFjyrPFTm02oNYPUssV 8sQe6JjE8I/IYCai1duMMLvwYuhGE4uUGFzwgx9i1Iikf5zljwV0uSchoBgM7vqMgIlZ htGUpyQmcpvuHvdEGd+XfQwSggLXmiWhtsRaZnEpTWcEFHPz+FkfObAs8/yKB9bNrkDE f2+z5i/3n6txtOHm3Ai2tarvlZJSpQhA0hkhxDQTsvLZBlSR47/0O+Y5hkthbEWhkmar Fq8A== X-Gm-Message-State: ALoCoQn7dw15VGUBXgNN6fhkEDzz888FuzfBIBRQ5J6vAup167LqpbyRS7yvgiPcegQ+ZkWXeWirpV90oS3WFYYc7OU//LiujQ== X-Received: by 10.194.117.68 with SMTP id kc4mr38091038wjb.111.1453328296308; Wed, 20 Jan 2016 14:18:16 -0800 (PST) Received: from olivier-TravelMate.lan ([197.88.153.174]) by smtp.gmail.com with ESMTPSA id q75sm27084546wmd.6.2016.01.20.14.18.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 14:18:15 -0800 (PST) From: Olivier Schonken To: buildroot@busybox.net Date: Thu, 21 Jan 2016 00:17:44 +0200 Message-Id: <1453328267-31962-3-git-send-email-olivier.schonken@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453328267-31962-1-git-send-email-olivier.schonken@gmail.com> References: <1453328267-31962-1-git-send-email-olivier.schonken@gmail.com> Cc: Olivier Schonken Subject: [Buildroot] [PATCH v4 2/5] package/hplip: Un-deprecate and bump version to 3.15.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Signed-off-by: Olivier Schonken --- package/hplip/0001-fix-make.patch | 40 +++++++++++++++++++-------------------- package/hplip/Config.in | 2 -- package/hplip/hplip.hash | 2 +- package/hplip/hplip.mk | 2 +- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/package/hplip/0001-fix-make.patch b/package/hplip/0001-fix-make.patch index da05d03..9105d6f 100644 --- a/package/hplip/0001-fix-make.patch +++ b/package/hplip/0001-fix-make.patch @@ -1,35 +1,35 @@ -From 6019d012246578ae1a191d3510284e7b894fb528 Mon Sep 17 00:00:00 2001 +From c1822a19e75bae8e044cd46a257a234cd9649896 Mon Sep 17 00:00:00 2001 From: Olivier Schonken -Date: Sat, 2 Mar 2013 18:01:03 +0200 +Date: Wed, 20 Jan 2016 23:46:50 +0200 Subject: [PATCH] Changed Makefile.am to allow cross-compilation of HPLIP Signed-off-by: Olivier Schonken --- - Makefile.am | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 16ea902..b22f46a 100644 +index 73fed2e..23aa0ec 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/ - io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ - io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c +@@ -92,7 +92,7 @@ libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c + libhpmud_la_LDFLAGS += -lusb else --libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" -+libhpmud_la_CFLAGS = -I$(includedir)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" - libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ - io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ - io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c -@@ -292,7 +292,7 @@ hpmudext_la_LIBADD = libhpmud.la - if LIBUSB01_BUILD - hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) - else --hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR) -+hpmudext_la_CFLAGS =-I$(includedir)/libusb-1.0 -I$(PYTHONINCLUDEDIR) + libhpmud_la_SOURCES += io/hpmud/musb.c +-libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0 ++libhpmud_la_CFLAGS += -I$(includedir)/libusb-1.0 + libhpmud_la_LDFLAGS += -lusb-1.0 + endif + +@@ -314,7 +314,7 @@ hpmudext_la_LIBADD = libhpmud.la libhpdiscovery.la + hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) -Iprotocol/discovery + + if !LIBUSB01_BUILD +-hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0 ++hpmudext_la_CFLAGS +=-I$(includedir)/libusb-1.0 endif # ui (qt3) -- -1.7.10.4 +2.5.0 diff --git a/package/hplip/Config.in b/package/hplip/Config.in index a8a5f69..7565671 100644 --- a/package/hplip/Config.in +++ b/package/hplip/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_HPLIP bool "hplip" - # because of cups security issues - depends on BR2_DEPRECATED_SINCE_2015_05 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_CUPS depends on BR2_TOOLCHAIN_HAS_THREADS # libusb diff --git a/package/hplip/hplip.hash b/package/hplip/hplip.hash index fb7d4e7..75ff7d3 100644 --- a/package/hplip/hplip.hash +++ b/package/hplip/hplip.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d hplip-3.13.10.tar.gz +sha256 33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d hplip-3.15.11.tar.gz diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk index 2cdddca..aea1f0c 100644 --- a/package/hplip/hplip.mk +++ b/package/hplip/hplip.mk @@ -4,7 +4,7 @@ # ################################################################################ -HPLIP_VERSION = 3.13.10 +HPLIP_VERSION = 3.15.11 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip HPLIP_AUTORECONF = YES HPLIP_DEPENDENCIES = cups libusb jpeg