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

update buildroot to 2017.02.11

Browse Source
This commit is contained in:
jbnadal
2018-05-22 15:35:47 +02:00
parent 4bf1f5e091
commit a3c10bd762
9257 changed files with 433426 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bsp/buildroot-2017.02.11/package/gutenprint/0001-use-pregen-xmli18n-header.patch Normal file
View File

@@ -0,0 +1,48 @@
src/xml: use preg-gen xmli18n_tmp.h if specified
Ideally, the programs needed at build-time should be built with
CC_FOR_BUILD, and not with CC_FOR_HOST.
Unfortunately, this program wants to link against the gutenprint libs,
so we would also need to build them with CC_FOR_HOST, that is build them
twice, once for build, once for host.
Instead, in the Buildroot context, we first build gutenprint for the build
system, use that to generate the incriminated header, and then re-use that
header to build the gutenprint for the host.
It is not possible to have such constructs in Makefile.am:
ifeq ($(FOO),)
bar: bla
cat $< >$@
else
bar:
echo $(FOO) >$@
endif
as autoreconf will yell loudly that there is an 'endif' without an 'if'.
Sigh... :-(
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN gutenprint-5.2.9.orig/src/xml/Makefile.am gutenprint-5.2.9/src/xml/Makefile.am
--- gutenprint-5.2.9.orig/src/xml/Makefile.am 2011-03-30 02:43:24.000000000 +0200
+++ gutenprint-5.2.9/src/xml/Makefile.am 2013-03-24 17:08:08.435918773 +0100
@@ -52,10 +52,13 @@
xmli18n-tmp.h: xml-stamp extract-strings
- -rm -f $@ $@.tmp
- ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
- mv $@.tmp $@
-
+ if [ -z "$(BR2_USE_PREGEN_XMLI18N_TMP_H)" ]; then \
+ rm -f $@ $@.tmp; \
+ ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp; \
+ mv $@.tmp $@; \
+ else \
+ cp $(BR2_USE_PREGEN_XMLI18N_TMP_H) $@; \
+ fi
dist-hook: xmli18n-tmp.h xml-stamp
# xmli18n-tmp.h is needed by po/POTFILES.in at dist time

39
bsp/buildroot-2017.02.11/package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch Normal file
View File

@@ -0,0 +1,39 @@
From 08a5d355160eb2ac8346ae1b94591418343217f9 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@openwide.fr>
Date: Sun, 17 Aug 2014 23:43:20 +0200
Subject: [PATCH 1/1] cups support: replaces -static with -static-libtool-libs
gutenprint rely on the original behaviour of -static, but since commit
in buildroot "support/libtool: make -static behave like -all-static" [1],
the build of genppd is broken.
genppd need to be build statically otherwise the following warning appears:
***WARNING: Use of --disable-static-genppd or --disable-static
when building CUPS is very dangerous. The build may
fail when building the PPD files, or may *SILENTLY*
build incorrect PPD files or cause other problems.
Please review the README and release notes carefully!
[1] http://git.buildroot.net/buildroot/commit/?id=97703978ac870ce2b14ad144f8e082de82aa2c64
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
src/cups/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 1e27ae0..d711b70 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -84,7 +84,7 @@ noinst_SCRIPTS=test-rastertogutenprint
endif
if BUILD_GENPPD_STATIC
-STATIC_LDOPTS=-static -export-dynamic
+STATIC_LDOPTS=-static-libtool-libs -export-dynamic
endif
cups_calibrate_SOURCES = cups-calibrate.c
--
1.9.3

33
bsp/buildroot-2017.02.11/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-2017.02.11/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

15
bsp/buildroot-2017.02.11/package/gutenprint/Config.in Normal file
View File

@@ -0,0 +1,15 @@
config BR2_PACKAGE_GUTENPRINT
bool "gutenprint"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_CUPS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Gutenprint, formerly named Gimp-Print, is a suite of printer
drivers that may be used with most common UNIX print spooling
systems, including CUPS, lpr, LPRng, or others
http://gimp-print.sourceforge.net/
comment "gutenprint needs a toolchain w/ C++"
depends on BR2_PACKAGE_CUPS
depends on !BR2_INSTALL_LIBSTDCPP

2
bsp/buildroot-2017.02.11/package/gutenprint/gutenprint.hash Normal file
View File

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

92
bsp/buildroot-2017.02.11/package/gutenprint/gutenprint.mk Normal file
View File

@@ -0,0 +1,92 @@
################################################################################
#
# gutenprint
#
################################################################################
GUTENPRINT_VERSION_MAJOR = 5.2
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 and configure.ac
GUTENPRINT_AUTORECONF = YES
GUTENPRINT_DEPENDENCIES = \
cups host-pkgconf \
$(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
# so we need to build both a host package and a target package
GUTENPRINT_DEPENDENCIES += host-gutenprint
GUTENPRINT_CONF_ENV = \
ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
ac_cv_path_IJS_CONFIG=""
GUTENPRINT_CONF_OPTS = \
--disable-libgutenprintui2 \
--disable-samples \
--without-doc \
--without-gimp2 \
--without-foomatic \
--without-foomatic3 \
--disable-escputil \
--disable-test \
--disable-testpattern \
--with-cups="/usr" \
--with-sysroot="$(STAGING_DIR)" \
--disable-cups-ppds
# 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
HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf
# The host-gutenprint shall create the required header
HOST_GUTENPRINT_MAKE_ENV =
# Even with --without-cups, gutenprint will still add the output of
# cups-config --cflags / --ldflags to it's compiler/linker flags if
# available on host.
# Notice: Because of the configure logic, it needs to be set to the
# empty string to to disable this, not just to /bin/false like elsewhere.
HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=''
HOST_GUTENPRINT_CONF_OPTS = \
--disable-libgutenprintui2 \
--disable-samples \
--without-gimp2 \
--without-doc \
--disable-nls \
--disable-nls-macos \
--without-foomatic \
--without-foomatic3 \
--disable-escputil \
--disable-test \
--disable-testpattern \
--without-cups
# Needed by autoreconf
define GUTENPRINT_CREATE_M4_DIR
mkdir -p $(@D)/m4local
endef
GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
endef
HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
define GUTENPRINT_POST_INSTALL_TARGET_FIXUP
mkdir -p $(TARGET_DIR)/usr/share/gutenprint/5.2
cp -rf $(HOST_DIR)/usr/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2
endef
GUTENPRINT_POST_INSTALL_TARGET_HOOKS += GUTENPRINT_POST_INSTALL_TARGET_FIXUP
$(eval $(autotools-package))
$(eval $(host-autotools-package))