[ptxdist] [PATCH 3/3] mmc-utils: update license
Newly added README file clearly states that license is GPL-2.0-only. Add README and mmc.c license header as license files. Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index a5045b079..4cbc4dc34 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -22,7 +22,10 @@ MMC_UTILS_SUFFIX := tar.gz MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) -MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause +MMC_UTILS_LICENSE := GPL-2.0-only +MMC_UTILS_LICENSE_FILES := \ + file://README;startline=28;endline=31;md5=73e5e3ce638b21eca6e204e260201d4a \ + file://mmc.c;startline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d # # Prepare -- 2.37.3
[ptxdist] [PATCH 2/3] mmc-utils: version bump 2019-10-04-g73d6c59af8d1 -> 2022-09-27-gdfc3b6ecda84
Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index 4d9447dd2..a5045b079 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MMC_UTILS) += mmc-utils # Paths and names # # No tags: use a fake descriptive commit-ish to include the date -MMC_UTILS_VERSION := 2019-10-04-g73d6c59af8d1 -MMC_UTILS_MD5 := 5d7c8db4f1735111d42773799e1a84bc +MMC_UTILS_VERSION := 2022-09-27-gdfc3b6ecda84 +MMC_UTILS_MD5 := 791e4c512cb044045ae34d7f4b781ac1 MMC_UTILS := mmc-utils-$(MMC_UTILS_VERSION) MMC_UTILS_SUFFIX := tar.gz MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) -- 2.37.3
[ptxdist] [PATCH 1/3] mmc-utils: new upstream git location
The existing URL has been renamed with -old: https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils-old.git New URL found in kernel documentation: https://www.kernel.org/doc/html/latest/driver-api/mmc/mmc-tools.html Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index 5929d0788..4d9447dd2 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -19,7 +19,7 @@ MMC_UTILS_VERSION := 2019-10-04-g73d6c59af8d1 MMC_UTILS_MD5 := 5d7c8db4f1735111d42773799e1a84bc MMC_UTILS := mmc-utils-$(MMC_UTILS_VERSION) MMC_UTILS_SUFFIX := tar.gz -MMC_UTILS_URL := https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;tag=$(MMC_UTILS_VERSION) +MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause base-commit: 2904240113270c90686515a6b06af48d2d5332cf -- 2.37.3
Re: [ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2
On 10/4/22 16:47, Bastian Krause wrote: Signed-off-by: Bastian Krause --- rules/cairo.make | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) I missed the patches from 1.16.0. I'll have a look whether they're still required and send a v2. Regards, Bastian diff --git a/rules/cairo.make b/rules/cairo.make index e9e395b26..416aa38cf 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo # # Paths and names # -CAIRO_VERSION := 1.16.0 -CAIRO_MD5 := f19e0353828269c22bd72e271243a552 +CAIRO_VERSION := 1.17.2 +CAIRO_MD5 := 321a07adaeb125cb5513079256d465fb CAIRO := cairo-$(CAIRO_VERSION) CAIRO_SUFFIX := tar.xz -CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) +CAIRO_URL := https://cairographics.org/snapshots/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX) CAIRO_DIR := $(BUILDDIR)/$(CAIRO) CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1 @@ -40,8 +40,6 @@ CAIRO_CONF_OPT:= \ --enable-shared \ --disable-static \ --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-atomic \ --disable-gcov \ -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
[ptxdist] [PATCH] libtasn1: version bump 4.18.0 -> 4.19.0
Signed-off-by: Bastian Krause --- rules/libtasn1.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libtasn1.make b/rules/libtasn1.make index 7e54635d2..ce06ddfe4 100644 --- a/rules/libtasn1.make +++ b/rules/libtasn1.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTASN1) += libtasn1 # # Paths and names # -LIBTASN1_VERSION := 4.18.0 -LIBTASN1_MD5 := 8203e72a2c0390515410b2ea2c032f04 +LIBTASN1_VERSION := 4.19.0 +LIBTASN1_MD5 := f701ab57eb8e7d9c105b2cd5d809b29a LIBTASN1 := libtasn1-$(LIBTASN1_VERSION) LIBTASN1_SUFFIX:= tar.gz LIBTASN1_URL := $(call ptx/mirror, GNU, libtasn1/$(LIBTASN1).$(LIBTASN1_SUFFIX)) -- 2.30.2
[ptxdist] [PATCH] libepoxy: version bump 1.5.8 -> 1.5.10
Signed-off-by: Bastian Krause --- rules/libepoxy.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/libepoxy.make b/rules/libepoxy.make index 8b770ac2e..3a5da2615 100644 --- a/rules/libepoxy.make +++ b/rules/libepoxy.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBEPOXY) += libepoxy # # Paths and names # -LIBEPOXY_VERSION := 1.5.8 -LIBEPOXY_MD5 := ad6a912bf95e97d6b8b471efc249ed00 +LIBEPOXY_VERSION := 1.5.10 +LIBEPOXY_MD5 := f0730aad115c952e77591fcc805b1dc1 LIBEPOXY := libepoxy-$(LIBEPOXY_VERSION) -LIBEPOXY_SUFFIX:= tar.xz -LIBEPOXY_URL := https://github.com/anholt/libepoxy/releases/download/$(LIBEPOXY_VERSION)/$(LIBEPOXY).$(LIBEPOXY_SUFFIX) +LIBEPOXY_SUFFIX:= tar.gz +LIBEPOXY_URL := https://github.com/anholt/libepoxy/archive/refs/tags/$(LIBEPOXY_VERSION).$(LIBEPOXY_SUFFIX) LIBEPOXY_SOURCE:= $(SRCDIR)/$(LIBEPOXY).$(LIBEPOXY_SUFFIX) LIBEPOXY_DIR := $(BUILDDIR)/$(LIBEPOXY) LIBEPOXY_LICENSE := MIT -- 2.30.2
[ptxdist] [PATCH] harfbuzz: version bump 5.1.0 -> 5.2.0
Signed-off-by: Bastian Krause --- rules/harfbuzz.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/harfbuzz.make b/rules/harfbuzz.make index 57101b7bf..1d34ac95d 100644 --- a/rules/harfbuzz.make +++ b/rules/harfbuzz.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HARFBUZZ) += harfbuzz # # Paths and names # -HARFBUZZ_VERSION := 5.1.0 -HARFBUZZ_MD5 := 76faebc692afe666520cc158430f1a14 +HARFBUZZ_VERSION := 5.2.0 +HARFBUZZ_MD5 := 9e0bd000f1e620cdbd4abd17b4d4beee HARFBUZZ := harfbuzz-$(HARFBUZZ_VERSION) HARFBUZZ_SUFFIX:= tar.xz HARFBUZZ_URL := https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/$(HARFBUZZ).$(HARFBUZZ_SUFFIX) -- 2.30.2
[ptxdist] [PATCH] icu: version bump 69.1 -> 71.1
The license checksum change contains no relevant changes for the license specifiers, as far as I can see. Signed-off-by: Bastian Krause --- rules/icu.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/icu.make b/rules/icu.make index a9bd8af12..182c4f32a 100644 --- a/rules/icu.make +++ b/rules/icu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ICU) += icu # # Paths and names # -ICU_VERSION:= 69.1 -ICU_MD5:= 9403db682507369d0f60a25ea67014c4 +ICU_VERSION:= 71.1 +ICU_MD5:= e06ffc96f59762bd3c929b217445aaec ICU:= icu4c-$(subst .,_,$(ICU_VERSION))-src ICU_SUFFIX := tgz ICU_URL:= https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(ICU_VERSION))/$(ICU).$(ICU_SUFFIX) @@ -24,7 +24,7 @@ ICU_DIR := $(BUILDDIR)/$(ICU) ICU_SUBDIR := source ICU_LICENSE:= MIT AND Unicode-TOU AND public_domain AND BSD-3-Clause ICU_LICENSE_FILES := \ - file://LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0 + file://LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f # # Prepare -- 2.30.2
[ptxdist] [PATCH] libpng: version bump 1.6.37 -> 1.6.38
Signed-off-by: Bastian Krause --- rules/libpng.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpng.make b/rules/libpng.make index 0a1fbdee9..e9b0bf67a 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng # # Paths and names # -LIBPNG_VERSION := 1.6.37 -LIBPNG_MD5 := 015e8e15db1eecde5f2eb9eb5b6e59e9 +LIBPNG_VERSION := 1.6.38 +LIBPNG_MD5 := 122e6b7837811698563083b352bc8ca2 LIBPNG := libpng-$(LIBPNG_VERSION) LIBPNG_SUFFIX := tar.xz LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX)) -- 2.30.2
[ptxdist] [PATCH 2/2] cairo: version bump 1.16 -> 1.17.2
Signed-off-by: Bastian Krause --- rules/cairo.make | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/cairo.make b/rules/cairo.make index e9e395b26..416aa38cf 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo # # Paths and names # -CAIRO_VERSION := 1.16.0 -CAIRO_MD5 := f19e0353828269c22bd72e271243a552 +CAIRO_VERSION := 1.17.2 +CAIRO_MD5 := 321a07adaeb125cb5513079256d465fb CAIRO := cairo-$(CAIRO_VERSION) CAIRO_SUFFIX := tar.xz -CAIRO_URL := http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) +CAIRO_URL := https://cairographics.org/snapshots/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX) CAIRO_SOURCE := $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX) CAIRO_DIR := $(BUILDDIR)/$(CAIRO) CAIRO_LICENSE := LGPL-2.1-only OR MPL-1.1 @@ -40,8 +40,6 @@ CAIRO_CONF_OPT:= \ --enable-shared \ --disable-static \ --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ $(GLOBAL_LARGE_FILE_OPTION) \ --enable-atomic \ --disable-gcov \ -- 2.30.2
[ptxdist] [PATCH 1/2] host-cairo: disable doc generation
Signed-off-by: Bastian Krause --- rules/host-cairo.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/host-cairo.make b/rules/host-cairo.make index aa5c24cec..6936b9bc2 100644 --- a/rules/host-cairo.make +++ b/rules/host-cairo.make @@ -25,6 +25,7 @@ HOST_CAIRO_CONF_OPT := \ $(HOST_AUTOCONF) \ --enable-shared \ --disable-static \ + --disable-gtk-doc \ --enable-atomic \ --disable-gcov \ --disable-valgrind \ -- 2.30.2
[ptxdist] [PATCH 4/4] cog: use libsoup3
Signed-off-by: Bastian Krause --- rules/cog.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/cog.make b/rules/cog.make index e8be1f709..2c0514a22 100644 --- a/rules/cog.make +++ b/rules/cog.make @@ -43,7 +43,7 @@ COG_CONF_OPT := \ -Dplatforms=wayland \ -Dplugin_path=/usr/lib/cog/modules \ -Dprograms=true \ - -Dsoup2=enabled \ + -Dsoup2=disabled \ -Dwayland_weston_content_protection=false \ -Dwayland_weston_direct_display=false -- 2.30.2
[ptxdist] [PATCH 3/4] wpewebkit: use libsoup3
libsoup 3.0 is not API-compatible with 2.0, see [1]. When switching to it, the libWPEWebKit version changes. [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html Signed-off-by: Bastian Krause --- rules/wpewebkit.make | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index 3819c5667..4421f33fb 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -69,7 +69,7 @@ WPEWEBKIT_CONF_OPT:= \ -DUSE_JPEGXL=OFF \ -DUSE_LCMS=OFF \ -DUSE_OPENJPEG=OFF \ - -DUSE_SOUP2=ON \ + -DUSE_SOUP2=OFF \ -DUSE_THIN_ARCHIVES=ON \ -DUSE_WOFF2=OFF @@ -105,10 +105,10 @@ $(STATEDIR)/wpewebkit.targetinstall: @$(call install_fixup, wpewebkit,AUTHOR,"Steffen Trumtrar ") @$(call install_fixup, wpewebkit,DESCRIPTION,missing) - @$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.0) + @$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.1) - @$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.0) - @$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.0) + @$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.1) + @$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.1) ifdef PTXCONF_WPEWEBKIT_QT @$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/qt5/qml/org/wpewebkit) -- 2.30.2
[ptxdist] [PATCH 2/4] libsoup: version bump 2.72.0 -> 3.2.0
Note that libsoup 3.x breaks previous ABI [1]. [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html Signed-off-by: Bastian Krause --- rules/libsoup.in | 5 + rules/libsoup.make | 15 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rules/libsoup.in b/rules/libsoup.in index 42ee2b1d8..788d7985d 100644 --- a/rules/libsoup.in +++ b/rules/libsoup.in @@ -6,11 +6,8 @@ config LIBSOUP select HOST_GLIB select GLIB select SQLITE + select LIBNGHTTP2 select LIBPSL - select LIBXML2 - select LIBXML2_OUTPUT - select LIBXML2_SAX1 - select HOST_INTLTOOL select GOBJECT_INTROSPECTIONif LIBSOUP_INTROSPECTION prompt "libsoup" help diff --git a/rules/libsoup.make b/rules/libsoup.make index 74ae2f030..34b80ecee 100644 --- a/rules/libsoup.make +++ b/rules/libsoup.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup # # Paths and names # -LIBSOUP_VERSION:= 2.72.0 -LIBSOUP_MD5:= 859380b76b51fb55d720daea3c76c945 +LIBSOUP_VERSION:= 3.2.0 +LIBSOUP_MD5:= 34f1f15aa43f974dadf256aef2e89587 LIBSOUP:= libsoup-$(LIBSOUP_VERSION) LIBSOUP_SUFFIX := tar.xz LIBSOUP_URL:= $(call ptx/mirror, GNOME, libsoup/$(basename $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX)) @@ -35,15 +35,18 @@ LIBSOUP_LICENSE_FILES := \ LIBSOUP_CONF_TOOL := meson LIBSOUP_CONF_OPT := \ $(CROSS_MESON_USR) \ + -Dautobahn=disabled \ -Dbrotli=disabled \ - -Dgnome=true \ + -Ddoc_tests=false \ + -Ddocs=disabled \ + -Dfuzzing=disabled \ -Dgssapi=disabled \ - -Dgtk_doc=false \ -Dinstalled_tests=false \ -Dintrospection=$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)d \ -Dkrb5_config= \ -Dntlm=disabled \ -Dntlm_auth=ntlm_auth \ + -Dpkcs11_tests=disabled \ -Dsysprof=disabled \ -Dtests=false \ -Dtls_check=false \ @@ -62,10 +65,10 @@ $(STATEDIR)/libsoup.targetinstall: @$(call install_fixup, libsoup,AUTHOR,"Marc Kleine-Budde ") @$(call install_fixup, libsoup,DESCRIPTION,missing) - @$(call install_lib, libsoup, 0, 0, 0644, libsoup-2.4) + @$(call install_lib, libsoup, 0, 0, 0644, libsoup-3.0) ifdef PTXCONF_LIBSOUP_INTROSPECTION @$(call install_copy, libsoup, 0, 0, 0644, -, \ - /usr/lib/girepository-1.0/Soup-2.4.typelib) + /usr/lib/girepository-1.0/Soup-3.0.typelib) endif @$(call install_finish, libsoup) -- 2.30.2
[ptxdist] [PATCH 1/4] libnghttp2: new package
Signed-off-by: Bastian Krause --- rules/libnghttp2.in | 8 + rules/libnghttp2.make | 77 +++ 2 files changed, 85 insertions(+) create mode 100644 rules/libnghttp2.in create mode 100644 rules/libnghttp2.make diff --git a/rules/libnghttp2.in b/rules/libnghttp2.in new file mode 100644 index 0..ef5f879f2 --- /dev/null +++ b/rules/libnghttp2.in @@ -0,0 +1,8 @@ +## SECTION=networking + +config LIBNGHTTP2 + tristate + select HOST_CMAKE + prompt "libnghttp2" + help + HTTP/2 C Library and tools diff --git a/rules/libnghttp2.make b/rules/libnghttp2.make new file mode 100644 index 0..cde2dc5de --- /dev/null +++ b/rules/libnghttp2.make @@ -0,0 +1,77 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 by Bastian Krause +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_LIBNGHTTP2) += libnghttp2 + +# +# Paths and names +# +LIBNGHTTP2_VERSION := 1.50.0 +LIBNGHTTP2_MD5 := 4168ccacaa009665b6a7fe455842f95b +LIBNGHTTP2 := nghttp2-$(LIBNGHTTP2_VERSION) +LIBNGHTTP2_SUFFIX := tar.xz +LIBNGHTTP2_URL := https://github.com/nghttp2/nghttp2/releases/download/v$(LIBNGHTTP2_VERSION)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX) +LIBNGHTTP2_SOURCE := $(SRCDIR)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX) +LIBNGHTTP2_DIR := $(BUILDDIR)/$(LIBNGHTTP2) +LIBNGHTTP2_LICENSE := MIT +LIBNGHTTP2_LICENSE_FILES := file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec + +# +# Prepare +# + +# +# cmake +# +LIBNGHTTP2_CONF_TOOL := cmake +LIBNGHTTP2_CONF_OPT:= \ + $(CROSS_CMAKE_USR) \ + -DENABLE_APP=OFF \ + -DENABLE_ASIO_LIB=OFF \ + -DENABLE_DEBUG=OFF \ + -DENABLE_DOC=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_FAILMALLOC=OFF \ + -DENABLE_HPACK_TOOLS=OFF \ + -DENABLE_HTTP3=OFF \ + -DENABLE_LIB_ONLY=ON \ + -DENABLE_PYTHON_BINDINGS=OFF \ + -DENABLE_SHARED_LIB=ON \ + -DENABLE_STATIC_CRT=OFF \ + -DENABLE_STATIC_LIB=OFF \ + -DENABLE_THREADS=ON \ + -DENABLE_WERROR=OFF \ + -DWITH_JEMALLOC=OFF \ + -DWITH_LIBBPF=OFF \ + -DWITH_LIBXML2=OFF \ + -DWITH_MRUBY=OFF \ + -DWITH_NEVERBLEED=OFF + +# +# Target-Install +# + +$(STATEDIR)/libnghttp2.targetinstall: + @$(call targetinfo) + + @$(call install_init, libnghttp2) + @$(call install_fixup, libnghttp2,PRIORITY,optional) + @$(call install_fixup, libnghttp2,SECTION,base) + @$(call install_fixup, libnghttp2,AUTHOR,"Bastian Krause ") + @$(call install_fixup, libnghttp2,DESCRIPTION,missing) + + @$(call install_lib, libnghttp2, 0, 0, 0644, libnghttp2) + + @$(call install_finish, libnghttp2) + + @$(call touch) + +# vim: syntax=make -- 2.30.2
[ptxdist] [PATCH 0/4] Switch to libsoup3
libsoup 3.x breaks ABI compatibility with previous versions [1][2]. This series bumps the version of libsoup from 2.72.0 to 3.2.0. No libsoup2 legacy package is needed since all dependants support libsoup3 already. libnghttp2 is required now, so introduce a new package for that. Finally migrate the packages that depend on libsoup and have some kind of explicit version switch for libsoup2/libsoup3. Note: gst-plugins-good1 needs no modification because it distinguishes between libsoup2/libsoup3 automatically. Regards, Bastian [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html [2] https://blog.tingping.se/2021/02/23/future-of-libsoup.html Bastian Krause (4): libnghttp2: new package libsoup: version bump 2.72.0 -> 3.2.0 wpewebkit: use libsoup3 cog: use libsoup3 rules/cog.make| 2 +- rules/libnghttp2.in | 8 + rules/libnghttp2.make | 77 +++ rules/libsoup.in | 5 +-- rules/libsoup.make| 15 + rules/wpewebkit.make | 8 ++--- 6 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 rules/libnghttp2.in create mode 100644 rules/libnghttp2.make -- 2.30.2
Re: [ptxdist] pkg-config-wrapper issue
> -Original Message-
> From: ptxdist On Behalf Of Ladislav Michl
> Sent: Monday, October 3, 2022 3:44 PM
> To: ptxdist@pengutronix.de
> Subject: Re: [ptxdist] pkg-config-wrapper issue
>
> On Mon, Oct 03, 2022 at 06:14:34PM +, Richard OGrady wrote:
> > Hello,
> >
> > We are using ptxdist 2022.07 and are building 2 packages, libimxvpuapi2 and
> > libimxdmabuffer.
> > libimxvpuapi2 depends on libimxdmabuffer and accordingly libimxvpuapi2.in
> > selects libimxdmabuffer.
>
> Those 'depends on' and 'select' are actual keywords used in *.in files or
> just a
> description?
>
'depends on' is just a statement of fact, 'select' is keyword in
libimxvpuapi2.in
> > The libimxvpuapi2 build fails during config. The config file shows
> >
> > Checking for 'libimxdmabuffer >= 0.9.0'
> > ['/home/rich/imx6_3D104X_fsl6/Grayhill-iMX6/platform-3D50_std/sysroot-
> > cross/bin/pkg-config', '--cflags', '--libs', 'libimxdmabuffer', '>=',
> > '0.9.0']
> > err: pkg-config: warning: blocking 'libimxdmabuffer': not selected by
> > 'libimxvpuapi2'
> >
> > So pkg-config-wrapper is blocking the libimxdmabuffer package. The code
> > that does this in pkg-config-wrapper is:
> >
> > for pkg in ${pkgs}; do
> >if [[ ! " ${whitelist} " =~ " ${pkg} " && ! "${pkg}" =~
> > '-uninstalled' ]]; then
> > echo "$(basename ${0}): warning: blocking '${pkg}': not
> > selected by '${PKGCONFIG_WHITELIST_SRC}'" >&${ERROR_FD}
> > exit 1
> >fi
> >done
> >
> > We can get rid of the issue by commenting out the code above in
> > pkg-config-wrapper but it seems that then breaks some other packages.
> > Libimxdmabuffer is version 1.1.2. Both packages are using waf to build.
> >
> > What could be going wrong?
>
> It is a bit hard to tell without seeing actutal code, but from description
> above I
> guess you created circular dependency which got dropped.
>
I guess another way to ask the question is what is that code chunk in
pkg-config-wrapper trying to do?
It seems that if ${whitelist} were to contain ${pkg} then it would not bail
out. Correct?
If so, then by what mechanism would ${whitelist} contain ${pkg}?
> > Rich OGrady
> >
> >
[ptxdist] [PATCH] dbus: Version bump. 1.14.0 -> 1.15.0
https://github.com/freedesktop/dbus/blob/master/NEWS Mostly fixes. A meson build system is being prepared to replace cmake/autotools. Signed-off-by: Christian Melki --- rules/dbus.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/dbus.make b/rules/dbus.make index 90a0347fe..c1239cde4 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.14.0 -DBUS_MD5 := ddd5570aff05191dbee8e42d751f1b7d +DBUS_VERSION := 1.15.0 +DBUS_MD5 := 80e3f8f1abab68117eedef4df3403e90 DBUS := dbus-$(DBUS_VERSION) DBUS_SUFFIX:= tar.xz DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] bash: Version bump. 5.1.16 -> 5.2
https://git.savannah.gnu.org/cgit/bash.git/tree/NEWS Bunch of fixes and some new functionality. * License file had copyright year changes. * Re-enable parallelization of build. Signed-off-by: Christian Melki --- rules/bash.make | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rules/bash.make b/rules/bash.make index 8213aafad..080c8f307 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -13,18 +13,17 @@ PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names # -BASH_VERSION := 5.1.16 -BASH_MD5 := c17b20a09fc38d67fb303aeb6c130b4e +BASH_VERSION := 5.2 +BASH_MD5 := cfb4cf795fc239667f187b3d6b3d396f BASH := bash-$(BASH_VERSION) BASH_SUFFIX:= tar.gz BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) BASH_SOURCE:= $(SRCDIR)/$(BASH).$(BASH_SUFFIX) BASH_DIR := $(BUILDDIR)/$(BASH) -BASH_MAKE_PAR := NO BASH_LICENSE := GPL-3.0-or-later BASH_LICENSE_FILES := \ file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://general.c;startline=1;endline=19;md5=94a266185749191808da241ccc2af60a + file://general.c;startline=1;endline=19;md5=e33b255b2fde7a27805a07a2a59d571e # # Prepare -- 2.34.1
Re: [ptxdist] OSELAS.Toolchain-2019.09.1 Building Issue
On Mon, Oct 03, 2022 at 08:27:04PM +0200, Alexander Dahl wrote: > Hello, > > Am Mon, Oct 03, 2022 at 05:38:27PM + schrieb Joshi, Pranay: > > Hi Michael, > > > > Thanks for your solutions. > > > > I tried both the solution, > > > > 1. First solution : Installed gcc9 and also changed Developer Options as > > mentioned. > > > > 2. Second Solution : Also used OSELAS Toolchain 2021.07.0 > > > > But still getting issues in both the solution. > > > > Please check attached logs for errors for both the solutions - > > Solution1: OSELAS.Toolchain-2019.09.1_Build_Error_with_gcc9 Hmmm, the logfile suggests that you're still using gcc 11. What does this show: $ ls -l platform-*/sysroot-host/lib/wrapper/real/ > > Solution2: OSELAS.Toolchain-2021.07.0_Build_Error_1 > > > > If you have any other option that I can try please let me know. > > You can use precompiled toolchains from http://debian.pengutronix.de/ > … follow the instructions on that site to install. Indeed. And there are packages for 22.04 for this toolchain release. So I fixed this compile error, but I cannot find the fix :-/ anymore. I don't remember but it's probably just an upstream patch. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
[ptxdist] [PATCH] tpm2-tools: Version bump. 5.2 -> 5.3
https://github.com/tpm2-software/tpm2-tools/releases/tag/5.3 A lot of fixes and enhancements over the last year. * License file moved from doc to docs. Contents is identical. * Add tpm2 tools and a section for tss2 tools. Was missing previously. Signed-off-by: Christian Melki --- rules/tpm2-tools.make | 50 --- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make index 357bb245e..efc748531 100644 --- a/rules/tpm2-tools.make +++ b/rules/tpm2-tools.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools # # Paths and names # -TPM2_TOOLS_VERSION := 5.2 -TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6 +TPM2_TOOLS_VERSION := 5.3 +TPM2_TOOLS_MD5 := a319d4623f184b80851780b4e425208f TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) TPM2_TOOLS_SUFFIX := tar.gz TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) TPM2_TOOLS_LICENSE := BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES := file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 +TPM2_TOOLS_LICENSE_FILES := file://docs/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 # # Prepare @@ -75,6 +75,7 @@ TPM2_TOOLS_TPM2_PROGS := \ tpm2_ecdhkeygen \ tpm2_ecdhzgen \ tpm2_ecephemeral \ + tpm2_encodeobject \ tpm2_encryptdecrypt \ tpm2_eventlog \ tpm2_evictcontrol \ @@ -154,6 +155,45 @@ TPM2_TOOLS_TPM2_PROGS := \ tpm2_verifysignature \ tpm2_zgen2phase +TPM2_TOOLS_TSS2_PROGS := \ + tss2_authorizepolicy \ + tss2_changeauth \ + tss2_createkey \ + tss2_createnv \ + tss2_createseal \ + tss2_decrypt \ + tss2_delete \ + tss2_encrypt \ + tss2_exportkey \ + tss2_exportpolicy \ + tss2_getappdata \ + tss2_getcertificate \ + tss2_getdescription \ + tss2_getinfo \ + tss2_getplatformcertificates \ + tss2_getrandom \ + tss2_gettpm2object \ + tss2_gettpmblobs \ + tss2_import \ + tss2_list \ + tss2_nvextend \ + tss2_nvincrement \ + tss2_nvread \ + tss2_nvsetbits \ + tss2_nvwrite \ + tss2_pcrextend \ + tss2_pcrread \ + tss2_provision \ + tss2_quote \ + tss2_setappdata \ + tss2_setcertificate \ + tss2_setdescription \ + tss2_sign \ + tss2_unseal \ + tss2_verifyquote \ + tss2_verifysignature \ + tss2_writeauthorizenv + $(STATEDIR)/tpm2-tools.targetinstall: @$(call targetinfo) @@ -164,10 +204,14 @@ $(STATEDIR)/tpm2-tools.targetinstall: @$(call install_fixup, tpm2-tools,DESCRIPTION,missing) @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2) + @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tss2) @$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \ @$(call install_link, tpm2-tools, tpm2, /usr/bin/$(prog))$(ptx/nl)) + @$(foreach prog, $(TPM2_TOOLS_TSS2_PROGS), \ + @$(call install_link, tpm2-tools, tss2, /usr/bin/$(prog))$(ptx/nl)) + @$(call install_finish, tpm2-tools) @$(call touch) -- 2.34.1
[ptxdist] Golang (again)
Hi there, I found these comments about Go support efforts: 04 Oct 2016 by Clemens Gruber: https://www.mail-archive.com/ptxdist@pengutronix.de/msg11013.html and 16 Apr 2021 by Enrico Weigelt: https://www.mail-archive.com/ptxdist@pengutronix.de/msg17959.html To my best knowledge, none of them was followed with patches. One of the projects I'm working on is using Docker and for the sake of simplicity I'm just deploying Docker provided statically linked binary. So before starting over, is there anything even hackish published somewhere? Best regards, ladis
[ptxdist] [PATCH] libcap: Version bump. 2.65 -> 2.66.
Very minor bugfixes. https://git.kernel.org/pub/scm/libs/libcap/libcap.git/log/?h=v1.2.66 Signed-off-by: Christian Melki --- rules/libcap.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libcap.make b/rules/libcap.make index 8d6bc856a..8b4cf246b 100644 --- a/rules/libcap.make +++ b/rules/libcap.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap # # Paths and names # -LIBCAP_VERSION := 2.65 -LIBCAP_MD5 := 3543e753dd941255c4def6cc67a462bb +LIBCAP_VERSION := 2.66 +LIBCAP_MD5 := 00afd6e13bc94b2543b1a70770bdb41f LIBCAP := libcap-$(LIBCAP_VERSION) LIBCAP_SUFFIX := tar.xz LIBCAP_URL := \ -- 2.34.1
