[ptxdist] [PATCH] alsa-lib: version bump 1.0.29 -> 1.1.4.1

[ptxdist] [PATCH] alsa-lib: version bump 1.0.29 -> 1.1.4.1

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/alsa-lib.make | 52 +++++++++++++++++-----------------------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 3cb6067e8..adf116391 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
 ALSA_LIB_SUFFIX		:= tar.bz2
 
 ifdef PTXCONF_ALSA_LIB_FULL
-ALSA_LIB_VERSION	:= 1.0.29
-ALSA_LIB_MD5		:= de67e0eca72474d6b1121037dafe1024
+ALSA_LIB_VERSION	:= 1.1.4.1
+ALSA_LIB_MD5		:= 29fa3e69122d3cf3e8f0e01a0cb1d183
 ALSA_LIB		:= alsa-lib-$(ALSA_LIB_VERSION)
 ALSA_LIB_URL		:= \
 	http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
@@ -55,35 +55,31 @@ ALSA_LIB_AUTOCONF := \
 	--enable-fast-install \
 	--enable-libtool-lock \
 	--enable-symbolic-functions \
-	--disable-old-symbols \
-	--disable-python \
-	--with-tmpdir=/tmp \
 	--with-debug=no \
-	--with-libdl \
-	--with-pthread \
-	--with-librt \
-	--with-alsa-devdir=/dev/snd \
-	--with-aload-devdir=/dev \
-	--with-versioned \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_RESMGR)-resmgr \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_READ)-aload \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_MIXER)-mixer \
+	--$(call ptx/endis, PTXCONF_ALSA_LIB_PCM)-pcm \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_RAWMIDI)-rawmidi \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_HWDEP)-hwdep \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_SEQ)-seq \
 	--$(call ptx/endis, PTXCONF_ALSA_LIB_UCM)-ucm \
-	--$(call ptx/endis, PTXCONF_ALSA_LIB_ALISP)-alisp
+	--disable-topology \
+	--$(call ptx/endis, PTXCONF_ALSA_LIB_ALISP)-alisp \
+	--disable-old-symbols \
+	--disable-python \
+	--enable-thread-safety \
+	--with-versioned \
+	--with-tmpdir=/tmp \
+	--with-softfloat=$(call ptx/ifdef, PTXCONF_HAS_HARDFLOAT, no, yes) \
+	--with-libdl \
+	--with-pthread \
+	--with-librt \
+	--with-alsa-devdir=/dev/snd \
+	--with-aload-devdir=/dev
 
 ifdef PTXCONF_ALSA_LIB_PCM
-ALSA_LIB_AUTOCONF += \
-	--enable-pcm \
-	--with-pcm-plugins=all
-else
-ALSA_LIB_AUTOCONF += --disable-pcm
-endif
-
-ifndef PTXCONF_HAS_HARDFLOAT
-ALSA_LIB_AUTOCONF += --with-softfloat
+ALSA_LIB_AUTOCONF += --with-pcm-plugins=all
 endif
 
 ifdef PTXCONF_ALSA_LIB_LIGHT
@@ -124,20 +120,6 @@ endif
 ifdef PTXCONF_ALSA_LIB_FULL
 	@$(call install_lib, alsa-lib, 0, 0, 0644, libasound)
 
-ifdef PTXCONF_ALSA_LIB_MIXER
-	@$(call install_copy, alsa-lib, \
-		0, 0, 0644, -, \
-		/usr/lib/alsa-lib/smixer/smixer-ac97.so)
-
-	@$(call install_copy, alsa-lib, \
-		0, 0, 0644, -, \
-		/usr/lib/alsa-lib/smixer/smixer-sbase.so)
-
-	@$(call install_copy, alsa-lib, \
-		0, 0, 0644, -, \
-		/usr/lib/alsa-lib/smixer/smixer-hda.so)
-endif
-
 	@$(call install_tree, alsa-lib, \
 		0, 0, -, /usr/share/alsa/)
 endif
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] cairo: version bump 1.12.18 -> 1.14.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/cairo.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/cairo.make b/rules/cairo.make
index 25655f965..5014ea85a 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
 #
 # Paths and names
 #
-CAIRO_VERSION	:= 1.12.18
-CAIRO_MD5	:= 8e4ff32b82c3b39387eb6f5c59ef848e
+CAIRO_VERSION	:= 1.14.8
+CAIRO_MD5	:= 4ef0db2eacb271c74f8a3fd87822aa98
 CAIRO		:= cairo-$(CAIRO_VERSION)
 CAIRO_SUFFIX	:= tar.xz
 CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
@@ -37,10 +37,11 @@ CAIRO_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-shared \
 	--disable-static \
-	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-atomic \
 	--disable-gcov \
 	--disable-valgrind \
 	--$(call ptx/endis, PTXCONF_CAIRO_XLIB)-xlib \
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] collectd: add exec plugin

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 projectroot/etc/collectd.d/exec.conf |  3 +++
 rules/collectd.in                    | 10 +++++++++-
 rules/collectd.make                  |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 projectroot/etc/collectd.d/exec.conf

diff --git a/projectroot/etc/collectd.d/exec.conf b/projectroot/etc/collectd.d/exec.conf
new file mode 100644
index 000000000..f8f1f2d5a
--- /dev/null
+++ b/projectroot/etc/collectd.d/exec.conf
@@ -0,0 +1,3 @@
+<Plugin exec>
+# This is a generic plugin. Please read the collectd manual.
+</Plugin>
diff --git a/rules/collectd.in b/rules/collectd.in
index 015e4b6fe..04e7499e4 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -67,11 +67,19 @@ config COLLECTD_PING
 	  to the configured hosts periodically and measures the network
 	  latency.
 
-
 config COLLECTD_SENSORS
 	bool
 	prompt "sensors"
 	help
 	  The Sensors plugin uses lm-sensors to read hardware sensors.
 
+comment "Other Plugins"
+
+config COLLECTD_EXEC
+	bool
+	prompt "exec"
+	help
+	  The Exec plugin executes scripts and reads values back that are
+	  printed to stdout using the collectd plain text protocol.
+
 endif
diff --git a/rules/collectd.make b/rules/collectd.make
index 7c5ee0772..f8b6dac23 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -86,7 +86,7 @@ COLLECTD_ENABLE-				+= drbd
 COLLECTD_ENABLE-				+= email
 COLLECTD_ENABLE-				+= entropy
 COLLECTD_ENABLE-				+= ethstat
-COLLECTD_ENABLE-				+= exec
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_EXEC)	+= exec
 COLLECTD_ENABLE-				+= fhcount
 COLLECTD_ENABLE-				+= filecount
 COLLECTD_ENABLE-				+= fscache
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] coreutils: version bump 8.25 -> 8.27

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/coreutils.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/coreutils.make b/rules/coreutils.make
index 3e4920f92..a49f118a8 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_COREUTILS) += coreutils
 #
 # Paths and names
 #
-COREUTILS_VERSION	:= 8.25
-COREUTILS_MD5		:= 070e43ba7f618d747414ef56ab248a48
+COREUTILS_VERSION	:= 8.27
+COREUTILS_MD5		:= 502795792c212932365e077946d353ae
 COREUTILS		:= coreutils-$(COREUTILS_VERSION)
 COREUTILS_SUFFIX	:= tar.xz
 COREUTILS_URL		:= $(call ptx/mirror, GNU, coreutils/$(COREUTILS).$(COREUTILS_SUFFIX))
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] fontconfig: version bump 2.11.1 -> 2.12.3

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/fontconfig.make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules/fontconfig.make b/rules/fontconfig.make
index 634a6e9cb..dc6ea038d 100644
--- a/rules/fontconfig.make
+++ b/rules/fontconfig.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_FONTCONFIG) += fontconfig
 #
 # Paths and names
 #
-FONTCONFIG_VERSION	:= 2.11.1
-FONTCONFIG_MD5		:= e75e303b4f7756c2b16203a57ac87eba
+FONTCONFIG_VERSION	:= 2.12.3
+FONTCONFIG_MD5		:= aca0c734c1a38eb3ba12b2447dd90ab0
 FONTCONFIG		:= fontconfig-$(FONTCONFIG_VERSION)
 FONTCONFIG_SUFFIX	:= tar.gz
 FONTCONFIG_URL		:= http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
@@ -44,9 +44,10 @@ FONTCONFIG_CONF_OPT	:= \
 	--$(call ptx/endis, PTXCONF_ICONV)-iconv \
 	--disable-libxml2 \
 	--disable-docs \
-	--with-cache-dir=/var/cache/fontconfig \
+	--with-arch=$(PTXCONF_ARCH_STRING) \
+	--with-default-hinting=slight \
 	--with-default-fonts=$(XORG_FONTDIR) \
-	--with-arch=$(PTXCONF_ARCH_STRING)
+	--with-cache-dir=/var/cache/fontconfig
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...erate-freetype-config-and-freetype2.pc-correctly.patch |  0
 patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh       |  0
 patches/{freetype-2.6.3 => freetype-2.8}/series           |  0
 rules/freetype.make                                       | 15 ++++++++++++---
 4 files changed, 12 insertions(+), 3 deletions(-)
 rename patches/{freetype-2.6.3 => freetype-2.8}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (100%)
 rename patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh (100%)
 rename patches/{freetype-2.6.3 => freetype-2.8}/series (100%)

diff --git a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
similarity index 100%
rename from patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
rename to patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
diff --git a/patches/freetype-2.6.3/autogen.sh b/patches/freetype-2.8/autogen.sh
similarity index 100%
rename from patches/freetype-2.6.3/autogen.sh
rename to patches/freetype-2.8/autogen.sh
diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.8/series
similarity index 100%
rename from patches/freetype-2.6.3/series
rename to patches/freetype-2.8/series
diff --git a/rules/freetype.make b/rules/freetype.make
index 2ee85ef15..c306f9466 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
 #
 # Paths and names
 #
-FREETYPE_VERSION	:= 2.6.3
-FREETYPE_MD5		:= 0037b25a8c090bc8a1218e867b32beb1
+FREETYPE_VERSION	:= 2.8
+FREETYPE_MD5		:= 2413ac3eaf508ada019c63959ea81a92
 FREETYPE		:= freetype-$(FREETYPE_VERSION)
 FREETYPE_SUFFIX		:= tar.bz2
 FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
@@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL	:= autoconf
 FREETYPE_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
+	--disable-biarch-config \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-mmap \
 	--with-zlib \
 	--without-bzip2 \
 	--without-png \
-	--without-harfbuzz
+	--without-harfbuzz \
+	--without-old-mac-fonts \
+	--without-fsspec \
+	--without-fsref \
+	--without-quickdraw-toolbox \
+	--without-quickdraw-carbon \
+	--without-ats
 
 
 # ----------------------------------------------------------------------------
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] latrace: improve configure options

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/latrace.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/latrace.make b/rules/latrace.make
index 8f08116a3..96051cfd5 100644
--- a/rules/latrace.make
+++ b/rules/latrace.make
@@ -43,6 +43,9 @@ LATRACE_CONF_ENV := \
 # autoconf
 #
 LATRACE_CONF_TOOL	:= autoconf
+LATRACE_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION)
 
 # autotools, but hand-made Makefile m(
 LATRACE_MAKE_PAR := NO
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libelf: version bump 0.168 -> 0.169

[Clemens Gruber]

Contains security fixes.

Let's also add missing configure flags.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libelf.make | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/rules/libelf.make b/rules/libelf.make
index f17ef6e0a..09c88f393 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBELF) += libelf
 #
 # Paths and names
 #
-LIBELF_VERSION	:= 0.168
-LIBELF_MD5	:= 52adfa40758d0d39e5d5c57689bf38d6
+LIBELF_VERSION	:= 0.169
+LIBELF_MD5	:= 1ce77c5315d6bba7d883c3c4f0c2697e
 LIBELF		:= elfutils-$(LIBELF_VERSION)
 LIBELF_SUFFIX	:= tar.bz2
 LIBELF_URL	:= https://fedorahosted.org/releases/e/l/elfutils/$(LIBELF_VERSION)/$(LIBELF).$(LIBELF_SUFFIX)
@@ -36,9 +36,23 @@ LIBELF_LICENSE	:= (LGPL-3.0+ OR GPL-2.0+) AND GPL-3.0+
 LIBELF_CONF_TOOL := autoconf
 LIBELF_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-deterministic-archives \
+	--disable-thread-safety \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-debugpred \
+	--disable-gprof \
+	--disable-gcov \
+	--disable-sanitize-undefined \
+	--disable-valgrind \
+	--disable-tests-rpath \
+	--enable-libebl-subdir=elfutils \
+	--enable-textrelcheck \
+	--enable-symbol-versioning \
+	--disable-nls \
 	--with-zlib \
 	--without-bzlib \
-	--without-lzma
+	--without-lzma \
+	--without-biarch
 
 LIBELF_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING))
 ifdef PTXCONF_ARCH_ARM64
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libevent: version bump 2.0.21 -> 2.1.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libevent.make | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/rules/libevent.make b/rules/libevent.make
index a70961dfe..1d1181df3 100644
--- a/rules/libevent.make
+++ b/rules/libevent.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_LIBEVENT) += libevent
 #
 # Paths and names
 #
-LIBEVENT_VERSION	:= 2.0.21
-LIBEVENT_MD5		:= b2405cc9ebf264aa47ff615d9de527a2
+LIBEVENT_VERSION	:= 2.1.8
+LIBEVENT_MD5		:= f3eeaed018542963b7d2416ef1135ecc
 LIBEVENT		:= libevent-$(LIBEVENT_VERSION)-stable
 LIBEVENT_SUFFIX		:= tar.gz
-LIBEVENT_URL		:= https://github.com/downloads/libevent/libevent/$(LIBEVENT).$(LIBEVENT_SUFFIX)
+LIBEVENT_URL		:= https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_SOURCE		:= $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_DIR		:= $(BUILDDIR)/$(LIBEVENT)
 LIBEVENT_LICENSE	:= BSD-3-Clause, 0BSD
@@ -36,12 +36,19 @@ LIBEVENT_LICENSE	:= BSD-3-Clause, 0BSD
 LIBEVENT_CONF_TOOL	:= autoconf
 LIBEVENT_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-gcc-warnings \
+	--enable-gcc-hardening \
 	--enable-thread-support \
 	--disable-malloc-replacement \
 	--$(call ptx/endis, PTXCONF_LIBEVENT_OPENSSL)-openssl \
 	--disable-debug-mode \
 	--enable-libevent-install \
-	--disable-libevent-regress
+	--disable-libevent-regress \
+	--disable-samples \
+	--enable-function-sections \
+	--disable-verbose-debug \
+	--enable-clock-gettime \
+	$(GLOBAL_LARGE_FILE_OPTION)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -56,12 +63,12 @@ $(STATEDIR)/libevent.targetinstall:
 	@$(call install_fixup, libevent,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
 	@$(call install_fixup, libevent,DESCRIPTION,missing)
 
-	@$(call install_lib, libevent, 0, 0, 0644, libevent-2.0)
-	@$(call install_lib, libevent, 0, 0, 0644, libevent_core-2.0)
-	@$(call install_lib, libevent, 0, 0, 0644, libevent_extra-2.0)
-	@$(call install_lib, libevent, 0, 0, 0644, libevent_pthreads-2.0)
+	@$(call install_lib, libevent, 0, 0, 0644, libevent-2.1)
+	@$(call install_lib, libevent, 0, 0, 0644, libevent_core-2.1)
+	@$(call install_lib, libevent, 0, 0, 0644, libevent_extra-2.1)
+	@$(call install_lib, libevent, 0, 0, 0644, libevent_pthreads-2.1)
 ifdef PTXCONF_LIBEVENT_OPENSSL
-	@$(call install_lib, libevent, 0, 0, 0644, libevent_openssl-2.0)
+	@$(call install_lib, libevent, 0, 0, 0644, libevent_openssl-2.1)
 endif
 
 	@$(call install_finish, libevent)
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libgcrypt: version bump 1.7.6 -> 1.7.7

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libgcrypt.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 0c1f0e6b5..4cf147f45 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
 #
 # Paths and names
 #
-LIBGCRYPT_VERSION	:= 1.7.6
-LIBGCRYPT_MD5		:= 54e180679a7ae4d090f8689ca32b654c
+LIBGCRYPT_VERSION	:= 1.7.7
+LIBGCRYPT_MD5		:= d1769481b1b506a632fd66c5e5f62e41
 LIBGCRYPT		:= libgcrypt-$(LIBGCRYPT_VERSION)
 LIBGCRYPT_SUFFIX	:= tar.bz2
 LIBGCRYPT_URL		:= http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libpng: version bump 1.2.54 -> 1.6.29

[Clemens Gruber]

Also fix configure options.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-add-SYSROOT-handling-to-libpng-config.patch   |  0
 patches/{libpng-1.2.54 => libpng-1.6.29}/series        |  0
 rules/libpng.make                                      | 18 +++++++++++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)
 rename patches/{libpng-1.2.54 => libpng-1.6.29}/0001-add-SYSROOT-handling-to-libpng-config.patch (100%)
 rename patches/{libpng-1.2.54 => libpng-1.6.29}/series (100%)

diff --git a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch b/patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
similarity index 100%
rename from patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
rename to patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
diff --git a/patches/libpng-1.2.54/series b/patches/libpng-1.6.29/series
similarity index 100%
rename from patches/libpng-1.2.54/series
rename to patches/libpng-1.6.29/series
diff --git a/rules/libpng.make b/rules/libpng.make
index f23d9543f..e15fe18b0 100644
--- a/rules/libpng.make
+++ b/rules/libpng.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng
 #
 # Paths and names
 #
-LIBPNG_VERSION	:= 1.2.54
-LIBPNG_MD5	:= bbb7a7264f1c7d9c444fd16bf6f89832
+LIBPNG_VERSION	:= 1.6.29
+LIBPNG_MD5	:= 3245dbd76ea91e1437507357b858ec97
 LIBPNG		:= libpng-$(LIBPNG_VERSION)
 LIBPNG_SUFFIX	:= tar.xz
 LIBPNG_URL	:= $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX))
@@ -31,9 +31,17 @@ LIBPNG_LICENSE	:= Zlib
 # Prepare
 # ----------------------------------------------------------------------------
 
-LIBPNG_AUTOCONF := \
+LIBPNG_CONF_TOOL:= autoconf
+LIBPNG_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
-	--without-libpng-compat
+	--enable-unversioned-links \
+	--enable-unversioned-libpng-pc \
+	--enable-unversioned-libpng-config \
+	--enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, yes, no) \
+	--disable-mips-msa \
+	--$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \
+	--disable-powerpc-vsx \
+	--with-binconfigs
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -48,7 +56,7 @@ $(STATEDIR)/libpng.targetinstall:
 	@$(call install_fixup, libpng,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, libpng,DESCRIPTION,missing)
 
-	@$(call install_lib, libpng, 0, 0, 0644, libpng12)
+	@$(call install_lib, libpng, 0, 0, 0644, libpng16)
 
 	@$(call install_finish, libpng)
 
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] mpg123: version bump 1.23.8 -> 1.25.0

[Clemens Gruber]

The --with-cpu argument is left untouched to be auto-detected at build-
and/or runtime.

libltdl is not needed because modules are disabled.

Also add an option to enable integer quality mode and fix configure
options.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/mpg123.in   | 14 ++++++++++++--
 rules/mpg123.make | 41 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/rules/mpg123.in b/rules/mpg123.in
index 9abbffc05..5f672d2f1 100644
--- a/rules/mpg123.in
+++ b/rules/mpg123.in
@@ -1,9 +1,8 @@
 ## SECTION=multimedia_sound
 
-config MPG123
+menuconfig MPG123
 	tristate
 	prompt "mpg123"
-	select LIBLTDL
 	select ALSA_LIB
 	select ALSA_LIB_PCM
 	help
@@ -14,3 +13,14 @@ config MPG123
 	  It is free software licensed under LGPL 2.1 (the officially released sources,
 	  some files in subversion repository may differ).
 
+if MPG123
+
+config MPG123_INT_QUALITY
+	bool
+	default n
+	prompt "integer quality mode"
+	help
+	  Use rounding instead of fast truncation for integer output.
+	  Enable this if you need ISO MPEG compliance.
+
+endif
diff --git a/rules/mpg123.make b/rules/mpg123.make
index b0eadb45b..936b267dd 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
 #
 # Paths and names
 #
-MPG123_VERSION	:= 1.23.8
-MPG123_MD5	:= 4dde045123a2ad1e385a0a82c0ef9268
+MPG123_VERSION	:= 1.25.0
+MPG123_MD5	:= 2ffbe29c99130215b0ee7d1b11c0ea4b
 MPG123		:= mpg123-$(MPG123_VERSION)
 MPG123_SUFFIX	:= tar.bz2
 MPG123_URL	:= http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
@@ -37,10 +37,41 @@ MPG123_LICENSE_FILES := \
 MPG123_CONF_TOOL	:= autoconf
 MPG123_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-modules=no \
+	--enable-debug=no \
+	--disable-nagging \
+	--enable-gapless \
+	--enable-fifo \
 	$(GLOBAL_IPV6_OPTION) \
-	--with-audio=alsa\
-	--with-default-audio=alsa\
-	--enable-modules=no
+	--enable-network \
+	--enable-id3v2 \
+	--enable-string \
+	--enable-icy \
+	--enable-ntom \
+	--enable-downsample \
+	--enable-feeder \
+	--enable-messages \
+	--enable-new-huffman \
+	--$(call ptx/endis, PTXCONF_MPG123_INT_QUALITY)-int-quality \
+	--enable-16bit \
+	--enable-8bit \
+	--enable-32bit \
+	--enable-real \
+	--disable-equalizer \
+	--disable-yasm \
+	--enable-ieeefloat \
+	--enable-buffer \
+	--disable-newoldwritesample \
+	--enable-layer1 \
+	--enable-layer2 \
+	--enable-layer3 \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--enable-lfs-alias \
+	--disable-feature_report \
+	--with-audio=alsa \
+	--with-default-audio=alsa \
+	--with-optimization=2 \
+	--with-seektable=1000
 
 # needed when compiling without IPv6
 MPG123_CPPFLAGS := -D_GNU_SOURCE
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] nano: version bump 2.3.1 -> 2.8.4

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/nano.make | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/rules/nano.make b/rules/nano.make
index 48336cb07..c1f968bd6 100644
--- a/rules/nano.make
+++ b/rules/nano.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NANO) += nano
 #
 # Paths and names
 #
-NANO_VERSION		:= 2.3.1
-NANO_MD5		:= af09f8828744b0ea0808d6c19a2b4bfd
+NANO_VERSION		:= 2.8.4
+NANO_MD5		:= e2a6bfc054d1f535b723f93eb73e5f77
 NANO			:= nano-$(NANO_VERSION)
 NANO_SUFFIX		:= tar.gz
-NANO_URL		:= http://www.nano-editor.org/dist/v2.3/$(NANO).$(NANO_SUFFIX)
+NANO_URL		:= https://www.nano-editor.org/dist/v$(basename $(NANO_VERSION))/$(NANO).$(NANO_SUFFIX)
 NANO_SOURCE		:= $(SRCDIR)/$(NANO).$(NANO_SUFFIX)
 NANO_DIR		:= $(BUILDDIR)/$(NANO)
 NANO_LICENSE		:= GPL-3.0+
@@ -44,22 +44,30 @@ NANO_CONF_OPT	:= \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-rpath \
 	--disable-nls \
-	--disable-debug \
-	--disable-tiny \
-	--disable-extra \
 	--disable-browser \
+	--enable-color \
+	--enable-comment \
+	--disable-extra \
 	--disable-help \
+	--enable-histories \
 	--enable-justify \
+	--disable-libmagic \
+	--enable-linenumbers \
 	--disable-mouse \
+	--enable-multibuffer \
+	--enable-nanorc \
 	--disable-operatingdir \
 	--disable-speller \
 	--enable-tabcomp \
+	--disable-wordcomp \
 	--enable-wrapping \
-	--enable-color \
-	--enable-multibuffer \
-	--disable-nanorc \
+	--disable-wrapping-as-root \
+	--disable-debug \
+	--disable-tiny \
 	--disable-utf8 \
-	--disable-glibtest
+	--disable-altrcname \
+	--without-slang \
+	--with-wordbounds
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] nginx: add -Wno-error to fix build with GCC 7.1

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/nginx.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/nginx.make b/rules/nginx.make
index 35cb4f59b..ef98c0adb 100644
--- a/rules/nginx.make
+++ b/rules/nginx.make
@@ -55,7 +55,7 @@ NGINX_CONF_OPT := \
 	--crossbuild=Linux::$(PTXCONF_ARCH_STRING) \
 	--with-cc=$(CROSS_CC) \
 	--with-cpp=$(CROSS_CC) \
-	--with-cc-opt=-O2 \
+	--with-cc-opt="-O2 -Wno-error" \
 	--prefix=/usr/share/nginx \
 	--conf-path=/etc/nginx/nginx.conf \
 	--sbin-path=/usr/sbin/nginx \
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] pango: version bump 1.29.4 -> 1.40.6

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/pango.in   | 44 +-------------------------------------------
 rules/pango.make | 32 +++++++++++---------------------
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/rules/pango.in b/rules/pango.in
index f9c4810b3..e9061a973 100644
--- a/rules/pango.in
+++ b/rules/pango.in
@@ -9,7 +9,7 @@ menuconfig PANGO
 	select GOBJECT_INTROSPECTION	if PANGO_INTROSPECTION
 	select CAIRO_GOBJECT		if PANGO_INTROSPECTION
 	select GLIB
-	select WINE if PANGO__WINE
+	select HARFBUZZ
 
 if PANGO
 
@@ -21,46 +21,4 @@ config PANGO_TARGET_X11
 	bool
 	default GTK_TARGET_X11
 
-
-config PANGO__WINE
-	bool "extra dep for MINGW"
-
-
-config PANGO_ARABIC
-	bool
-	prompt "arabic"
-
-config PANGO_BASIC
-	bool
-	default y
-	prompt "basic"
-
-config PANGO_HANGUL
-	bool
-	prompt "hangul"
-
-config PANGO_HEBREW
-	bool
-	prompt "hebrew"
-
-config PANGO_INDIC
-	bool
-	prompt "indic"
-
-config PANGO_KHMER
-	bool
-	prompt "khmer"
-
-config PANGO_SYRIAC
-	bool
-	prompt "syriac"
-
-config PANGO_THAI
-	bool
-	prompt "thai"
-
-config PANGO_TIBETAN
-	bool
-	prompt "tibetan"
-
 endif
diff --git a/rules/pango.make b/rules/pango.make
index 515a361e5..d30515e7c 100644
--- a/rules/pango.make
+++ b/rules/pango.make
@@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_PANGO) += pango
 #
 # Paths and names
 #
-PANGO_VERSION	:= 1.29.4
-PANGO_MD5	:= a5ee785f4f31d6bdd8625a09ea3f8b4b
+PANGO_VERSION	:= 1.40.6
+PANGO_MD5	:= 507c6746fbf53fc9d48c577f1e265de3
 PANGO		:= pango-$(PANGO_VERSION)
-PANGO_SUFFIX	:= tar.bz2
-PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/$(PANGO).$(PANGO_SUFFIX)
+PANGO_SUFFIX	:= tar.xz
+PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/$(PANGO).$(PANGO_SUFFIX)
 PANGO_SOURCE	:= $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
 PANGO_DIR	:= $(BUILDDIR)/$(PANGO)
 PANGO_LICENSE	:= LGPL-2.0+
@@ -37,29 +37,19 @@ PANGO_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-PANGO_MODULES-$(PTXCONF_PANGO_BASIC)	+= basic-fc,basic-win32,basic-x,basic-atsui
-PANGO_MODULES-$(PTXCONF_PANGO_ARABIC)	+= arabic-fc
-PANGO_MODULES-$(PTXCONF_PANGO_HANGUL)	+= hangul-fc
-PANGO_MODULES-$(PTXCONF_PANGO_HEBREW)	+= hebrew-fc
-PANGO_MODULES-$(PTXCONF_PANGO_INDIC)	+= indic-fc,indic-lang
-PANGO_MODULES-$(PTXCONF_PANGO_KHMER)	+= khmer-fc
-PANGO_MODULES-$(PTXCONF_PANGO_SYRIAC)	+= syriac-fc
-PANGO_MODULES-$(PTXCONF_PANGO_THAI)	+= thai-fc
-PANGO_MODULES-$(PTXCONF_PANGO_TIBETAN)	+= tibetan-fc
-
 PANGO_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--x-includes=$(XORG_PREFIX)/include \
-	--x-libraries=$(XORG_LIBDIR) \
+	--enable-debug=no \
+	--enable-rebuilds \
+	--enable-introspection=no \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
-	--disable-man \
 	--disable-doc-cross-references \
-	--enable-explicit-deps=no \
-	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-x \
-	--with-included-modules=$(subst $(space),$(comma),$(PANGO_MODULES-y)) \
-	--without-dynamic-modules
+	--enable-Bsymbolic \
+	--disable-installed-tests \
+	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-xft \
+	--with-cairo
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] rrdtool: version bump 1.6.0 -> 1.7.0

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/rrdtool.make | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rules/rrdtool.make b/rules/rrdtool.make
index 59e0f6b14..4f5024c9f 100644
--- a/rules/rrdtool.make
+++ b/rules/rrdtool.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RRDTOOL) += rrdtool
 #
 # Paths and names
 #
-RRDTOOL_VERSION	:= 1.6.0
-RRDTOOL_MD5	:= 4ff52cc44b935b02d2742e6875094da5
+RRDTOOL_VERSION	:= 1.7.0
+RRDTOOL_MD5	:= 2f37eeb613bed11077470c9e2057010e
 RRDTOOL		:= rrdtool-$(RRDTOOL_VERSION)
 RRDTOOL_SUFFIX	:= tar.gz
 RRDTOOL_URL	:= http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX)
@@ -40,6 +40,7 @@ RRDTOOL_CONF_ENV	:= \
 RRDTOOL_CONF_TOOL	:= autoconf
 RRDTOOL_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--runstatedir=/run \
 	--disable-docs \
 	--disable-examples \
 	--$(call ptx/endis, PTXCONF_RRDTOOL_RRDCACHED)-rrdcached \
@@ -62,6 +63,9 @@ RRDTOOL_CONF_OPT	:= \
 	--disable-python \
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
+	--without-perl-options \
+	--without-ruby-options \
+	--without-tcllib \
 	--with-systemdsystemunitdir=/usr/lib/systemd/system
 
 ifneq ($(call remove_quotes,$(PTXCONF_RRDTOOL_DEFAULT_FONT)),)
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] systemd: backport fix for nss-resolve fallback

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...00-nss-resolve-drop-the-internal-fallback.patch | 200 +++++++++++++++++++++
 patches/systemd-233/series                         |   3 +-
 2 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 patches/systemd-233/0100-nss-resolve-drop-the-internal-fallback.patch

diff --git a/patches/systemd-233/0100-nss-resolve-drop-the-internal-fallback.patch b/patches/systemd-233/0100-nss-resolve-drop-the-internal-fallback.patch
new file mode 100644
index 000000000..4e69eb65a
--- /dev/null
+++ b/patches/systemd-233/0100-nss-resolve-drop-the-internal-fallback.patch
@@ -0,0 +1,200 @@
+From: Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl>
+Date: Fri, 12 May 2017 08:31:46 -0400
+Subject: [PATCH] nss-resolve: drop the internal fallback to libnss_dns (#5945)
+
+If we could not communicate with systemd-resolved, we would call into
+libnss_dns. libnss_dns would return NOTFOUND for stuff like "localhost" and
+other names resolved by nss-myhostname, which we would fall under the !UNAVAIL=
+condition and cause resolution to fail. So the following recommended
+configuration in nsswitch.conf would not work:
+
+   hosts: resolve [!UNAVAIL=return] dns myhostname
+
+Remove the internal fallback code completely so that the fallback logic
+can be configured in nsswitch.conf.
+
+Tested with
+   hosts: resolve [!UNAVAIL=return] myhostname
+and
+   hosts: resolve [!UNAVAIL=return] dns myhostname
+
+Fixes #5742.
+
+[cg: Back-ported to 233]
+Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
+
+---
+diff --git a/Makefile.am b/Makefile.am
+index e6b573587d..ab24ebaa61 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5630,8 +5630,7 @@ libnss_resolve_la_LDFLAGS = \
+ 
+ libnss_resolve_la_LIBADD = \
+ 	libsystemd-internal.la \
+-	libbasic.la \
+-        -ldl
++	libbasic.la
+ 
+ rootlib_LTLIBRARIES += \
+ 	libnss_resolve.la
+diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
+index d155625e11..ec059d9586 100644
+--- a/src/nss-resolve/nss-resolve.c
++++ b/src/nss-resolve/nss-resolve.c
+@@ -17,7 +17,6 @@
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
+-#include <dlfcn.h>
+ #include <errno.h>
+ #include <netdb.h>
+ #include <nss.h>
+@@ -39,20 +38,6 @@ NSS_GETHOSTBYADDR_PROTOTYPES(resolve);
+ 
+ #define DNS_CALL_TIMEOUT_USEC (45*USEC_PER_SEC)
+ 
+-typedef void (*voidfunc_t)(void);
+-
+-static voidfunc_t find_fallback(const char *module, const char *symbol) {
+-        void *dl;
+-
+-        /* Try to find a fallback NSS module symbol */
+-
+-        dl = dlopen(module, RTLD_LAZY|RTLD_NODELETE);
+-        if (!dl)
+-                return NULL;
+-
+-        return dlsym(dl, symbol);
+-}
+-
+ static bool bus_error_shall_fallback(sd_bus_error *e) {
+         return sd_bus_error_has_name(e, SD_BUS_ERROR_SERVICE_UNKNOWN) ||
+                sd_bus_error_has_name(e, SD_BUS_ERROR_NAME_HAS_NO_OWNER) ||
+@@ -151,7 +136,7 @@ enum nss_status _nss_resolve_gethostbyname4_r(
+ 
+         r = sd_bus_open_system(&bus);
+         if (r < 0)
+-                goto fallback;
++                goto fail;
+ 
+         r = sd_bus_message_new_method_call(
+                         bus,
+@@ -179,13 +164,14 @@ enum nss_status _nss_resolve_gethostbyname4_r(
+                         return NSS_STATUS_NOTFOUND;
+                 }
+ 
+-                if (bus_error_shall_fallback(&error))
+-                        goto fallback;
++                /* Return NSS_STATUS_UNAVAIL when communication with systemd-resolved fails,
++                   allowing falling back to other nss modules. Treat all other error conditions as
++                   NOTFOUND. This includes DNSSEC errors and suchlike. (We don't use UNAVAIL in this
++                   case so that the nsswitch.conf configuration can distuingish such executed but
++                   negative replies from complete failure to talk to resolved). */
++                if (!bus_error_shall_fallback(&error))
++                        ret = NSS_STATUS_NOTFOUND;
+ 
+-                /* Treat all other error conditions as NOTFOUND, and fail. This includes DNSSEC errors and
+-                   suchlike. (We don't use UNAVAIL in this case so that the nsswitch.conf configuration can distuingish
+-                   such executed but negative replies from complete failure to talk to resolved. */
+-                ret = NSS_STATUS_NOTFOUND;
+                 goto fail;
+         }
+ 
+@@ -286,17 +272,6 @@ enum nss_status _nss_resolve_gethostbyname4_r(
+ 
+         return NSS_STATUS_SUCCESS;
+ 
+-fallback:
+-        {
+-                _nss_gethostbyname4_r_t fallback;
+-
+-                fallback = (_nss_gethostbyname4_r_t)
+-                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname4_r");
+-
+-                if (fallback)
+-                        return fallback(name, pat, buffer, buflen, errnop, h_errnop, ttlp);
+-        }
+-
+ fail:
+         *errnop = -r;
+         *h_errnop = NO_RECOVERY;
+@@ -339,7 +314,7 @@ enum nss_status _nss_resolve_gethostbyname3_r(
+ 
+         r = sd_bus_open_system(&bus);
+         if (r < 0)
+-                goto fallback;
++                goto fail;
+ 
+         r = sd_bus_message_new_method_call(
+                         bus,
+@@ -367,10 +342,9 @@ enum nss_status _nss_resolve_gethostbyname3_r(
+                         return NSS_STATUS_NOTFOUND;
+                 }
+ 
+-                if (bus_error_shall_fallback(&error))
+-                        goto fallback;
++                if (!bus_error_shall_fallback(&error))
++                        ret = NSS_STATUS_NOTFOUND;
+ 
+-                ret = NSS_STATUS_NOTFOUND;
+                 goto fail;
+         }
+ 
+@@ -484,16 +458,6 @@ enum nss_status _nss_resolve_gethostbyname3_r(
+ 
+         return NSS_STATUS_SUCCESS;
+ 
+-fallback:
+-        {
+-                _nss_gethostbyname3_r_t fallback;
+-
+-                fallback = (_nss_gethostbyname3_r_t)
+-                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyname3_r");
+-                if (fallback)
+-                        return fallback(name, af, result, buffer, buflen, errnop, h_errnop, ttlp, canonp);
+-        }
+-
+ fail:
+         *errnop = -r;
+         *h_errnop = NO_RECOVERY;
+@@ -540,7 +504,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
+ 
+         r = sd_bus_open_system(&bus);
+         if (r < 0)
+-                goto fallback;
++                goto fail;
+ 
+         r = sd_bus_message_new_method_call(
+                         bus,
+@@ -576,10 +540,9 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
+                         return NSS_STATUS_NOTFOUND;
+                 }
+ 
+-                if (bus_error_shall_fallback(&error))
+-                        goto fallback;
++                if (!bus_error_shall_fallback(&error))
++                        ret = NSS_STATUS_NOTFOUND;
+ 
+-                ret = NSS_STATUS_NOTFOUND;
+                 goto fail;
+         }
+ 
+@@ -674,17 +637,6 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
+ 
+         return NSS_STATUS_SUCCESS;
+ 
+-fallback:
+-        {
+-                _nss_gethostbyaddr2_r_t fallback;
+-
+-                fallback = (_nss_gethostbyaddr2_r_t)
+-                        find_fallback("libnss_dns.so.2", "_nss_dns_gethostbyaddr2_r");
+-
+-                if (fallback)
+-                        return fallback(addr, len, af, result, buffer, buflen, errnop, h_errnop, ttlp);
+-        }
+-
+ fail:
+         *errnop = -r;
+         *h_errnop = NO_RECOVERY;
diff --git a/patches/systemd-233/series b/patches/systemd-233/series
index 48057dddb..2f3aa9542 100644
--- a/patches/systemd-233/series
+++ b/patches/systemd-233/series
@@ -14,4 +14,5 @@
 0011-missing-add-SMACK_MAGIC-EFIVARFS_MAGIC-BINFMTFS_MAGI.patch
 0012-missing-define-PR_SET_MM.patch
 #tag:upstream --start-number 100
-# 555c08880967c52b9852ca2f5dce5e35  - git-ptx-patches magic
+0100-nss-resolve-drop-the-internal-fallback.patch
+# aeeb8c856cfb6320185a980e3f2b37ec  - git-ptx-patches magic
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] tmux: version bump 2.3 -> 2.5

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/tmux.make | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rules/tmux.make b/rules/tmux.make
index 7e4c1f402..9b596f255 100644
--- a/rules/tmux.make
+++ b/rules/tmux.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_TMUX) += tmux
 #
 # Paths and names
 #
-TMUX_VERSION	:= 2.3
-TMUX_MD5	:= fcfd1611d705d8b31df3c26ebc93bd3e
+TMUX_VERSION	:= 2.5
+TMUX_MD5	:= 4a5d73d96d8f11b0bdf9b6f15ab76d15
 TMUX		:= tmux-$(TMUX_VERSION)
 TMUX_SUFFIX	:= tar.gz
 TMUX_URL	:= https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)/$(TMUX).$(TMUX_SUFFIX)
@@ -36,8 +36,6 @@ TMUX_CONF_TOOL	:= autoconf
 TMUX_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-debug \
-	--disable-coverage \
-	--disable-profile \
 	--disable-static \
 	--disable-utempter \
 	--disable-utf8proc
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] u-boot-tools: version bump 2016.11 -> 2017.05

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/u-boot-tools.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 72b77924b..0ec65e887 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
 #
 # Paths and names
 #
-U_BOOT_TOOLS_VERSION	:= 2016.11
-U_BOOT_TOOLS_MD5	:= ca1f6e019d08aff8d0ca1beb2e66737d
+U_BOOT_TOOLS_VERSION	:= 2017.05
+U_BOOT_TOOLS_MD5	:= 1b9ab3707ded74bbde9405987f816969
 U_BOOT_TOOLS		:= u-boot-$(U_BOOT_TOOLS_VERSION)
 U_BOOT_TOOLS_SUFFIX	:= tar.bz2
 U_BOOT_TOOLS_URL	:= ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
-- 
2.13.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Roland Hieber]

On 06.06.2017 16:36, Clemens Gruber wrote:
> diff --git a/rules/freetype.make b/rules/freetype.make
> index 2ee85ef15..c306f9466 100644
> --- a/rules/freetype.make
> +++ b/rules/freetype.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
>  #
>  # Paths and names
>  #
> -FREETYPE_VERSION	:= 2.6.3
> -FREETYPE_MD5		:= 0037b25a8c090bc8a1218e867b32beb1
> +FREETYPE_VERSION	:= 2.8
> +FREETYPE_MD5		:= 2413ac3eaf508ada019c63959ea81a92
>  FREETYPE		:= freetype-$(FREETYPE_VERSION)
>  FREETYPE_SUFFIX		:= tar.bz2
>  FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
> @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL	:= autoconf
>  FREETYPE_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-static \
> +	--disable-biarch-config \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--enable-mmap \
>  	--with-zlib \
>  	--without-bzip2 \
>  	--without-png \
> -	--without-harfbuzz
> +	--without-harfbuzz \

So after your other patch for harfbuzz, this can probably be changed to 
--with-harfbuzz? :-)

> +	--without-old-mac-fonts \
> +	--without-fsspec \
> +	--without-fsref \
> +	--without-quickdraw-toolbox \
> +	--without-quickdraw-carbon \
> +	--without-ats
>
>
>  # ----------------------------------------------------------------------------
>

-- 
Pengutronix e.K.                  | Roland Hieber               |
Industrial Linux Solutions        | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Michael Olbrich]

On Wed, Jun 07, 2017 at 11:21:00AM +0200, Roland Hieber wrote:
> 
> 
> On 06.06.2017 16:36, Clemens Gruber wrote:
> > diff --git a/rules/freetype.make b/rules/freetype.make
> > index 2ee85ef15..c306f9466 100644
> > --- a/rules/freetype.make
> > +++ b/rules/freetype.make
> > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
> >  #
> >  # Paths and names
> >  #
> > -FREETYPE_VERSION	:= 2.6.3
> > -FREETYPE_MD5		:= 0037b25a8c090bc8a1218e867b32beb1
> > +FREETYPE_VERSION	:= 2.8
> > +FREETYPE_MD5		:= 2413ac3eaf508ada019c63959ea81a92
> >  FREETYPE		:= freetype-$(FREETYPE_VERSION)
> >  FREETYPE_SUFFIX		:= tar.bz2
> >  FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
> > @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL	:= autoconf
> >  FREETYPE_CONF_OPT	:= \
> >  	$(CROSS_AUTOCONF_USR) \
> >  	--disable-static \
> > +	--disable-biarch-config \
> > +	$(GLOBAL_LARGE_FILE_OPTION) \
> > +	--enable-mmap \
> >  	--with-zlib \
> >  	--without-bzip2 \
> >  	--without-png \
> > -	--without-harfbuzz
> > +	--without-harfbuzz \
> 
> So after your other patch for harfbuzz, this can probably be changed to
> --with-harfbuzz? :-)

That would create a cyclic dependency, because harfbuzz need freetype :-/.

Michael

> > +	--without-old-mac-fonts \
> > +	--without-fsspec \
> > +	--without-fsref \
> > +	--without-quickdraw-toolbox \
> > +	--without-quickdraw-carbon \
> > +	--without-ats
> > 
> > 
> >  # ----------------------------------------------------------------------------
> > 
> 
> -- 
> Pengutronix e.K.                  | Roland Hieber               |
> Industrial Linux Solutions        | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
> Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Clemens Gruber]

On Wed, Jun 07, 2017 at 12:35:31PM +0200, Michael Olbrich wrote:
> On Wed, Jun 07, 2017 at 11:21:00AM +0200, Roland Hieber wrote:
> > So after your other patch for harfbuzz, this can probably be changed to
> > --with-harfbuzz? :-)
> 
> That would create a cyclic dependency, because harfbuzz need freetype :-/.

Would using a freetype-first.make file to build it without harfbuzz and then
rebuilding it with harfbuzz via freetype.make work?

But I am unsure how much we gain from building freetype with harfbuzz
support, much nicer hinting?

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Michael Olbrich]

Hi,

On Wed, Jun 07, 2017 at 02:46:22PM +0200, Clemens Gruber wrote:
> On Wed, Jun 07, 2017 at 12:35:31PM +0200, Michael Olbrich wrote:
> > On Wed, Jun 07, 2017 at 11:21:00AM +0200, Roland Hieber wrote:
> > > So after your other patch for harfbuzz, this can probably be changed to
> > > --with-harfbuzz? :-)
> > 
> > That would create a cyclic dependency, because harfbuzz need freetype :-/.
> 
> Would using a freetype-first.make file to build it without harfbuzz and then
> rebuilding it with harfbuzz via freetype.make work?
> 
> But I am unsure how much we gain from building freetype with harfbuzz
> support, much nicer hinting?

In such cases I usually check what the 'big' distros do.  Debian builds
freetype without harfbuzz. So Ubuntu probably does the same. I don't know
about the rest.
With that in mind, I don't think it's worth the effort.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] libpng: version bump 1.2.54 -> 1.6.29

[Michael Olbrich]

On Tue, Jun 06, 2017 at 04:36:35PM +0200, Clemens Gruber wrote:
> Also fix configure options.
> 

patchin: quilt: apply 'ptxdist-git/patches/libpng-1.6.29/series'
Applying patch 0001-add-SYSROOT-handling-to-libpng-config.patch
can't find file to patch at input line 16
Perhaps you used the wrong -p or --strip option?

mol

> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>  .../0001-add-SYSROOT-handling-to-libpng-config.patch   |  0
>  patches/{libpng-1.2.54 => libpng-1.6.29}/series        |  0
>  rules/libpng.make                                      | 18 +++++++++++++-----
>  3 files changed, 13 insertions(+), 5 deletions(-)
>  rename patches/{libpng-1.2.54 => libpng-1.6.29}/0001-add-SYSROOT-handling-to-libpng-config.patch (100%)
>  rename patches/{libpng-1.2.54 => libpng-1.6.29}/series (100%)
> 
> diff --git a/patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch b/patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
> similarity index 100%
> rename from patches/libpng-1.2.54/0001-add-SYSROOT-handling-to-libpng-config.patch
> rename to patches/libpng-1.6.29/0001-add-SYSROOT-handling-to-libpng-config.patch
> diff --git a/patches/libpng-1.2.54/series b/patches/libpng-1.6.29/series
> similarity index 100%
> rename from patches/libpng-1.2.54/series
> rename to patches/libpng-1.6.29/series
> diff --git a/rules/libpng.make b/rules/libpng.make
> index f23d9543f..e15fe18b0 100644
> --- a/rules/libpng.make
> +++ b/rules/libpng.make
> @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng
>  #
>  # Paths and names
>  #
> -LIBPNG_VERSION	:= 1.2.54
> -LIBPNG_MD5	:= bbb7a7264f1c7d9c444fd16bf6f89832
> +LIBPNG_VERSION	:= 1.6.29
> +LIBPNG_MD5	:= 3245dbd76ea91e1437507357b858ec97
>  LIBPNG		:= libpng-$(LIBPNG_VERSION)
>  LIBPNG_SUFFIX	:= tar.xz
>  LIBPNG_URL	:= $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX))
> @@ -31,9 +31,17 @@ LIBPNG_LICENSE	:= Zlib
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -LIBPNG_AUTOCONF := \
> +LIBPNG_CONF_TOOL:= autoconf
> +LIBPNG_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--without-libpng-compat
> +	--enable-unversioned-links \
> +	--enable-unversioned-libpng-pc \
> +	--enable-unversioned-libpng-config \
> +	--enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, yes, no) \
> +	--disable-mips-msa \
> +	--$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \
> +	--disable-powerpc-vsx \
> +	--with-binconfigs
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -48,7 +56,7 @@ $(STATEDIR)/libpng.targetinstall:
>  	@$(call install_fixup, libpng,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
>  	@$(call install_fixup, libpng,DESCRIPTION,missing)
>  
> -	@$(call install_lib, libpng, 0, 0, 0644, libpng12)
> +	@$(call install_lib, libpng, 0, 0, 0644, libpng16)
>  
>  	@$(call install_finish, libpng)
>  
> -- 
> 2.13.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Michael Olbrich]

On Tue, Jun 06, 2017 at 04:36:30PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

patchin: quilt: apply 'ptxdist-git/patches/freetype-2.8/series'
Applying patch 0001-generate-freetype-config-and-freetype2.pc-correctly.patch
patching file builds/unix/configure.ac
Hunk #1 succeeded at 1012 (offset 6 lines).
patching file builds/unix/freetype-config.in
Hunk #1 FAILED at 12.
Hunk #2 FAILED at 74.
Hunk #3 FAILED at 141.
3 out of 3 hunks FAILED -- rejects in file builds/unix/freetype-config.in

Michael

> ---
>  ...erate-freetype-config-and-freetype2.pc-correctly.patch |  0
>  patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh       |  0
>  patches/{freetype-2.6.3 => freetype-2.8}/series           |  0
>  rules/freetype.make                                       | 15 ++++++++++++---
>  4 files changed, 12 insertions(+), 3 deletions(-)
>  rename patches/{freetype-2.6.3 => freetype-2.8}/0001-generate-freetype-config-and-freetype2.pc-correctly.patch (100%)
>  rename patches/{freetype-2.6.3 => freetype-2.8}/autogen.sh (100%)
>  rename patches/{freetype-2.6.3 => freetype-2.8}/series (100%)
> 
> diff --git a/patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> similarity index 100%
> rename from patches/freetype-2.6.3/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> rename to patches/freetype-2.8/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> diff --git a/patches/freetype-2.6.3/autogen.sh b/patches/freetype-2.8/autogen.sh
> similarity index 100%
> rename from patches/freetype-2.6.3/autogen.sh
> rename to patches/freetype-2.8/autogen.sh
> diff --git a/patches/freetype-2.6.3/series b/patches/freetype-2.8/series
> similarity index 100%
> rename from patches/freetype-2.6.3/series
> rename to patches/freetype-2.8/series
> diff --git a/rules/freetype.make b/rules/freetype.make
> index 2ee85ef15..c306f9466 100644
> --- a/rules/freetype.make
> +++ b/rules/freetype.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype
>  #
>  # Paths and names
>  #
> -FREETYPE_VERSION	:= 2.6.3
> -FREETYPE_MD5		:= 0037b25a8c090bc8a1218e867b32beb1
> +FREETYPE_VERSION	:= 2.8
> +FREETYPE_MD5		:= 2413ac3eaf508ada019c63959ea81a92
>  FREETYPE		:= freetype-$(FREETYPE_VERSION)
>  FREETYPE_SUFFIX		:= tar.bz2
>  FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
> @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL	:= autoconf
>  FREETYPE_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-static \
> +	--disable-biarch-config \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--enable-mmap \
>  	--with-zlib \
>  	--without-bzip2 \
>  	--without-png \
> -	--without-harfbuzz
> +	--without-harfbuzz \
> +	--without-old-mac-fonts \
> +	--without-fsspec \
> +	--without-fsref \
> +	--without-quickdraw-toolbox \
> +	--without-quickdraw-carbon \
> +	--without-ats
>  
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.13.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8

[Michael Olbrich]

On Mon, Jun 19, 2017 at 02:12:03PM +0200, Michael Olbrich wrote:
> On Tue, Jun 06, 2017 at 04:36:30PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> 
> patchin: quilt: apply 'ptxdist-git/patches/freetype-2.8/series'
> Applying patch 0001-generate-freetype-config-and-freetype2.pc-correctly.patch
> patching file builds/unix/configure.ac
> Hunk #1 succeeded at 1012 (offset 6 lines).
> patching file builds/unix/freetype-config.in
> Hunk #1 FAILED at 12.
> Hunk #2 FAILED at 74.
> Hunk #3 FAILED at 141.
> 3 out of 3 hunks FAILED -- rejects in file builds/unix/freetype-config.in

Ignore this. I missed the new version of this patch.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] pango: version bump 1.29.4 -> 1.40.6

[Michael Olbrich]

On Tue, Jun 06, 2017 at 04:36:39PM +0200, Clemens Gruber wrote:
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>

FYI: I've not merged this patch yet because it breaks building gtk. That's
a bug in gtk that's probably fixed in a newer version.
We either need to update that package or move it to staging.
Staging is probably ok. It's currently a rather old version. If someone
cares, then they can update it and move it back. That's what staging is for
after all.

Michael

> ---
>  rules/pango.in   | 44 +-------------------------------------------
>  rules/pango.make | 32 +++++++++++---------------------
>  2 files changed, 12 insertions(+), 64 deletions(-)
> 
> diff --git a/rules/pango.in b/rules/pango.in
> index f9c4810b3..e9061a973 100644
> --- a/rules/pango.in
> +++ b/rules/pango.in
> @@ -9,7 +9,7 @@ menuconfig PANGO
>  	select GOBJECT_INTROSPECTION	if PANGO_INTROSPECTION
>  	select CAIRO_GOBJECT		if PANGO_INTROSPECTION
>  	select GLIB
> -	select WINE if PANGO__WINE
> +	select HARFBUZZ
>  
>  if PANGO
>  
> @@ -21,46 +21,4 @@ config PANGO_TARGET_X11
>  	bool
>  	default GTK_TARGET_X11
>  
> -
> -config PANGO__WINE
> -	bool "extra dep for MINGW"
> -
> -
> -config PANGO_ARABIC
> -	bool
> -	prompt "arabic"
> -
> -config PANGO_BASIC
> -	bool
> -	default y
> -	prompt "basic"
> -
> -config PANGO_HANGUL
> -	bool
> -	prompt "hangul"
> -
> -config PANGO_HEBREW
> -	bool
> -	prompt "hebrew"
> -
> -config PANGO_INDIC
> -	bool
> -	prompt "indic"
> -
> -config PANGO_KHMER
> -	bool
> -	prompt "khmer"
> -
> -config PANGO_SYRIAC
> -	bool
> -	prompt "syriac"
> -
> -config PANGO_THAI
> -	bool
> -	prompt "thai"
> -
> -config PANGO_TIBETAN
> -	bool
> -	prompt "tibetan"
> -
>  endif
> diff --git a/rules/pango.make b/rules/pango.make
> index 515a361e5..d30515e7c 100644
> --- a/rules/pango.make
> +++ b/rules/pango.make
> @@ -18,11 +18,11 @@ PACKAGES-$(PTXCONF_PANGO) += pango
>  #
>  # Paths and names
>  #
> -PANGO_VERSION	:= 1.29.4
> -PANGO_MD5	:= a5ee785f4f31d6bdd8625a09ea3f8b4b
> +PANGO_VERSION	:= 1.40.6
> +PANGO_MD5	:= 507c6746fbf53fc9d48c577f1e265de3
>  PANGO		:= pango-$(PANGO_VERSION)
> -PANGO_SUFFIX	:= tar.bz2
> -PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/$(PANGO).$(PANGO_SUFFIX)
> +PANGO_SUFFIX	:= tar.xz
> +PANGO_URL	:= http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/$(PANGO).$(PANGO_SUFFIX)
>  PANGO_SOURCE	:= $(SRCDIR)/$(PANGO).$(PANGO_SUFFIX)
>  PANGO_DIR	:= $(BUILDDIR)/$(PANGO)
>  PANGO_LICENSE	:= LGPL-2.0+
> @@ -37,29 +37,19 @@ PANGO_ENV 	:= $(CROSS_ENV)
>  #
>  # autoconf
>  #
> -PANGO_MODULES-$(PTXCONF_PANGO_BASIC)	+= basic-fc,basic-win32,basic-x,basic-atsui
> -PANGO_MODULES-$(PTXCONF_PANGO_ARABIC)	+= arabic-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_HANGUL)	+= hangul-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_HEBREW)	+= hebrew-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_INDIC)	+= indic-fc,indic-lang
> -PANGO_MODULES-$(PTXCONF_PANGO_KHMER)	+= khmer-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_SYRIAC)	+= syriac-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_THAI)	+= thai-fc
> -PANGO_MODULES-$(PTXCONF_PANGO_TIBETAN)	+= tibetan-fc
> -
>  PANGO_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--x-includes=$(XORG_PREFIX)/include \
> -	--x-libraries=$(XORG_LIBDIR) \
> +	--enable-debug=no \
> +	--enable-rebuilds \
> +	--enable-introspection=no \
>  	--disable-gtk-doc \
>  	--disable-gtk-doc-html \
>  	--disable-gtk-doc-pdf \
> -	--disable-man \
>  	--disable-doc-cross-references \
> -	--enable-explicit-deps=no \
> -	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-x \
> -	--with-included-modules=$(subst $(space),$(comma),$(PANGO_MODULES-y)) \
> -	--without-dynamic-modules
> +	--enable-Bsymbolic \
> +	--disable-installed-tests \
> +	--$(call ptx/wwo, PTXCONF_PANGO_TARGET_X11)-xft \
> +	--with-cairo
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> -- 
> 2.13.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] pango: version bump 1.29.4 -> 1.40.6

[Clemens Gruber]

On Mon, Jun 26, 2017 at 12:18:04PM +0200, Michael Olbrich wrote:
> On Tue, Jun 06, 2017 at 04:36:39PM +0200, Clemens Gruber wrote:
> > Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> 
> FYI: I've not merged this patch yet because it breaks building gtk. That's
> a bug in gtk that's probably fixed in a newer version.
> We either need to update that package or move it to staging.
> Staging is probably ok. It's currently a rather old version. If someone
> cares, then they can update it and move it back. That's what staging is for
> after all.

Sounds good!

Clemens

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de