mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 17:04:32 +04:00
hplip: update to 3.25.6
Add patch to fix compilation with GCC15. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
committed by
Tianling Shen
parent
e7c79208f1
commit
67f59576ef
@@ -6,12 +6,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=hplip
|
PKG_NAME:=hplip
|
||||||
PKG_VERSION:=3.24.4
|
PKG_VERSION:=3.25.6
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=@SF/hplip
|
PKG_SOURCE_URL:=@SF/hplip
|
||||||
PKG_HASH:=5d7643831893a5e2addf9d42d581a5dbfe5aaf023626886b8762c5645da0f1fb
|
PKG_HASH:=a6af314a7af0572f2ab6967b2fe68760e64d74628ef0e6237f8504d81047edbe
|
||||||
|
|
||||||
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
||||||
PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
|
PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
libhpmud_la_LDFLAGS += -lusb-1.0
|
libhpmud_la_LDFLAGS += -lusb-1.0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -365,7 +365,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
|
@@ -366,7 +366,7 @@ hpmudext_la_CFLAGS += -Iprotocol/discove
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if !LIBUSB01_BUILD
|
if !LIBUSB01_BUILD
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
# ui (qt3)
|
# ui (qt3)
|
||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -625,6 +625,10 @@ if test "$class_driver" = "no" && test "
|
@@ -627,6 +627,10 @@ if test "$class_driver" = "no" && test "
|
||||||
else
|
else
|
||||||
AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
|
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)])
|
AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
|
||||||
|
|||||||
11
utils/hplip/patches/060-gcc15.patch
Normal file
11
utils/hplip/patches/060-gcc15.patch
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
--- a/scan/sane/ledmi.h
|
||||||
|
+++ b/scan/sane/ledmi.h
|
||||||
|
@@ -162,7 +162,7 @@ struct ledm_session
|
||||||
|
int bb_open(struct ledm_session*);
|
||||||
|
int bb_close(struct ledm_session*);
|
||||||
|
int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
|
||||||
|
-int bb_is_paper_in_adf(); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
|
||||||
|
+int bb_is_paper_in_adf(struct ledm_session*); /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
|
||||||
|
SANE_Status bb_start_scan(struct ledm_session*);
|
||||||
|
int bb_get_image_data(struct ledm_session*, int);
|
||||||
|
int bb_end_page(struct ledm_session*, int);
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/configure.in
|
--- a/configure.in
|
||||||
+++ b/configure.in
|
+++ b/configure.in
|
||||||
@@ -632,14 +632,14 @@ if test "$class_driver" = "no" && test "
|
@@ -634,14 +634,14 @@ if test "$class_driver" = "no" && test "
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
then
|
then
|
||||||
echo $FLAGS
|
echo $FLAGS
|
||||||
fi
|
fi
|
||||||
@@ -668,7 +668,7 @@ if test "$class_driver" = "no" && test "
|
@@ -687,7 +687,7 @@ if test "$class_driver" = "no" && test "
|
||||||
AS_IF([test "x$FOUND_HEADER" != "xyes"],
|
AS_IF([test "x$FOUND_HEADER" != "xyes"],
|
||||||
[AC_MSG_ERROR([cannot find python-devel support], 6)])
|
[AC_MSG_ERROR([cannot find python-devel support], 6)])
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user