rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bsp/buildroot/package/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch Normal file
View File

@@ -0,0 +1,33 @@
From e0dad4bb237f1155e920c30c6fd3412e96a3e84d Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Sun, 24 Jan 2016 17:14:21 +0200
Subject: [PATCH 1/1] print-olympus.c: fix endianness detection
The __LITTLE_ENDIAN__ and __BIG_ENDIAN__ macros are not a reliable way to
detect endianness. Instead, rely on __BYTE_ORDER like we do in the rest of
the code.
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
src/main/print-olympus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 42c4897..8b2aa80 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -4901,9 +4901,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
}
if (pv.bytes_per_ink_channel > 1) {
-#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__)
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
-#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
+#elif (__BYTE_ORDER == __BIG_ENDIAN)
pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN);
#else
#error "Unable to determine endianness, aborting compilation!"
--
1.9.1

41
bsp/buildroot/package/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch Normal file
View File

@@ -0,0 +1,41 @@
From b5e8dc446572c1198a24eff105a394d0f307951e Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 15 Apr 2016 23:05:43 -0400
Subject: [PATCH] build: Don't allow USB backends to be built if CUPS is not
enabled.
[Waldemar: backport from upstream commit
fc1713589fed645f2c8002c3f66dfb69af314716.]
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
configure.ac | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 800794b..ba30019 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,12 +442,14 @@ dnl if test -z "${[EXTRA_LIBREADLINE_DEPS]}" ; then
dnl [EXTRA_LIBREADLINE_DEPS]=""
dnl fi
-# libusb-1.0 (For CUPS backends)
-PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
- [HAVE_LIBUSB=yes
- BUILD_LIBUSB_BACKENDS=yes],
- [HAVE_LIBUSB=no
- BUILD_LIBUSB_BACKENDS=no])
+# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled)
+if test "x$BUILD_CUPS" = "xyes" ; then
+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
+ [HAVE_LIBUSB=yes
+ BUILD_LIBUSB_BACKENDS=yes],
+ [HAVE_LIBUSB=no
+ BUILD_LIBUSB_BACKENDS=no])
+fi
AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
if test -z "${GIMPTOOL2_CHECK}" ; then
--
2.6.4

2
bsp/buildroot/package/gutenprint/Config.in
View File

@@ -1,7 +1,5 @@
config BR2_PACKAGE_GUTENPRINT
bool "gutenprint"
# because of cups security issues
depends on BR2_DEPRECATED_SINCE_2015_05
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_CUPS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

2
bsp/buildroot/package/gutenprint/gutenprint.hash
View File

@@ -1,2 +1,2 @@
# Locally computed:
sha256 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 gutenprint-5.2.9.tar.bz2
sha256 c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 gutenprint-5.2.11.tar.bz2

10
bsp/buildroot/package/gutenprint/gutenprint.mk
View File

@@ -5,18 +5,19 @@
################################################################################
GUTENPRINT_VERSION_MAJOR = 5.2
GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9
GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11
GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
GUTENPRINT_LICENSE = GPLv2+
GUTENPRINT_LICENSE_FILES = COPYING
# Needed, as we touch Makefile.am
# Needed, as we touch Makefile.am and configure.ac
GUTENPRINT_AUTORECONF = YES
GUTENPRINT_DEPENDENCIES = \
cups host-pkgconf \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
$(if $(BR2_PACKAGE_LIBUSB),libusb)
# host-gutenprint is needed to generate XML as part of compilation
# the program that generates the xml also links against libgutenprint
@@ -44,8 +45,7 @@ GUTENPRINT_CONF_OPTS = \
# USE_PREGEN_XMLI18N_TMP_H is added by our patch
GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
# We have no host dependencies
HOST_GUTENPRINT_DEPENDENCIES =
HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf
# The host-gutenprint shall create the required header
HOST_GUTENPRINT_MAKE_ENV =