* [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers
@ 2013-03-02 17:02 Olivier Schonken
2013-03-03 18:07 ` Thomas Petazzoni
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Olivier Schonken @ 2013-03-02 17:02 UTC (permalink / raw)
To: buildroot
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 <olivier.schonken@gmail.com>
---
package/cups/Config.in | 1 +
package/hplip/Config.in | 13 ++++++
package/hplip/hplip-fix-make.patch | 80 ++++++++++++++++++++++++++++++++++++
package/hplip/hplip.mk | 52 +++++++++++++++++++++++
4 files changed, 146 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/cups/Config.in b/package/cups/Config.in
index dc1c2ed..7b703ff 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -18,4 +18,5 @@ config BR2_PACKAGE_CUPS_PDFTOPS
comment "pdftops support requires a toolchain with C++ support enabled"
depends on !BR2_INSTALL_LIBSTDCPP
+source "package/hplip/Config.in"
endif
diff --git a/package/hplip/Config.in b/package/hplip/Config.in
new file mode 100644
index 0000000..b0d802a
--- /dev/null
+++ b/package/hplip/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_HPLIP
+ bool "hplip"
+ select BR2_PACKAGE_LIBUSB
+ 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/
+
diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
new file mode 100644
index 0000000..339e58e
--- /dev/null
+++ b/package/hplip/hplip-fix-make.patch
@@ -0,0 +1,80 @@
+From 1e03ca316a3784290b489470b16c34b7f44a0c75 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Sat, 2 Mar 2013 18:01:03 +0200
+Subject: [PATCH] Changed Makefile.am and Makefile.in to allow
+ cross-compilation of HPLIP
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ Makefile.am | 4 ++--
+ Makefile.in | 16 ++--------------
+ 2 files changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 16ea902..00ec8da 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)/usr/include/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)/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+ endif
+
+ # ui (qt3)
+diff --git a/Makefile.in b/Makefile.in
+index e8e6142..5d9c331 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -4314,7 +4314,7 @@ cups_drv = prnt/drv/hpcups.drv
+
+ # hpmud library
+ @HPLIP_BUILD_TRUE at MUDNAME = hpmud
+- at HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE at libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
++ at HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE at libhpmud_la_CFLAGS = -I$(includedir)/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE at libhpmud_la_CFLAGS = -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE at libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \
+ @HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE@ io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \
+@@ -4504,7 +4504,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at hpmudext_la_LDFLAGS = -module -avoid-version
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at hpmudext_la_SOURCES = io/mudext/hpmudext.c
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE at hpmudext_la_LIBADD = libhpmud.la
+- at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE at hpmudext_la_CFLAGS = -I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
++ at FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_FALSE at hpmudext_la_CFLAGS = -I$(includedir)/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
+ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@LIBUSB01_BUILD_TRUE at hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+
+ # ui (qt3)
+@@ -8865,20 +8865,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-cupsdrv2DATA \
+
+
+ install-dist_hplip_LogDATA:
+- at FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+- at FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+- at FULL_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir)
+- at HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+- at HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+- at HPLIP_BUILD_TRUE@ chmod 777 $(DESTDIR)$(hplip_Logdir)
+
+ install-dist_hplip_tmpDATA:
+- at FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+- at FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+- at FULL_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir)
+- at HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
+- at HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+- at HPLIP_BUILD_TRUE@ chmod 1777 $(DESTDIR)$(hplip_tmpdir)
+
+ install-dist_cronDATA:$(dist_cron_DATA)
+ test -z "$(DESTDIR)$(crondir)" || $(MKDIR_P) "$(DESTDIR)$(crondir)"; \
+--
+1.7.10.4
+
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
new file mode 100644
index 0000000..03fb514
--- /dev/null
+++ b/package/hplip/hplip.mk
@@ -0,0 +1,52 @@
+#############################################################
+#
+# hplip
+#
+#############################################################
+HPLIP_VERSION = 3.12.11
+HPLIP_SITE = http://prdownloads.sourceforge.net/hplip/hplip/
+HPLIP_SOURCE = hplip-$(HPLIP_VERSION).tar.gz
+HPLIP_INSTALL_STAGING = NO
+HPLIP_LIBTOOL_PATCH = YES
+HPLIP_AUTORECONF = NO
+
+#HPLIP_CONF_ENV += \
+# ac_cv_prog_ac_ct_STRIP=arm-none-linux-gnueabi-strip
+
+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)
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+ HPLIP_CONF_OPT += --enable-dbus-build
+endif
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ HPLIP_CONF_OPT += --disable-shared
+else
+ HPLIP_CONF_OPT += --enable-shared
+endif
+
+HPLIP_DEPENDENCIES = cups libusb
+
+
+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
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers
2013-03-02 17:02 [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers Olivier Schonken
@ 2013-03-03 18:07 ` Thomas Petazzoni
2013-03-03 21:26 ` [Buildroot] [PATCHv2] " Olivier Schonken
2013-03-15 18:27 ` [Buildroot] [PATCHv4] " Olivier Schonken
2013-03-19 6:55 ` [Buildroot] [PATCHv5] " Olivier Schonken
2 siblings, 1 reply; 10+ messages in thread
From: Thomas Petazzoni @ 2013-03-03 18:07 UTC (permalink / raw)
To: buildroot
Dear Olivier Schonken,
On Sat, 2 Mar 2013 19:02:49 +0200, Olivier Schonken wrote:
> 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.
The commit log should be wrapped at ~80 columns.
> diff --git a/package/cups/Config.in b/package/cups/Config.in
> index dc1c2ed..7b703ff 100644
> --- a/package/cups/Config.in
> +++ b/package/cups/Config.in
> @@ -18,4 +18,5 @@ config BR2_PACKAGE_CUPS_PDFTOPS
> comment "pdftops support requires a toolchain with C++ support enabled"
> depends on !BR2_INSTALL_LIBSTDCPP
>
> +source "package/hplip/Config.in"
> endif
No, I think the package should still be included from package/Config.in
like all other packages, but maybe it can carry a "depends on
BR2_PACKAGE_CUPS" in package/hplip/Config.in. I guess we can assume
that the person who wants the HP printer drivers will know that CUPS
should be enabled.
> diff --git a/package/hplip/Config.in b/package/hplip/Config.in
> new file mode 100644
> index 0000000..b0d802a
> --- /dev/null
> +++ b/package/hplip/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_HPLIP
> + bool "hplip"
> + select BR2_PACKAGE_LIBUSB
> + 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/
> +
> diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
> new file mode 100644
> index 0000000..339e58e
> --- /dev/null
> +++ b/package/hplip/hplip-fix-make.patch
> @@ -0,0 +1,80 @@
> +From 1e03ca316a3784290b489470b16c34b7f44a0c75 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken@gmail.com>
> +Date: Sat, 2 Mar 2013 18:01:03 +0200
> +Subject: [PATCH] Changed Makefile.am and Makefile.in to allow
> + cross-compilation of HPLIP
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> +---
> + Makefile.am | 4 ++--
> + Makefile.in | 16 ++--------------
> + 2 files changed, 4 insertions(+), 16 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 16ea902..00ec8da 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)/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\"
You should make this -I$(includedir)/libusb-1.0
> + 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)/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR)
Ditto, -I$(includedir)/libusb-1.0
> + endif
> +
> + # ui (qt3)
> +diff --git a/Makefile.in b/Makefile.in
> +index e8e6142..5d9c331 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
You are patching both Makefile.am and Makefile.in. Normally, we prefer
to patch Makefile.am and do HPLIP_AUTORECONF=YES. Have you tried that?
Have you had issues in doing this?
> diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
> new file mode 100644
> index 0000000..03fb514
> --- /dev/null
> +++ b/package/hplip/hplip.mk
> @@ -0,0 +1,52 @@
> +#############################################################
> +#
> +# hplip
> +#
> +#############################################################
One blank line between header and first variable.
> +HPLIP_VERSION = 3.12.11
> +HPLIP_SITE = http://prdownloads.sourceforge.net/hplip/hplip/
Please use http://downloads.sourceforge.net instead (see other
packages).
> +HPLIP_SOURCE = hplip-$(HPLIP_VERSION).tar.gz
Not needed, that's the default.
> +HPLIP_INSTALL_STAGING = NO
> +HPLIP_LIBTOOL_PATCH = YES
> +HPLIP_AUTORECONF = NO
All those values are the default, so they are unneeded. However, if
possible, make your patch only on Makefile.am and do
HPLIP_AUTORECONF = YES.
> +
> +#HPLIP_CONF_ENV += \
> +# ac_cv_prog_ac_ct_STRIP=arm-none-linux-gnueabi-strip
Please remove such dead code.
> +
> +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) \
Why is this needed?
> + --includedir=$(STAGING_DIR)
Remove this --includedir, once you make the modification I suggested
above (-I$(includedir)/libusb-1.0), it should no longer be needed to
pass a custom --incluedir.
Also, that's nitpicking, but we usually prefer the following formatting:
HPLIP_CONF_OPT = \
--enable-foo \
--disable-bar \
--with-something=foobar
> +
> +ifeq ($(BR2_PACKAGE_DBUS),y)
> + HPLIP_CONF_OPT += --enable-dbus-build
> +endif
Add a:
else
HPLIP_CONFIG_OPT += --disable-dbus-build
endif
> +
> +ifeq ($(BR2_PREFER_STATIC_LIB),y)
> + HPLIP_CONF_OPT += --disable-shared
> +else
> + HPLIP_CONF_OPT += --enable-shared
> +endif
Not needed, already passed by the autotools package infrastructure.
> +
> +HPLIP_DEPENDENCIES = cups libusb
> +
> +
> +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
Please fix the indentation here, it should be one tab.
> +HPLIP_POST_INSTALL_TARGET_HOOKS += HPLIP_POST_INSTALL_TARGET_FIXUP
> +
> +$(eval $(autotools-package))
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv2] Added package HPLIP for printing to HP printers
2013-03-03 18:07 ` Thomas Petazzoni
@ 2013-03-03 21:26 ` Olivier Schonken
2013-03-04 8:41 ` Baruch Siach
0 siblings, 1 reply; 10+ messages in thread
From: Olivier Schonken @ 2013-03-03 21:26 UTC (permalink / raw)
To: buildroot
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.
The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
with the modified Makefile.am for a succesful build.
Created a menu for cups related components to be kept close together.
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 3 ++
package/hplip/Config.in | 13 +++++++
package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++
package/hplip/hplip.mk | 53 ++++++++++++++++++++++++++
4 files changed, 143 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 8a02506..646dd68 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -627,7 +627,10 @@ source "package/can-utils/Config.in"
source "package/connman/Config.in"
source "package/ctorrent/Config.in"
source "package/conntrack-tools/Config.in"
+menu "cups (common unix printing system)"
source "package/cups/Config.in"
+source "package/hplip/Config.in"
+endmenu #cups
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..b0d802a
--- /dev/null
+++ b/package/hplip/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_HPLIP
+ bool "hplip"
+ select BR2_PACKAGE_LIBUSB
+ 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/
+
diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
new file mode 100644
index 0000000..8f4aab5
--- /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 <olivier.schonken@gmail.com>
+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 <olivier.schonken@gmail.com>
+---
+ 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)
+@@ -551,26 +551,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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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..bb57007
--- /dev/null
+++ b/package/hplip/hplip.mk
@@ -0,0 +1,53 @@
+#############################################################
+#
+# hplip
+#
+#############################################################
+
+HPLIP_VERSION = 3.12.11
+HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip/
+HPLIP_AUTORECONF = YES
+
+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
+else
+ HPLIP_CONF_OPT += --disable-dbus-build
+endif
+
+HPLIP_DEPENDENCIES = cups libusb
+
+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)/CHANGES
+ touch $(@D)/NEWS
+ touch $(@D)/README
+endef
+HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP
+
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv2] Added package HPLIP for printing to HP printers
2013-03-03 21:26 ` [Buildroot] [PATCHv2] " Olivier Schonken
@ 2013-03-04 8:41 ` Baruch Siach
2013-03-13 19:36 ` [Buildroot] [PATCHv3] " Olivier Schonken
0 siblings, 1 reply; 10+ messages in thread
From: Baruch Siach @ 2013-03-04 8:41 UTC (permalink / raw)
To: buildroot
Hi Olivier,
On Sun, Mar 03, 2013 at 11:26:50PM +0200, Olivier Schonken wrote:
> 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.
>
> The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
> with the modified Makefile.am for a succesful build.
>
> Created a menu for cups related components to be kept close together.
>
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
[...]
> +config BR2_PACKAGE_HPLIP
> + bool "hplip"
> + select BR2_PACKAGE_LIBUSB
Also select BR2_PACKAGE_CUPS, since it is listed as dependency below. Remember
to also depend on dbus' dependencies.
[...]
> +ifeq ($(BR2_PACKAGE_DBUS),y)
> + HPLIP_CONF_OPT += --enable-dbus-build
Add 'HPLIP_DEPENDENCIES += dbus', and make sure you do not override this
assignment below.
> +else
> + HPLIP_CONF_OPT += --disable-dbus-build
> +endif
> +
> +HPLIP_DEPENDENCIES = cups libusb
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv3] Added package HPLIP for printing to HP printers
2013-03-04 8:41 ` Baruch Siach
@ 2013-03-13 19:36 ` Olivier Schonken
2013-03-15 9:47 ` Thomas Petazzoni
0 siblings, 1 reply; 10+ messages in thread
From: Olivier Schonken @ 2013-03-13 19:36 UTC (permalink / raw)
To: buildroot
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.
The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
with the modified Makefile.am for a succesful build.
Created a menu for cups related components to be kept close together.
Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus
dependency Baruch.
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
package/Config.in | 3 ++
package/hplip/Config.in | 15 ++++++++
package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++
package/hplip/hplip.mk | 52 +++++++++++++++++++++++++
4 files changed, 144 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..21c3ec9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -631,7 +631,10 @@ source "package/can-utils/Config.in"
source "package/connman/Config.in"
source "package/ctorrent/Config.in"
source "package/conntrack-tools/Config.in"
+menu "cups (common unix printing system)"
source "package/cups/Config.in"
+source "package/hplip/Config.in"
+endmenu #cups
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..4c673e6
--- /dev/null
+++ b/package/hplip/Config.in
@@ -0,0 +1,15 @@
+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/
+
diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
new file mode 100644
index 0000000..8f4aab5
--- /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 <olivier.schonken@gmail.com>
+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 <olivier.schonken@gmail.com>
+---
+ 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)
+@@ -551,26 +551,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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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..1bfac40
--- /dev/null
+++ b/package/hplip/hplip.mk
@@ -0,0 +1,52 @@
+#############################################################
+#
+# hplip
+#
+#############################################################
+
+HPLIP_VERSION = 3.12.11
+HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip/
+HPLIP_AUTORECONF = YES
+HPLIP_DEPENDENCIES = cups libusb jpeg
+
+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)/CHANGES
+ touch $(@D)/NEWS
+ touch $(@D)/README
+endef
+HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv3] Added package HPLIP for printing to HP printers
2013-03-13 19:36 ` [Buildroot] [PATCHv3] " Olivier Schonken
@ 2013-03-15 9:47 ` Thomas Petazzoni
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Petazzoni @ 2013-03-15 9:47 UTC (permalink / raw)
To: buildroot
Dear Olivier Schonken,
On Wed, 13 Mar 2013 21:36:08 +0200, Olivier Schonken wrote:
> 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.
>
> The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
> with the modified Makefile.am for a succesful build.
>
> Created a menu for cups related components to be kept close together.
>
> Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus
> dependency Baruch.
The "changelog" shouldn't go in the commit log, but instead...
>
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
> ---
... here. Otherwise, it gets committed and kept in the project history,
which doesn't make much sense.
> new file mode 100644
> index 0000000..1bfac40
> --- /dev/null
> +++ b/package/hplip/hplip.mk
> @@ -0,0 +1,52 @@
> +#############################################################
> +#
> +# hplip
> +#
> +#############################################################
> +
> +HPLIP_VERSION = 3.12.11
> +HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip/
> +HPLIP_AUTORECONF = YES
> +HPLIP_DEPENDENCIES = cups libusb jpeg
You should add HPLIP_LICENSE and HPLIP_LICENSE_FILES here.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv4] Added package HPLIP for printing to HP printers
2013-03-02 17:02 [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers Olivier Schonken
2013-03-03 18:07 ` Thomas Petazzoni
@ 2013-03-15 18:27 ` Olivier Schonken
2013-03-18 20:19 ` Peter Korsgaard
2013-03-19 6:55 ` [Buildroot] [PATCHv5] " Olivier Schonken
2 siblings, 1 reply; 10+ messages in thread
From: Olivier Schonken @ 2013-03-15 18:27 UTC (permalink / raw)
To: buildroot
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 <olivier.schonken@gmail.com>
---
Changelog:
The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
with the modified Makefile.am for a succesful build.
Created a menu for cups related components to be kept close together.
Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus
dependency Baruch.
Added Licensing information
package/Config.in | 3 ++
package/hplip/Config.in | 15 ++++++++
package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++
package/hplip/hplip.mk | 54 ++++++++++++++++++++++++++
4 files changed, 146 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..21c3ec9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -631,7 +631,10 @@ source "package/can-utils/Config.in"
source "package/connman/Config.in"
source "package/ctorrent/Config.in"
source "package/conntrack-tools/Config.in"
+menu "cups (common unix printing system)"
source "package/cups/Config.in"
+source "package/hplip/Config.in"
+endmenu #cups
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..4c673e6
--- /dev/null
+++ b/package/hplip/Config.in
@@ -0,0 +1,15 @@
+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/
+
diff --git a/package/hplip/hplip-fix-make.patch b/package/hplip/hplip-fix-make.patch
new file mode 100644
index 0000000..8f4aab5
--- /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 <olivier.schonken@gmail.com>
+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 <olivier.schonken@gmail.com>
+---
+ 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)
+@@ -551,26 +551,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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 777 $(DESTDIR)$(hplip_Logdir)
++# test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
++# chmod 777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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 1777 $(DESTDIR)$(hplip_tmpdir)
++# test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
++# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
++# chmod 1777 $(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..2d62392
--- /dev/null
+++ b/package/hplip/hplip.mk
@@ -0,0 +1,54 @@
+#############################################################
+#
+# hplip
+#
+#############################################################
+
+HPLIP_VERSION = 3.12.11
+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)/CHANGES
+ touch $(@D)/NEWS
+ touch $(@D)/README
+endef
+HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP
+
+$(eval $(autotools-package))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv4] Added package HPLIP for printing to HP printers
2013-03-15 18:27 ` [Buildroot] [PATCHv4] " Olivier Schonken
@ 2013-03-18 20:19 ` Peter Korsgaard
0 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2013-03-18 20:19 UTC (permalink / raw)
To: buildroot
>>>>> "O" == Olivier Schonken <olivier.schonken@gmail.com> writes:
O> HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed
O> solution for printing, scanning, and faxing with HP inkjet and laser
O> based printers in Linux.
O> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
O> ---
O> Changelog:
O> The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
O> with the modified Makefile.am for a succesful build.
O> Created a menu for cups related components to be kept close together.
O> Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus
O> dependency Baruch.
O> Added Licensing information
O> package/Config.in | 3 ++
O> package/hplip/Config.in | 15 ++++++++
O> package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++
O> package/hplip/hplip.mk | 54 ++++++++++++++++++++++++++
O> 4 files changed, 146 insertions(+)
O> create mode 100644 package/hplip/Config.in
O> create mode 100644 package/hplip/hplip-fix-make.patch
O> create mode 100644 package/hplip/hplip.mk
O> diff --git a/package/Config.in b/package/Config.in
O> index a65054c..21c3ec9 100644
O> --- a/package/Config.in
O> +++ b/package/Config.in
O> @@ -631,7 +631,10 @@ source "package/can-utils/Config.in"
O> source "package/connman/Config.in"
O> source "package/ctorrent/Config.in"
O> source "package/conntrack-tools/Config.in"
O> +menu "cups (common unix printing system)"
O> source "package/cups/Config.in"
O> +source "package/hplip/Config.in"
O> +endmenu #cups
With only a single sub package I don't think the menu makes sense (but
keep hplip right after cups).
O> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
O> source "package/dhcp/Config.in"
O> endif
O> diff --git a/package/hplip/Config.in b/package/hplip/Config.in
O> new file mode 100644
O> index 0000000..4c673e6
O> --- /dev/null
O> +++ b/package/hplip/Config.in
O> @@ -0,0 +1,15 @@
O> +config BR2_PACKAGE_HPLIP
O> + bool "hplip"
O> + depends on BR2_PACKAGE_CUPS
O> + select BR2_PACKAGE_LIBUSB
O> + select BR2_PACKAGE_JPEG
It needs atleast C++ support as well:
checking whether the C++ compiler works... no
configure: error: in `/home/peko/source/buildroot/output/build/hplip-3.12.11':
configure: error: C++ compiler cannot create executables
See `config.log' for more details
Please check with a minimal build to ensure you have all dependencies.
O> + help
O> + HP Linux Imaging and Printing (HPLIP)
O> + HPLIP is an HP-developed solution for printing, scanning, and faxing
O> + with HP inkjet and laser based printers in Linux. The HPLIP project
O> + provides printing support for 2,211 printer models, including
O> + Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business
O> + Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
O> +
O> + http://hplipopensource.com/
O> +
You have a number of trailing spaces and an extra empty line at the
bottom here.
O> diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
O> new file mode 100644
O> index 0000000..2d62392
O> --- /dev/null
O> +++ b/package/hplip/hplip.mk
O> @@ -0,0 +1,54 @@
O> +#############################################################
O> +#
O> +# hplip
O> +#
O> +#############################################################
O> +
O> +HPLIP_VERSION = 3.12.11
Latest version is 3.13.3. Any reason why you are not using that?
O> +HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip/
That URL doesn't work. It seems like it should be:
http://prdownloads.sourceforge.net/hplip/
O> +HPLIP_AUTORECONF = YES
O> +HPLIP_DEPENDENCIES = cups libusb jpeg
O> +HPLIP_LICENSE = GPLv2 BSD-3c MIT
O> +HPLIP_LICENSE_FILES = COPYING
O> +
O> +HPLIP_CONF_OPT = \
O> + --disable-qt4 \
O> + --disable-scan-build \
O> + --disable-gui-build \
O> + --disable-doc-build \
O> + --disable-network-build \
O> + --enable-hpcups-install \
O> + --disable-hpijs-install \
O> + --enable-cups-ppd-install \
O> + --enable-cups-drv-install \
O> + --disable-foomatic-ppd-install \
O> + --disable-foomatic-drv-install \
O> + --disable-foomatic-rip-hplip-install \
O> + --enable-new-hpcups \
O> + --enable-lite-build \
O> + --with-sysroot=$(STAGING_DIR) \
O> + --includedir=$(STAGING_DIR)/usr/include
We do have qt4, sane, polkit and python in buildroot, so optional
support for these would be nice (but isn't essential).
O> +
O> +ifeq ($(BR2_PACKAGE_DBUS),y)
O> + HPLIP_CONF_OPT += --enable-dbus-build
O> + HPLIP_DEPENDENCIES += dbus
O> +else
O> + HPLIP_CONF_OPT += --disable-dbus-build
O> +endif
Again trailing spaces for both.
O> +
O> +define HPLIP_POST_INSTALL_TARGET_FIXUP
O> + mkdir -p $(TARGET_DIR)/usr/share/hplip/data/models
O> + cp $(@D)/data/models/* $(TARGET_DIR)/usr/share/hplip/data/models
O> +endef
O> +HPLIP_POST_INSTALL_TARGET_HOOKS += HPLIP_POST_INSTALL_TARGET_FIXUP
O> +
O> +define HPLIP_PRE_CONFIGURE_FIXUP
O> + touch $(@D)/AUTHORS
O> + touch $(@D)/ChangeLog
O> + touch $(@D)/CHANGES
O> + touch $(@D)/NEWS
O> + touch $(@D)/README
O> +endef
O> +HPLIP_PRE_CONFIGURE_HOOKS += HPLIP_PRE_CONFIGURE_FIXUP
As far as I can see CHANGES isn't needed. It would be good with a
comment explaining why it is needed (missing from tarball but needed to
autoreconf).
Care to fix these issues and resend?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv5] Added package HPLIP for printing to HP printers
2013-03-02 17:02 [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers Olivier Schonken
2013-03-03 18:07 ` Thomas Petazzoni
2013-03-15 18:27 ` [Buildroot] [PATCHv4] " Olivier Schonken
@ 2013-03-19 6:55 ` Olivier Schonken
2013-03-19 12:08 ` Peter Korsgaard
2 siblings, 1 reply; 10+ messages in thread
From: Olivier Schonken @ 2013-03-19 6:55 UTC (permalink / raw)
To: buildroot
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 <olivier.schonken@gmail.com>
---
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 <olivier.schonken@gmail.com>
+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 <olivier.schonken@gmail.com>
+---
+ 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))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Buildroot] [PATCHv5] Added package HPLIP for printing to HP printers
2013-03-19 6:55 ` [Buildroot] [PATCHv5] " Olivier Schonken
@ 2013-03-19 12:08 ` Peter Korsgaard
0 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2013-03-19 12:08 UTC (permalink / raw)
To: buildroot
>>>>> "Olivier" == Olivier Schonken <olivier.schonken@gmail.com> writes:
Olivier> HPLIP (Hewlett-Packard Linux Imaging & Printing) is an HP-developed solution
Olivier> for printing, scanning, and faxing with HP inkjet and laser based printers
Olivier> in Linux.
Olivier> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Olivier> ---
Olivier> Changelog:
Olivier> The --includedir=$(STAGING_DIR)/usr/include is unfortunately necessary even
Olivier> with the modified Makefile.am for a succesful build.
Olivier> Fixed a jpeg and dbus dependencies, Thanks for pointing out the dbus
Olivier> dependency Baruch.
Olivier> Added Licensing information
Olivier> Updated version to most recent 3.13.3
Olivier> Fixed download site link (Trailing slash was breaking it)
Olivier> Removed trailing whitespaces
Olivier> Added check for C++ enabled compiler in Config.in
Olivier> Updated hplip-fix-make.patch for newer version
Olivier> package/Config.in | 1 +
Olivier> package/hplip/Config.in | 17 +++++++++
Olivier> package/hplip/hplip-fix-make.patch | 74 ++++++++++++++++++++++++++++++++++++
Olivier> package/hplip/hplip.mk | 53 ++++++++++++++++++++++++++
Olivier> 4 files changed, 145 insertions(+)
Olivier> create mode 100644 package/hplip/Config.in
Olivier> create mode 100644 package/hplip/hplip-fix-make.patch
Olivier> create mode 100644 package/hplip/hplip.mk
Olivier> diff --git a/package/Config.in b/package/Config.in
Olivier> index a65054c..24caba0 100644
Olivier> --- a/package/Config.in
Olivier> +++ b/package/Config.in
Olivier> @@ -632,6 +632,7 @@ source "package/connman/Config.in"
Olivier> source "package/ctorrent/Config.in"
Olivier> source "package/conntrack-tools/Config.in"
Olivier> source "package/cups/Config.in"
Olivier> +source "package/hplip/Config.in"
Olivier> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
Olivier> source "package/dhcp/Config.in"
Olivier> endif
Olivier> diff --git a/package/hplip/Config.in b/package/hplip/Config.in
Olivier> new file mode 100644
Olivier> index 0000000..551e9c4
Olivier> --- /dev/null
Olivier> +++ b/package/hplip/Config.in
Olivier> @@ -0,0 +1,17 @@
Olivier> +config BR2_PACKAGE_HPLIP
Olivier> + bool "hplip"
Olivier> + depends on BR2_PACKAGE_CUPS
Olivier> + select BR2_PACKAGE_LIBUSB
Olivier> + select BR2_PACKAGE_JPEG
Olivier> + help
Olivier> + HP Linux Imaging and Printing (HPLIP)
Olivier> + HPLIP is an HP-developed solution for printing, scanning, and faxing
Olivier> + with HP inkjet and laser based printers in Linux. The HPLIP project
Olivier> + provides printing support for 2,211 printer models, including
Olivier> + Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business
Olivier> + Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
Olivier> +
You have some trailing spaces here.
Committed with that fixed, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-03-19 12:08 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-02 17:02 [Buildroot] [PATCH 1/1] Added package HPLIP for printing to HP printers Olivier Schonken
2013-03-03 18:07 ` Thomas Petazzoni
2013-03-03 21:26 ` [Buildroot] [PATCHv2] " Olivier Schonken
2013-03-04 8:41 ` Baruch Siach
2013-03-13 19:36 ` [Buildroot] [PATCHv3] " Olivier Schonken
2013-03-15 9:47 ` Thomas Petazzoni
2013-03-15 18:27 ` [Buildroot] [PATCHv4] " Olivier Schonken
2013-03-18 20:19 ` Peter Korsgaard
2013-03-19 6:55 ` [Buildroot] [PATCHv5] " Olivier Schonken
2013-03-19 12:08 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox