sane-backends: bump to version 1.0.24
PATCH 1/1 sane-backends: bump to version 1.0.24
Bump sane-backends to a "modern" 1.0.24 version.
Tweak the patches to avoid autoreconf (it doesn't seem to be happy for me in gentoo).
Disable cups support (checks are wrong and it's no longer required). Disable systemd support (checks are wrong and we never accounted for this).
Should fix wine failure (i was unable to build sane-backends before):
http://autobuild.buildroot.net/results/d01/d01a3c7786df8cfd962a27f39283851db45c6165/
Signed-off-by Gustavo Zacarias <[email protected]>
--- .../0002-remove-unsafe-headers-path.patch | 24 ++++++++ package/sane-backends/0002-v4l.patch | 66 ---------------------- .../0003-remove-cups-and-systemd-support.patch | 56 ++++++++++++++++++ .../0003-remove-unsafe-headers-path.patch | 28 --------- package/sane-backends/sane-backends.hash | 2 + package/sane-backends/sane-backends.mk | 6 +- 6 files changed, 84 insertions(+), 98 deletions(-) create mode 100644 package/sane-backends/0002-remove-unsafe-headers-path.patch delete mode 100644 package/sane-backends/0002-v4l.patch create mode 100644 package/sane-backends/0003-remove-cups-and-systemd-support.patch delete mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch create mode 100644 package/sane-backends/sane-backends.hash
package/sane-backends/0002-remove-unsafe-headers-path.patch new file +24 -0
@@ -0,0 +1,24 @@ +From 3c03e4b81c9de73e57a56029f7f8cda8bec24e91 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 10 Jan 2015 15:48:21 +0100 +Subject: [PATCH] configure.in: remove unsafe headers path + +Forcing /usr/local/include headers path in CFLAGS is unsafe for +cross-compilation. + +Signed-off-by: Romain Naour <[email protected]> +[Gustavo: update to just patch configure and avoid an autoreconf] +--- + +diff -Nura sane-backends-1.0.24.orig/configure sane-backends-1.0.24/configure +--- sane-backends-1.0.24.orig/configure 2015-05-01 09:51:19.479785064 -0300 ++++ sane-backends-1.0.24/configure 2015-05-01 09:51:48.411767378 -0300 +@@ -5192,8 +5192,6 @@ + fi + + +-INCLUDES="${INCLUDES} -I/usr/local/include" +- + + if test "${ac_cv_c_compiler_gnu}" = "yes"; then + NORMAL_CFLAGS="\
package/sane-backends/0002-v4l.patch deleted +0 -66
66 lines not on this page · raw message
package/sane-backends/0003-remove-cups-and-systemd-support.patch new file +56 -0
56 lines not on this page · raw message
package/sane-backends/0003-remove-unsafe-headers-path.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 3c03e4b81c9de73e57a56029f7f8cda8bec24e91 Mon Sep 17 00:00:00 2001 -From: Romain Naour <[email protected]> -Date: Sat, 10 Jan 2015 15:48:21 +0100 -Subject: [PATCH] configure.in: remove unsafe headers path - -Forcing /usr/local/include headers path in CFLAGS is unsafe for -cross-compilation. - -Signed-off-by: Romain Naour <[email protected]> ---- - configure.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.in b/configure.in -index a8fc950..93a4b77 100644 ---- a/configure.in -+++ b/configure.in -@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) - dnl *********************************************************************** - dnl set compiler/linker flags - dnl *********************************************************************** --INCLUDES="${INCLUDES} -I/usr/local/include" - AC_SUBST(INCLUDES) - SANE_SET_CFLAGS([$is_release]) - SANE_SET_LDFLAGS --- -1.9.3 -
package/sane-backends/sane-backends.hash new file +2 -0
@@ -0,0 +1,2 @@ +# From https://alioth.debian.org/frs/download.php/file/3956/sane-backends-1.0.24.tar.gz.md5 +md5 1ca68e536cd7c1852322822f5f6ac3a4 sane-backends-1.0.24.tar.gz
package/sane-backends/sane-backends.mk +2 -4
@@ -4,14 +4,12 @@ # ################################################################################ -SANE_BACKENDS_VERSION = 1.0.22 -SANE_BACKENDS_SITE = http://sources.buildroot.net +SANE_BACKENDS_VERSION = 1.0.24 +SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/3958 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPLv2+ SANE_BACKENDS_LICENSE_FILES = COPYING SANE_BACKENDS_INSTALL_STAGING = YES -# 0003-remove-unsafe-headers-path.patch patch configure.in -SANE_BACKENDS_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBUSB),y) SANE_BACKENDS_DEPENDENCIES += libusb
Signature · 1 line
2.0.5
Thomas Petazzoni
AppliedPATCH 1/1 sane-backends: bump to version 1.0.24
Dear Gustavo Zacarias,
Quoted 11 lines · Gustavo Zacarias
Bump sane-backends to a "modern" 1.0.24 version.
Tweak the patches to avoid autoreconf (it doesn't seem to be happy for me in gentoo).
Disable cups support (checks are wrong and it's no longer required). Disable systemd support (checks are wrong and we never accounted for this).Should fix wine failure (i was unable to build sane-backends before):
http://autobuild.buildroot.net/results/d01/d01a3c7786df8cfd962a27f39283851db45c6165/Signed-off-by Gustavo Zacarias <[email protected]>
Quoted 13 lines
--- .../0002-remove-unsafe-headers-path.patch | 24 ++++++++ package/sane-backends/0002-v4l.patch | 66 ---------------------- .../0003-remove-cups-and-systemd-support.patch | 56 ++++++++++++++++++ .../0003-remove-unsafe-headers-path.patch | 28 --------- package/sane-backends/sane-backends.hash | 2 + package/sane-backends/sane-backends.mk | 6 +- 6 files changed, 84 insertions(+), 98 deletions(-) create mode 100644 package/sane-backends/0002-remove-unsafe-headers-path.patch delete mode 100644 package/sane-backends/0002-v4l.patch create mode 100644 package/sane-backends/0003-remove-cups-and-systemd-support.patch delete mode 100644 package/sane-backends/0003-remove-unsafe-headers-path.patch create mode 100644 package/sane-backends/sane-backends.hash
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com