Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
From 1eed2b65eff4c66b80eab0ec46c6705de19bdb9d Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 21 Jan 2016 23:54:03 +0100
|
||||
Subject: [PATCH] build: use pkg-config to discover libusb
|
||||
|
||||
This allows to remove hardcoded paths to libusb headers.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makefile.am | 4 ++--
|
||||
configure.in | 3 +--
|
||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 73fed2e..3a4e899 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -92,8 +92,8 @@ libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c
|
||||
libhpmud_la_LDFLAGS += -lusb
|
||||
else
|
||||
libhpmud_la_SOURCES += io/hpmud/musb.c
|
||||
-libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0
|
||||
-libhpmud_la_LDFLAGS += -lusb-1.0
|
||||
+libhpmud_la_CFLAGS += $(LIBUSB_CFLAGS)
|
||||
+libhpmud_la_LDFLAGS += $(LIBUSB_LIBS)
|
||||
endif
|
||||
|
||||
if NETWORK_BUILD
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 3706645..8b06428 100755
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -542,8 +542,7 @@ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
|
||||
AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
|
||||
AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
|
||||
else
|
||||
- AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
|
||||
- AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
|
||||
+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
|
||||
fi
|
||||
fi
|
||||
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From a2de7e834417de68db10dc6f09d5810b06e6cbc8 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 21 Jan 2016 23:54:50 +0100
|
||||
Subject: [PATCH] configure.in: fix AM_INIT_AUTOMAKE call
|
||||
|
||||
Uncomment the appropriate call to AM_INIT_AUTOMAKE so that the
|
||||
"foreign" option is passed, which avoids the need for creating various
|
||||
unneeded files when autoreconfiguring.
|
||||
|
||||
Add the subdir-objects options since the main Makefile.am references
|
||||
files in subdirectories. This allows to silence a huge amount of
|
||||
warning when autoreconfiguring.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
configure.in | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 8b06428..680cad5 100755
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -27,8 +27,7 @@
|
||||
|
||||
#AC_PREREQ(2.59)
|
||||
AC_INIT([HP Linux Imaging and Printing], [3.15.11], [3.15.11], [hplip])
|
||||
-#AM_INIT_AUTOMAKE([1.9 foreign])
|
||||
-AM_INIT_AUTOMAKE
|
||||
+AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
|
||||
AC_DISABLE_STATIC
|
||||
|
||||
# Checks for programs.
|
||||
--
|
||||
2.6.4
|
||||
|
||||
20
deprecated/firmware/buildroot/package/hplip/Config.in
Normal file
20
deprecated/firmware/buildroot/package/hplip/Config.in
Normal file
@@ -0,0 +1,20 @@
|
||||
config BR2_PACKAGE_HPLIP
|
||||
bool "hplip"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_CUPS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
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 needs a toolchain w/ C++, threads"
|
||||
depends on BR2_PACKAGE_CUPS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
2
deprecated/firmware/buildroot/package/hplip/hplip.hash
Normal file
2
deprecated/firmware/buildroot/package/hplip/hplip.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d hplip-3.15.11.tar.gz
|
||||
43
deprecated/firmware/buildroot/package/hplip/hplip.mk
Normal file
43
deprecated/firmware/buildroot/package/hplip/hplip.mk
Normal file
@@ -0,0 +1,43 @@
|
||||
################################################################################
|
||||
#
|
||||
# hplip
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HPLIP_VERSION = 3.15.11
|
||||
HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
|
||||
HPLIP_AUTORECONF = YES
|
||||
HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf
|
||||
HPLIP_LICENSE = GPLv2 BSD-3c MIT
|
||||
HPLIP_LICENSE_FILES = COPYING
|
||||
|
||||
HPLIP_CONF_OPTS = \
|
||||
--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
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
HPLIP_CONF_OPTS += --enable-dbus-build
|
||||
HPLIP_DEPENDENCIES += dbus
|
||||
else
|
||||
HPLIP_CONF_OPTS += --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
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user