From patchwork Tue Mar 19 06:55:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Schonken X-Patchwork-Id: 228921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 82D242C00AE for ; Tue, 19 Mar 2013 17:55:34 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 13FD3A023F; Tue, 19 Mar 2013 06:55:33 +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 lGtR3wqLjeU8; Tue, 19 Mar 2013 06:55:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 012E1A0194; Tue, 19 Mar 2013 06:55:28 +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 7725B8F79A for ; Tue, 19 Mar 2013 06:55:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D7A1E8CF13 for ; Tue, 19 Mar 2013 06:55:25 +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 sb+qwmuJXQwg for ; Tue, 19 Mar 2013 06:55:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by whitealder.osuosl.org (Postfix) with ESMTPS id 057C68B1E1 for ; Tue, 19 Mar 2013 06:55:23 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id 8so84157wgl.30 for ; Mon, 18 Mar 2013 23:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=29EUT9dz43aoHp5FhkivXOfPEFt8MH5n6FPc372Q9qA=; b=ZFfTOPOti9FW1iRG7WOrAuPdYcd9MrZ9NpNrBcI5SF1wsnhxbO7uxGNONDeLlWM/xK fk6VPCdFOQ6utMA1TuA746ncfS2I9YA/TaVlJwg0ZXC4oPLFKFp0KzyRCknTDNdG10yU PCr2axanPI0yZLDlqg6RpflkzGzzJY3k6oeD+Beha55ds2uvjhdiPKPXvXIrqlbv+zd+ zYFHTeFyuFqYZQwigRz1E0EcExVSIZ6iaSQ7KoxmPqZbBrqaWhdalkqttuib3n20BNzB IpHFGhoY9Hmt3F3b6eaItJimibLoJ1KEwEYmkij7m4EtQr5BfyCd/FWojl5JCgzFrfga wAwA== X-Received: by 10.180.101.41 with SMTP id fd9mr1025141wib.20.1363676122008; Mon, 18 Mar 2013 23:55:22 -0700 (PDT) Received: from incognito-desktop.nomad.org (41-135-144-50.dsl.mweb.co.za. [41.135.144.50]) by mx.google.com with ESMTPS id fv2sm19340880wib.6.2013.03.18.23.55.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Mar 2013 23:55:21 -0700 (PDT) From: Olivier Schonken To: buildroot@busybox.net Date: Tue, 19 Mar 2013 08:55:16 +0200 Message-Id: <1363676117-5103-1-git-send-email-olivier.schonken@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362243769-8714-1-git-send-email-olivier.schonken@gmail.com> References: <1362243769-8714-1-git-send-email-olivier.schonken@gmail.com> Cc: Olivier Schonken Subject: [Buildroot] [PATCHv5] Added package HPLIP for printing to HP printers 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 HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed solution for printing, scanning, and faxing with HP inkjet and laser based printers in Linux. Signed-off-by: Olivier Schonken --- Changelog: The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even with the modified Makefile.am for a succesful build. Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus dependency Baruch. Added Licensing information Updated version to most recent 3.13.3 Fixed download site link (Trailing slash was breaking it) Removed trailing whitespaces Added check for C++ enabled compiler in Config.in Updated hplip-fix-make.patch for newer version package/Config.in | 1 + package/hplip/Config.in | 17 +++++++++ package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++ package/hplip/hplip.mk | 53 ++++++++++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 package/hplip/Config.in create mode 100644 package/hplip/hplip-fix-make.patch create mode 100644 package/hplip/hplip.mk diff --git a/package/Config.in b/package/Config.in index a65054c..24caba0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -632,6 +632,7 @@ source "package/connman/Config.in" source "package/ctorrent/Config.in" source "package/conntrack-tools/Config.in" source "package/cups/Config.in" +source "package/hplip/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/dhcp/Config.in" endif diff --git a/package/hplip/Config.in b/package/hplip/Config.in new file mode 100644 index 0000000..551e9c4 --- /dev/null +++ b/package/hplip/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HPLIP + bool "hplip" + depends on BR2_PACKAGE_CUPS + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_JPEG + help + HP Linux Imaging and Printing (HPLIP) + HPLIP is an HP-developed solution for printing, scanning, and faxing + with HP inkjet and laser based printers in Linux. The HPLIP project + provides printing support for 2,211 printer models, including + Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business + Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP. + + http://hplipopensource.com/ + +comment "hplip requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch new file mode 100644 index 0000000..b26277d --- /dev/null +++ b/package/hplip/hplip-fix-make.patch @@ -0,0 +1,74 @@ +From 6019d012246578ae1a191d3510284e7b894fb528 Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Sat, 2 Mar 2013 18:01:03 +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(-) + +diff --git a/Makefile.am b/Makefile.am +index 16ea902..b22f46a 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 + 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) + endif + + # ui (qt3) +@@ -564,26 +564,26 @@ endif + + install-dist_hplip_LogDATA: + if FULL_BUILD +- test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +- chmod 775 $(DESTDIR)$(hplip_Logdir) ++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++# chmod 775 $(DESTDIR)$(hplip_Logdir) + endif #FULL_BUILD + if HPLIP_BUILD +- test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +- chmod 775 $(DESTDIR)$(hplip_Logdir) ++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++# chmod 775 $(DESTDIR)$(hplip_Logdir) + endif #FULL_BUILD + + install-dist_hplip_tmpDATA: + if FULL_BUILD +- test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +- chmod 1775 $(DESTDIR)$(hplip_tmpdir) ++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) ++# chmod 1775 $(DESTDIR)$(hplip_tmpdir) + endif #FULL_BUILD + if HPLIP_BUILD +- test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) +- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +- chmod 1775 $(DESTDIR)$(hplip_tmpdir) ++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) ++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) ++# chmod 1775 $(DESTDIR)$(hplip_tmpdir) + endif #FULL_BUILD + + install-dist_cronDATA:$(dist_cron_DATA) +-- +1.7.10.4 + diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk new file mode 100644 index 0000000..6944f50 --- /dev/null +++ b/package/hplip/hplip.mk @@ -0,0 +1,53 @@ +############################################################# +# +# hplip +# +############################################################# + +HPLIP_VERSION = 3.13.3 +HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip +HPLIP_AUTORECONF = YES +HPLIP_DEPENDENCIES = cups libusb jpeg +HPLIP_LICENSE = GPLv2 BSD-3c MIT +HPLIP_LICENSE_FILES = COPYING + +HPLIP_CONF_OPT = \ + --disable-qt4 \ + --disable-scan-build \ + --disable-gui-build \ + --disable-doc-build \ + --disable-network-build \ + --enable-hpcups-install \ + --disable-hpijs-install \ + --enable-cups-ppd-install \ + --enable-cups-drv-install \ + --disable-foomatic-ppd-install \ + --disable-foomatic-drv-install \ + --disable-foomatic-rip-hplip-install \ + --enable-new-hpcups \ + --enable-lite-build \ + --with-sysroot=$(STAGING_DIR) \ + --includedir=$(STAGING_DIR)/usr/include + +ifeq ($(BR2_PACKAGE_DBUS),y) + HPLIP_CONF_OPT += --enable-dbus-build + HPLIP_DEPENDENCIES += dbus +else + HPLIP_CONF_OPT += --disable-dbus-build +endif + +define HPLIP_POST_INSTALL_TARGET_FIXUP + mkdir -p $(TARGET_DIR)/usr/share/hplip/data/models + cp $(@D)/data/models/* $(TARGET_DIR)/usr/share/hplip/data/models +endef +HPLIP_POST_INSTALL_TARGET_HOOKS += HPLIP_POST_INSTALL_TARGET_FIXUP + +define HPLIP_PRE_CONFIGURE_FIXUP + touch $(@D)/AUTHORS + touch $(@D)/ChangeLog + touch $(@D)/NEWS + touch $(@D)/README +endef +HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP + +$(eval $(autotools-package))