mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-14 03:57:15 +00:00
hplip: upgrade 3.26.4 -> 3.26.6
Refresh 0002-Add-ImageProcessor-only-when-DISBALE_IMAGEPROCESSOR_.patch and 0001-Fix-installing-ipp-usb-quirk.patch, and drop the --disable-policykit configure option which no longer exists. AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
3 files changed
+11
-19
No files matched your search
@@ -11,17 +11,16 @@ Use $(DESTDIR) as installation prefix for
|
||||
/usr/share/usb-ipp/quirk/HPLIP.conf.
|
||||
|
||||
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
---
|
||||
Makefile.am | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index e10364d..f520225 100644
|
||||
index 6280bfa..2ab18ce 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -703,10 +703,9 @@ if !DISBALE_IMAGEPROCESSOR_BUILD
|
||||
@@ -719,10 +719,9 @@ if !DISBALE_IMAGEPROCESSOR_BUILD
|
||||
ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
|
||||
fi
|
||||
endif #DISABLE_IMAGEPROCESSOR
|
||||
@@ -35,6 +34,3 @@ index e10364d..f520225 100644
|
||||
if !HPLIP_CLASS_DRIVER
|
||||
# If scanner build, add hpaio entry to sane dll.conf.
|
||||
if [ "$(scan_build)" = "yes" ]; then \
|
||||
--
|
||||
2.39.2
|
||||
|
||||
+7
-10
@@ -11,13 +11,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 5f75759..73421b1 100644
|
||||
index 778ef9d..6280bfa 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -597,7 +597,11 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
|
||||
prnt/hpcups/ImageProcessor.h
|
||||
|
||||
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
|
||||
@@ -601,7 +601,11 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
|
||||
hpcups_CPPFLAGS = -I$(srcdir)/prnt/hpcups -I$(srcdir)/prnt -I$(srcdir)/common -D_GNU_SOURCE
|
||||
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) $(AM_CXXFLAGS)
|
||||
hpcups_LDFLAGS = $(AM_LDFLAGS)
|
||||
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
|
||||
+if !DISBALE_IMAGEPROCESSOR_BUILD
|
||||
@@ -27,7 +27,7 @@ index 5f75759..73421b1 100644
|
||||
#else
|
||||
#hpcupsdir = $(cupsfilterdir)
|
||||
#hpcups_PROGRAMS = hpcups
|
||||
@@ -687,6 +692,7 @@
|
||||
@@ -703,6 +707,7 @@ endif #HPLIP_CLASS_DRIVER
|
||||
|
||||
install-data-hook:
|
||||
if HPLIP_BUILD
|
||||
@@ -35,7 +35,7 @@ index 5f75759..73421b1 100644
|
||||
if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
|
||||
cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
|
||||
chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
|
||||
@@ -697,6 +703,7 @@
|
||||
@@ -713,6 +718,7 @@ if HPLIP_BUILD
|
||||
chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
|
||||
ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
|
||||
fi
|
||||
@@ -43,6 +43,3 @@ index 5f75759..73421b1 100644
|
||||
if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
|
||||
echo "ipp-usb directory exists"; \
|
||||
cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \
|
||||
--
|
||||
2.37.3
|
||||
|
||||
+1
-2
@@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
|
||||
file://0001-Fix-installing-ipp-usb-quirk.patch \
|
||||
file://0001-Drop-using-register-storage-classifier.patch \
|
||||
file://0001-Fix-upstream-CFLAGS-override.patch"
|
||||
SRC_URI[sha256sum] = "b9c61252754f35b4a237396ca8961e7b3e0c56db76d66a6712b7bf3e30e69463"
|
||||
SRC_URI[sha256sum] = "5fb2235a9cb6ec07cb4786c4066b151359c301324d54aaabf69ae7eef35606b3"
|
||||
|
||||
CVE_PRODUCT = "hplip linux_imaging_and_printing"
|
||||
|
||||
@@ -35,7 +35,6 @@ EXTRA_OECONF += "\
|
||||
--disable-scan-build \
|
||||
--disable-gui-build \
|
||||
--disable-fax-build \
|
||||
--disable-policykit \
|
||||
--disable-qt4 \
|
||||
--disable-qt3 \
|
||||
--disable-dbus-build \
|
||||
Reference in new issue
Block a user