[ptxdist] [PATCH v2] blspec-entry: add linux-appendroot support
Add the option to add the 'linux-appendroot true' to blspec config file which is very useful in case of using barebox as bootlaoder. Signed-off-by: Marco Felsch --- Hi, the v1 of this patch can be found here: https://lore.ptxdist.org/ptxdist/20220901085941.2597793-1-m.fel...@pengutronix.de/ Changes: v2: - keep the @LINUXAPPENDROOT@ empty if not enabled platforms/blspec-entry.in | 8 projectroot/loader/entries/default.conf | 1 + rules/blspec-entry.make | 10 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in index aed65d4..c2aea36 100644 --- a/platforms/blspec-entry.in +++ b/platforms/blspec-entry.in @@ -16,4 +16,12 @@ config BLSPEC_ENTRY_CMDLINE string prompt "kernel command-line" +config BLSPEC_ENTRY_APPENDROOT + bool + prompt "Add 'linux-appendroot true'" + help + If enabled this options adds 'linux-appendroot true' to the blspec + entry. This is a barebox specific blspec option which tells barebox + to add the 'root=' kernel command line automatically if set. + endif diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf index 5650907..d281569 100644 --- a/projectroot/loader/entries/default.conf +++ b/projectroot/loader/entries/default.conf @@ -3,3 +3,4 @@ version @VERSION@ options@CMDLINE@ linux @KERNEL@ @DEVICETREE@ +@LINUXAPPENDROOT@ diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make index f393b1b..7523009 100644 --- a/rules/blspec-entry.make +++ b/rules/blspec-entry.make @@ -35,6 +35,12 @@ else BLSPEC_KERNEL_IMAGE= $(KERNEL_IMAGE) endif +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT +BLSPEC_APPENDROOT = linux-appendroot\ttrue +else +BLSPEC_APPENDROOT = +endif + $(STATEDIR)/blspec-entry.targetinstall: @$(call targetinfo) @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall: $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \ $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl)) + @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \ + $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ + @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl)) @$(call install_finish,blspec-entry) -- 2.30.2
[ptxdist] [PATCH v2] Readded lmbench
lmbench was previously removed from PTXDist in commit 81761ccf73cb470e310f121f9e62e926e7f7f4aa due to build failures with newer GCC versions. This commit reverts the commit and adds the necessary patches to compile lmbench with newer GCC versions. Signed-off-by: Sven Püschel --- ...0001-Add-autotool-based-build-system.patch | 930 ++ ...0002-Add-autotool-based-build-system.patch | 263 + .../lmbench-3.0-a9/0003-minor-cleanups.patch | 45 + .../lmbench-3.0-a9/0004-Added-libtirpc.patch | 59 ++ ...-missing-include-for-socklen_t-check.patch | 25 + patches/lmbench-3.0-a9/autogen.sh | 1 + patches/lmbench-3.0-a9/series | 8 + rules/lmbench.in | 10 + rules/lmbench.make| 104 ++ 9 files changed, 1445 insertions(+) create mode 100644 patches/lmbench-3.0-a9/0001-Add-autotool-based-build-system.patch create mode 100644 patches/lmbench-3.0-a9/0002-Add-autotool-based-build-system.patch create mode 100644 patches/lmbench-3.0-a9/0003-minor-cleanups.patch create mode 100644 patches/lmbench-3.0-a9/0004-Added-libtirpc.patch create mode 100644 patches/lmbench-3.0-a9/0005-Added-missing-include-for-socklen_t-check.patch create mode 12 patches/lmbench-3.0-a9/autogen.sh create mode 100644 patches/lmbench-3.0-a9/series create mode 100644 rules/lmbench.in create mode 100644 rules/lmbench.make diff --git a/patches/lmbench-3.0-a9/0001-Add-autotool-based-build-system.patch b/patches/lmbench-3.0-a9/0001-Add-autotool-based-build-system.patch new file mode 100644 index 0..f40b509d8 --- /dev/null +++ b/patches/lmbench-3.0-a9/0001-Add-autotool-based-build-system.patch @@ -0,0 +1,930 @@ +From: Robert Schwebel +Date: Thu, 9 Apr 2009 19:40:55 + +Subject: [PATCH] Add autotool based build system + +In order to provide an autotool based build system, remove the old one. + +Signed-off-by: Robert Schwebel +--- + Makefile | 74 - + results/Makefile | 333 - + src/Makefile | 489 --- + 3 files changed, 896 deletions(-) + delete mode 100644 Makefile + delete mode 100644 results/Makefile + delete mode 100644 src/Makefile + +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index e84dda8079ac.. +--- a/Makefile /dev/null +@@ -1,74 +0,0 @@ +-# Makefile for top level of lmbench +-# $Id$ +- +-# Possible things to $(MAKE): +-# +-# build (default) go to the source directory and build the benchmark +-# results go to the source directory and build and run the benchmark +-# rerun run the benchmark again +-# see see the results that came with this release +-# Go to the results directory and read the Makefile. +-# doc.lpr print the documentation +-# doc.x preview the documentation (needs X, groff, pic, etc) +-# clean go to the subdirs and $(MAKE) clean +-# get $(MAKE) sure all files are checked out +-# sharbuild a shippable shar archive +- +-SHELL=/bin/sh +- +-build: +- cd src && $(MAKE) +- +-results: FRC +- cd src && $(MAKE) results +- +-rerun: +- cd src && $(MAKE) rerun +- +-see: +- cd results && $(MAKE) summary >summary.out 2>summary.errs +- cd results && $(MAKE) percent >percent.out 2>percent.errs +- +-doc.lpr: +- cd doc && $(MAKE) PS && lpr *.PS +- +-doc.x: +- cd doc && $(MAKE) x +- +-clobber clean: +- for i in doc src results scripts; do \ +- echo = $$i =; \ +- (cd $$i && $(MAKE) clean); \ +- done +- /bin/rm -rf bin/* +- -bk clean +- +-get: +- for i in doc src results scripts; do \ +- echo = $$i =; \ +- (cd $$i && bk get -q); \ +- done +- @co -q +- +-info: +- for i in doc src results scripts; do \ +- echo = $$i =; \ +- (cd $$i && info); \ +- done +- +-release: scripts/mkrelease +- scripts/mkrelease +- +-scripts/mkrelease: +- cd scripts && co mkrelease +- +-# XXX - . must be named lmbench for this to work +-shar: +- $(MAKE) clean +- co -q Makefile +- $(MAKE) get +- cd .. && \ +- find lmbench -type f -print | egrep -v 'noship|RCS' > /tmp/FILES +- cd .. && shar -S -a -n lmbench1.0 -L 50K < /tmp/FILES +- +-FRC: +diff --git a/results/Makefile b/results/Makefile +deleted file mode 100644 +index 0935376c13e3.. +--- a/results/Makefile /dev/null +@@ -1,333 +0,0 @@ +-# Makefile for lmbench results. +-# $Id$ +-# +-# Usage: make [ LIST="aix/* sunos/* ..." ] [ what ] +-# +-# What to make: +-# print Prints the results 1 per page. +-# ps Saves the postscript of 1 per page in PS/PS +-# 4.psSaves the postscript of 4 per page in PS/PS4 +-# 8.ps
[ptxdist] [PATCH] ptxd_make_world_compile_commands_filter: Fix grep for uptodate check
The intend here is to check the return code of grep, no need to call [
(i.e. test). This fixes an error message:
environment: line 10: [: syntax error: `-q' unexpected
Additionally add -e to force interpretation of
"${PTXDIST_CROSS_CPPFLAGS}" as pattern. For me
${PTXDIST_CROSS_CPPFLAGS} starts with -isystem; without -e this is
interpreted as option to grep instead of pattern which makes grep emit
grep: invalid option -- 't'
.)
Also add -F to make grep use a fixed-string compare (instead of
interpreting ${PTXDIST_CROSS_CPPFLAGS} as regexp).
Fixes: ac0aac7fc727 ("impove compile_commands.json handling")
Signed-off-by: Uwe Kleine-König
---
scripts/lib/ptxd_make_world_compile_commands.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_world_compile_commands.sh
b/scripts/lib/ptxd_make_world_compile_commands.sh
index 56d7378fa28b..2703b5497799 100644
--- a/scripts/lib/ptxd_make_world_compile_commands.sh
+++ b/scripts/lib/ptxd_make_world_compile_commands.sh
@@ -21,7 +21,7 @@ ptxd_make_world_compile_commands_filter() {
fi
if [ "${src_cmds}" = "${dst_cmds}" ]; then
- if [ grep -q "${PTXDIST_CROSS_CPPFLAGS}" "${src_cmds}" ]; then
+ if grep -q -F -e "${PTXDIST_CROSS_CPPFLAGS}" "${src_cmds}"; then
ptxd_warning "compile_commands.json is already up to date!"
return
fi
--
2.39.0
[ptxdist] [PATCH] libjpeg: Version bump. 2.1.5 -> 2.1.5.1
Very minor bugfix release. Just a fix for assymetrical insn. set CPUs. (f.ex x86_64 Intels with P/E cores.) https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.5.1 Signed-off-by: Christian Melki --- rules/libjpeg.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libjpeg.make b/rules/libjpeg.make index 29cc563ef..88339db01 100644 --- a/rules/libjpeg.make +++ b/rules/libjpeg.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg # # Paths and names # -LIBJPEG_VERSION:= 2.1.5 -LIBJPEG_MD5:= 1c6e9f8550a82c6d4cd30b370c22a5fd +LIBJPEG_VERSION:= 2.1.5.1 +LIBJPEG_MD5:= aed60d4d776dd5cf00b5a01c609d50f7 LIBJPEG_SUFFIX := tar.gz LIBJPEG:= libjpeg-turbo-$(LIBJPEG_VERSION) LIBJPEG_TARBALL:= $(LIBJPEG).$(LIBJPEG_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] mesalib: Version bump. 22.3.4 -> 22.3.5
Minor changes. No new features, just bugfixes. https://docs.mesa3d.org/relnotes/22.3.5.html Signed-off-by: Christian Melki --- rules/mesalib.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.make b/rules/mesalib.make index 37f20939f..fadd4f836 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib # # Paths and names # -MESALIB_VERSION:= 22.3.4 -MESALIB_MD5:= edc8d2b824403aebc83d2c23b6c1dba0 +MESALIB_VERSION:= 22.3.5 +MESALIB_MD5:= fdb35ae46968ce517702037710db6a3f MESALIB:= mesa-$(MESALIB_VERSION) MESALIB_SUFFIX := tar.xz MESALIB_URL:= \ -- 2.34.1
Re: [ptxdist] [APPLIED] host-e2fsprogs: Be explicit about configure options.
Thanks, applied as 0b3fc3c5c732904b4c70bb8283f0ee44bbe31784. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:26 +0100, Christian Melki wrote: > Explicitly define two configure options that has been added lately. > > Signed-off-by: Christian Melki > Message-Id: <20230209120156.2595120-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-e2fsprogs.make b/rules/host-e2fsprogs.make > index ebb0111861b8..19db2f8c97a8 100644 > --- a/rules/host-e2fsprogs.make > +++ b/rules/host-e2fsprogs.make > @@ -54,9 +54,11 @@ HOST_E2FSPROGS_CONF_OPT:= \ > --disable-nls \ > --disable-rpath \ > --disable-fuse2fs \ > + --disable-lto \ > --disable-ubsan \ > --disable-addrsan \ > --disable-threadsan \ > + --disable-fuzzing \ > --with-pthread > > # >
Re: [ptxdist] [APPLIED] sdl2-image: Version bump. 2.6.2 -> 2.6.3.
Thanks, applied as b6293107db5b0ab2ad6a9d9d884062adfb5b396c. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:22 +0100, Christian Melki wrote: > Very minor bugfix release. > https://github.com/libsdl-org/SDL_image/releases/tag/release-2.6.3 > > Signed-off-by: Christian Melki > Message-Id: <20230207091002.2418139-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2-image.make b/rules/sdl2-image.make > index a01f69daff61..bdd3c7415c31 100644 > --- a/rules/sdl2-image.make > +++ b/rules/sdl2-image.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_IMAGE) += sdl2-image > # > # Paths and names > # > -SDL2_IMAGE_VERSION := 2.6.2 > -SDL2_IMAGE_MD5 := 35da7c375b1c187b0f684c1c83b3b9c3 > +SDL2_IMAGE_VERSION := 2.6.3 > +SDL2_IMAGE_MD5 := 191c3eb49cc2dce30abff81398a92e81 > SDL2_IMAGE := SDL2_image-$(SDL2_IMAGE_VERSION) > SDL2_IMAGE_SUFFIX:= tar.gz > SDL2_IMAGE_URL := > https://www.libsdl.org/projects/SDL_image/release/$(SDL2_IMAGE).$(SDL2_IMAGE_SUFFIX)
Re: [ptxdist] [APPLIED] gdb: Bump default version. 11.2 -> 12.1
Thanks, applied as c880ba7be57c7964161019904744d28b073e297b. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:23 +0100, Christian Melki wrote: > Signed-off-by: Christian Melki > Message-Id: <20230207124808.3827907-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in > index 00c7ef436a79..308ea18736f0 100644 > --- a/rules/gdb-menu.in > +++ b/rules/gdb-menu.in > @@ -18,12 +18,12 @@ if !GDB_TOOLCHAIN_VERSION > > config GDB_VERSION > string "gdb version" > - default "11.2" > + default "12.1" > endif > > config GDB_MD5 > string "gdb source md5sum" > - default "433bd0904caa31c247b1b1867f2f911d" if !GDB_TOOLCHAIN_VERSION > + default "759a1b8d2b4d403367dd0e14fa04643d" if !GDB_TOOLCHAIN_VERSION > help > md5sum for the gdb source archive. If the version is provided by > the toolchain and the toolchain is an OSELAS.Toolchain then this
Re: [ptxdist] [APPLIED] lshw: Set VERSION variable
Thanks, applied as 27647e4b15b096b8b5e1521d8bda7181bda5731a. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:24 +0100, Sven Püschel wrote: > The lshw Makefile defaults to a git describe if the version > variable isn't set. This may cause it to use the version > of a parent git repository like DistroKit, as lshw is extracted from a > tarball. > > Signed-off-by: Sven Püschel > Message-Id: <20230207141307.334029-1-s.puesc...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/lshw.make b/rules/lshw.make > index 1feb82dba8e8..dbc911dfe7d4 100644 > --- a/rules/lshw.make > +++ b/rules/lshw.make > @@ -35,7 +35,7 @@ LSHW_CONF_TOOL := NO > # the "src" subdir avoids this. > LSHW_SUBDIR := src > > -LSHW_MAKE_ENV:= $(CROSS_ENV) > +LSHW_MAKE_ENV:= $(CROSS_ENV) VERSION=$(LSHW_VERSION) > LSHW_MAKE_OPT:= all > LSHW_INSTALL_OPT := install >
Re: [ptxdist] [APPLIED] e2fsprog: Version bump + fixes. 1.46.6 -> 1.47.0
Thanks, applied as 008fa06e37cd9b93d2164704d73b251016448220. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:25 +0100, Christian Melki wrote: > https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.47.0.txt > The biggest change is default backwards incompatibility > with kernels < 4.4. 4.4 LTS was EOL a year ago. > > * Add patch to disable doc building and installing. > Was in need of several tools and the result is pretty much unused. > * Add patch to fix LDCONFIG permission mishap. > Choosen solution is to disable the LDCONFIG call through this patch. > > Signed-off-by: Christian Melki > Message-Id: <20230209111556.653774-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch > b/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch > new file mode 100644 > index ..38a8cc8ebc00 > --- /dev/null > +++ b/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch > @@ -0,0 +1,37 @@ > +From: Christian Melki > +Date: Thu, 9 Feb 2023 09:41:43 +0100 > +Subject: [PATCH] e2fsprogs: Disable docs. > + > +Disable doc building and installing. > + > +Signed-off-by: Christian Melki > +--- > + Makefile.in | 5 ++--- > + 1 file changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/Makefile.in b/Makefile.in > +index 79b71165002d..0b80c20d4858 100644 > +--- a/Makefile.in > b/Makefile.in > +@@ -35,7 +35,6 @@ TAR=tar > + all:: subs > + $(MAKE) libs > + @ALL_CMT@ $(MAKE) progs > +-@ALL_CMT@ $(MAKE) docs > + > + all-static:: > + $(MAKE) libs > +@@ -72,11 +71,11 @@ distclean-doc: > + -test -d doc && cd doc && $(MAKE) distclean > + > + install: subs all-libs-recursive install-progs-recursive \ > +- install-shlibs-libs-recursive install-doc-libs > ++ install-shlibs-libs-recursive > + @SUBSET_CMT@$(MAKE) install-libs > + > + install-strip: subs all-libs-recursive install-strip-progs-recursive \ > +- install-shlibs-strip-libs-recursive install-doc-libs > ++ install-shlibs-strip-libs-recursive > + > + uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive > uninstall-doc-libs > + > diff --git a/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch > b/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch > new file mode 100644 > index ..100d5bc5e870 > --- /dev/null > +++ b/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch > @@ -0,0 +1,29 @@ > +From: Christian Melki > +Date: Thu, 9 Feb 2023 09:42:26 +0100 > +Subject: [PATCH] e2fsprogs: Disable ldconfig. > + > +ldconfig on shlibs pokes files which are normally not > +accessible for non-root users. > +There are two ways to deal with this. > +1. Patch it, disabling the call. > +2. point ldconfig to something like ac_cv_path_LDCONFIG=true > +This patch inplements the former. > + > +Signed-off-by: Christian Melki > +--- > + lib/Makefile.elf-lib | 2 -- > + 1 file changed, 2 deletions(-) > + > +diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib > +index f850f3ddb795..ea0bbde82b2f 100644 > +--- a/lib/Makefile.elf-lib > b/lib/Makefile.elf-lib > +@@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib > $(DEP_INSTALL_SYMLINK) > + $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so" > + $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ > + $(libdir)/$(ELF_IMAGE).so $(DESTDIR) > +-$(E) " LDCONFIG" > +-$(Q) -$(LDCONFIG) > + > + install-strip: install > + $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" > diff --git a/patches/e2fsprogs-1.47.0/series b/patches/e2fsprogs-1.47.0/series > new file mode 100644 > index ..8c305fa95d9b > --- /dev/null > +++ b/patches/e2fsprogs-1.47.0/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-e2fsprogs-Disable-docs.patch > +0002-e2fsprogs-Disable-ldconfig.patch > +# f58965e369e408e8446728c89acd0147 - git-ptx-patches magic > diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make > index 12e632423c8a..87f1004f3323 100644 > --- a/rules/e2fsprogs.make > +++ b/rules/e2fsprogs.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs > # > # Paths and names > # > -E2FSPROGS_VERSION:= 1.46.6 > -E2FSPROGS_MD5:= ffcc9cbcc9fac7efe3e52d41e36099f3 > +E2FSPROGS_VERSION:= 1.47.0 > +E2FSPROGS_MD5:= 6b4f18a33873623041857b4963641ee9 > E2FSPROGS:= e2fsprogs-$(E2FSPROGS_VERSION) > E2FSPROGS_SUFFIX := tar.gz > E2FSPROGS_URL:= $(call ptx/mirror, SF, > e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
Re: [ptxdist] [APPLIED] nss: Version bump. 3.86 -> 3.87.
Thanks, applied as 4fd6f560f9880e479a6344a7b4e69f8ea85e0365. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:18 +0100, Christian Melki wrote: > Follow the ca-certs. > Minor changes, bugfixes. > https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_87.html > > * Forward patchset. Applies cleanly. > > Signed-off-by: Christian Melki > Message-Id: <20230206091012.1727700-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/nss-3.86/0001-nss-fix-nsinstall-build.patch > b/patches/nss-3.87/0001-nss-fix-nsinstall-build.patch > similarity index 100% > rename from patches/nss-3.86/0001-nss-fix-nsinstall-build.patch > rename to patches/nss-3.87/0001-nss-fix-nsinstall-build.patch > diff --git a/patches/nss-3.86/0002-add-nss.pc.in.patch > b/patches/nss-3.87/0002-add-nss.pc.in.patch > similarity index 100% > rename from patches/nss-3.86/0002-add-nss.pc.in.patch > rename to patches/nss-3.87/0002-add-nss.pc.in.patch > diff --git > a/patches/nss-3.86/0003-HACK-don-t-build-commands-that-need-zlib.patch > b/patches/nss-3.87/0003-HACK-don-t-build-commands-that-need-zlib.patch > similarity index 100% > rename from > patches/nss-3.86/0003-HACK-don-t-build-commands-that-need-zlib.patch > rename to patches/nss-3.87/0003-HACK-don-t-build-commands-that-need-zlib.patch > diff --git a/patches/nss-3.86/0004-HACK-fix-parallel-building-issue.patch > b/patches/nss-3.87/0004-HACK-fix-parallel-building-issue.patch > similarity index 100% > rename from patches/nss-3.86/0004-HACK-fix-parallel-building-issue.patch > rename to patches/nss-3.87/0004-HACK-fix-parallel-building-issue.patch > diff --git a/patches/nss-3.86/0005-fix-dependency-generation.patch > b/patches/nss-3.87/0005-fix-dependency-generation.patch > similarity index 100% > rename from patches/nss-3.86/0005-fix-dependency-generation.patch > rename to patches/nss-3.87/0005-fix-dependency-generation.patch > diff --git a/patches/nss-3.86/series b/patches/nss-3.87/series > similarity index 100% > rename from patches/nss-3.86/series > rename to patches/nss-3.87/series > diff --git a/rules/nss.make b/rules/nss.make > index cbe5d426fae3..b8f41f1431f6 100644 > --- a/rules/nss.make > +++ b/rules/nss.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss > # > # Paths and names > # > -NSS_VERSION := 3.86 > -NSS_MD5 := 1f8cb0771f0ee64a4e891745b37f3098 > +NSS_VERSION := 3.87 > +NSS_MD5 := 9bfacbd8a080b0aa0a7672ca643c440b > NSS := nss-$(NSS_VERSION) > NSS_SUFFIX := tar.gz > NSS_URL := > https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(subst > .,_,$(NSS_VERSION))_RTM/src/$(NSS).$(NSS_SUFFIX)
Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.26.2 -> 2.26.3
Thanks, applied as edd6d422a7af54bf5f82c2437868e6195fb56658. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:21 +0100, Christian Melki wrote: > Very minor bugfix release. > https://github.com/libsdl-org/SDL/releases/tag/release-2.26.3 > > Signed-off-by: Christian Melki > Message-Id: <20230207091002.2418139-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index b1b9995ae565..4cb56cf55380 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.26.2 > -SDL2_MD5 := 303e85033a1f55db663d64ce85df2070 > +SDL2_VERSION := 2.26.3 > +SDL2_MD5 := 6ff7cbe9f77fc5afa79d54895dc6becc > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX)
Re: [ptxdist] [APPLIED] mesalib: Version bump. 22.3.3 -> 22.3.4
Thanks, applied as c4fb42dd4fc861b76515454b13e5c76153d4ac7d. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:20 +0100, Christian Melki wrote: > Minor changes. No new features, just bugfixes. > https://docs.mesa3d.org/relnotes/22.3.4.html > > Signed-off-by: Christian Melki > Message-Id: <20230206115859.1749445-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index fce66ff52000..37f20939fa4c 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 22.3.3 > -MESALIB_MD5 := 3cee19ea4d800e6ca8570d1f9ab1482d > +MESALIB_VERSION := 22.3.4 > +MESALIB_MD5 := edc8d2b824403aebc83d2c23b6c1dba0 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \
Re: [ptxdist] [APPLIED] ca-certificates: Version bump. 3.86 -> 3.87.
Thanks, applied as 67cebea4330e127614fe4dd8b0ac074729b9578c. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:17 +0100, Christian Melki wrote: > Actually, no changes to the raw cert textfile. > Bump the version to the latest one anyway. > This eliminates the question of "latest". > > Signed-off-by: Christian Melki > Message-Id: <20230206091012.1727700-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make > index 00014d60c5c4..17919347c97f 100644 > --- a/rules/ca-certificates.make > +++ b/rules/ca-certificates.make > @@ -14,7 +14,7 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates > # > # Paths and names > # > -CA_CERTIFICATES_VERSION := NSS_3_86_RTM > +CA_CERTIFICATES_VERSION := NSS_3_87_RTM > CA_CERTIFICATES_MD5 := a31809eb057bf80b67118f54a77b1856 > CA_CERTIFICATES := > ca-certificates-$(CA_CERTIFICATES_VERSION) > CA_CERTIFICATES_SUFFIX := txt
Re: [ptxdist] [APPLIED] xkeyboard-config: Version bump. 2.37 -> 2.38.
Thanks, applied as 3839e376e51cd2d6e5522aada73786357fcc1108. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:15 +0100, Christian Melki wrote: > Minor changes. > I actually had a small problem verifying the release. > See, my first try was the github clone of the freedesktop repo. > But that one seems to miss sync since november 2022 for unknown reasons? > So I had to check the official gitlab repo. > And the gitlab instance doesn't do the .xz (only .gz, .bz2) release format of > the x.org archive. > Sigh. But anyway. It looks good. > > Signed-off-by: Christian Melki > Message-Id: <20230206082657.1614113-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make > index dc4f6776c59b..c8b386066569 100644 > --- a/rules/xkeyboard-config.make > +++ b/rules/xkeyboard-config.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config > # > # Paths and names > # > -XKEYBOARD_CONFIG_VERSION := 2.37 > -XKEYBOARD_CONFIG_MD5 := eb133127bcf9da2df2dd4a0a9c92e387 > +XKEYBOARD_CONFIG_VERSION := 2.38 > +XKEYBOARD_CONFIG_MD5 := c89fb974e8f1ba14c64d1bcf3a0f8d11 > XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION) > XKEYBOARD_CONFIG_SUFFIX := tar.xz > XKEYBOARD_CONFIG_URL := $(call ptx/mirror, XORG, > individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX))
Re: [ptxdist] [APPLIED] libcamera: version bump 0.0.1 -> 0.0.4
Thanks, applied as 5a52678fc8875b09670e2564370c63d05b8af37b. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:16 +0100, Michael Riesch wrote: > Bump libcamera version to the recently released v0.0.4. > > Note: pipewire v0.3.62 or newer is now required to build the pipewire > plugin for libcamera. This is caused by an API breakage introduced > in libcamera v0.0.3. > > Signed-off-by: Michael Riesch > Message-Id: <20230206084335.1968875-1-michael.rie...@wolfvision.net> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcamera.make b/rules/libcamera.make > index 12969cafa57d..d51533a73e2e 100644 > --- a/rules/libcamera.make > +++ b/rules/libcamera.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera > # > # Paths and names > # > -LIBCAMERA_VERSION:= 0.0.1 > -LIBCAMERA_MD5:= d428d7e7455e9cca763d313323043e7b > +LIBCAMERA_VERSION:= 0.0.4 > +LIBCAMERA_MD5:= c671af5f54528c2dcc73f1c1fa733e50 > LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION) > LIBCAMERA_SUFFIX := tar.gz > LIBCAMERA_URL:= > https://git.libcamera.org/libcamera/libcamera.git;tag=v$(LIBCAMERA_VERSION)
Re: [ptxdist] [APPLIED] glib: Version bump. 2.74.4 -> 2.74.5
Thanks, applied as 1f10cc770b5f4987ff0f27926ccfba25c2cc6865. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:14 +0100, Christian Melki wrote: > Minor bugfix release. > https://gitlab.gnome.org/GNOME/glib/-/releases/2.74.5 > > * Remove patches, as it is now fixed in the release. > > Signed-off-by: Christian Melki > Message-Id: <20230205171744.3128715-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch > b/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch > deleted file mode 100644 > index 916d54903b58.. > --- a/patches/glib-2.74.4/0001-gthread-posix-need-to-include-errno.h.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -From: Michael Catanzaro > -Date: Tue, 20 Dec 2022 17:10:41 -0600 > -Subject: [PATCH] gthread-posix: need to #include > - > -a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required > -header. > - > -(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd) > > - glib/gthreadprivate.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h > -index 6eaf422753ba..f34368a7c20a 100644 > a/glib/gthreadprivate.h > -+++ b/glib/gthreadprivate.h > -@@ -41,6 +41,7 @@ struct _GRealThread > - /* system thread implementation (gthread-posix.c, gthread-win32.c) */ > - > - #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64) > -+#include > - #include > - #include > - #include > diff --git a/patches/glib-2.74.4/series b/patches/glib-2.74.4/series > deleted file mode 100644 > index 73c35dbc7c92.. > --- a/patches/glib-2.74.4/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-gthread-posix-need-to-include-errno.h.patch > -# 2cab62acd9f100167b4b7a5c5967b1a7 - git-ptx-patches magic > diff --git a/rules/glib.make b/rules/glib.make > index 9226cc7fafe0..1a368268ded9 100644 > --- a/rules/glib.make > +++ b/rules/glib.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib > # > # Paths and names > # > -GLIB_VERSION := 2.74.4 > -GLIB_MD5 := a854964bbf295dcfa98afd210d7fbc39 > +GLIB_VERSION := 2.74.5 > +GLIB_MD5 := 7561501d9f63f3418ddb23d2903cc968 > GLIB := glib-$(GLIB_VERSION) > GLIB_SUFFIX := tar.xz > GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename > $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
Re: [ptxdist] [APPLIED] e2fsprogs: Version bump. 1.46.5 -> 1.46.6
Thanks, applied as 186fadd15283eb2375712b4ea3096400cd862dd5.
Michael
[sent from post-receive hook]
On Fri, 10 Feb 2023 15:17:12 +0100, Christian Melki
wrote:
> Minor fixes, speedups etc.
> https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.6
>
> * Remove patches. CVE-2022-1304 is fixed in release.
> * Add missing largefile option.
> * Explicitly disable new option.
>
> Signed-off-by: Christian Melki
> Message-Id: <20230204175438.3388865-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich
>
> diff --git
> a/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
>
> b/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> deleted file mode 100644
> index 979dbb23608c..
> ---
> a/patches/e2fsprogs-1.46.5/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -From: Lukas Czerner
> -Date: Thu, 21 Apr 2022 19:31:48 +0200
> -Subject: [PATCH] libext2fs: add sanity check to extent manipulation
> -
> -It is possible to have a corrupted extent tree in such a way that a leaf
> -node contains zero extents in it. Currently if that happens and we try
> -to traverse the tree we can end up accessing wrong data, or possibly
> -even uninitialized memory. Make sure we don't do that.
> -
> -Additionally make sure that we have a sane number of bytes passed to
> -memmove() in ext2fs_extent_delete().
> -
> -Note that e2fsck is currently unable to spot and fix such corruption in
> -pass1.
> -
> -Signed-off-by: Lukas Czerner
> -Reported-by: Nils Bars
> -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113
> -Addresses: CVE-2022-1304
> -Addresses-Debian-Bug: #1010263
> -Signed-off-by: Theodore Ts'o
>
> - lib/ext2fs/extent.c | 8
> - 1 file changed, 8 insertions(+)
> -
> -diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c
> -index b324c7b0f8c8..1a206a16c13f 100644
> a/lib/ext2fs/extent.c
> -+++ b/lib/ext2fs/extent.c
> -@@ -495,6 +495,10 @@ retry:
> - ext2fs_le16_to_cpu(eh->eh_entries);
> - newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max);
> -
> -+/* Make sure there is at least one extent present */
> -+if (newpath->left <= 0)
> -+return EXT2_ET_EXTENT_NO_DOWN;
> -+
> - if (path->left > 0) {
> - ix++;
> - newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block);
> -@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t
> handle, int flags)
> -
> - cp = path->curr;
> -
> -+/* Sanity check before memmove() */
> -+if (path->left < 0)
> -+return EXT2_ET_EXTENT_LEAF_BAD;
> -+
> - if (path->left) {
> - memmove(cp, cp + sizeof(struct ext3_extent_idx),
> - path->left * sizeof(struct ext3_extent_idx));
> diff --git a/patches/e2fsprogs-1.46.5/series b/patches/e2fsprogs-1.46.5/series
> deleted file mode 100644
> index d4319d8ac6eb..
> --- a/patches/e2fsprogs-1.46.5/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-libext2fs-add-sanity-check-to-extent-manipulation.patch
> -# 77d6a61d2930f9f66b3b54043619c609 - git-ptx-patches magic
> diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
> index 19e5e7ba4a84..12e632423c8a 100644
> --- a/rules/e2fsprogs.make
> +++ b/rules/e2fsprogs.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
> #
> # Paths and names
> #
> -E2FSPROGS_VERSION:= 1.46.5
> -E2FSPROGS_MD5:= 3da91854c960ad8a819b48b2a404eb43
> +E2FSPROGS_VERSION:= 1.46.6
> +E2FSPROGS_MD5:= ffcc9cbcc9fac7efe3e52d41e36099f3
> E2FSPROGS:= e2fsprogs-$(E2FSPROGS_VERSION)
> E2FSPROGS_SUFFIX := tar.gz
> E2FSPROGS_URL:= $(call ptx/mirror, SF,
> e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
> @@ -37,6 +37,7 @@ E2FSPROGS_LICENSE_FILES := \
> E2FSPROGS_CONF_TOOL := autoconf
> E2FSPROGS_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> --disable-symlink-install \
> --disable-relative-symlinks \
> --disable-symlink-build \
> @@ -73,6 +74,7 @@ E2FSPROGS_CONF_OPT := \
> --disable-ubsan \
> --disable-addrsan \
> --disable-threadsan \
> + --disable-fuzzing \
> --with-pthread
>
> E2FSPROGS_MAKE_OPT := $(if $(filter 1,$(strip $(PTXDIST_VERBOSE))),V=1)
Re: [ptxdist] [APPLIED] batctl: Version bump. 2022.1 -> 2023.01
Thanks, applied as 39ac7caa7b8c01e5112a360ec08589008f095148. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:13 +0100, Christian Melki wrote: > Very minor changes. > Unfortunately, this requires kernel > 4.14. > > Signed-off-by: Christian Melki > Message-Id: <20230205095303.1898971-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/batctl.make b/rules/batctl.make > index 5dbc891fd29d..bbf06b55e695 100644 > --- a/rules/batctl.make > +++ b/rules/batctl.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BATCTL) += batctl > # > # Paths and names > # > -BATCTL_VERSION := 2022.1 > -BATCTL_MD5 := 30540cd9fd2bf3e10e7ee373d13fd708 > +BATCTL_VERSION := 2023.0 > +BATCTL_MD5 := d21a3243008f9da1df6cb0f5e5dff0e1 > BATCTL := batctl-$(BATCTL_VERSION) > BATCTL_SUFFIX:= tar.gz > BATCTL_URL := > http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX)
Re: [ptxdist] [APPLIED] libcap: Version bump. 2.66 -> 2.67.
Thanks, applied as 40ad4cef9646dd1c148326a89cd2fe9ccd7e72ec. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:11 +0100, Christian Melki wrote: > Minor bugfix release. > https://sites.google.com/site/fullycapable/release-notes-for-libcap#h.o8papfkfh1x9 > > * License hash changed. License file had SPDX identifiers added. > > Signed-off-by: Christian Melki > Message-Id: <20230204173807.847-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcap.make b/rules/libcap.make > index 8b4cf246bd13..496ef4b8d53f 100644 > --- a/rules/libcap.make > +++ b/rules/libcap.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap > # > # Paths and names > # > -LIBCAP_VERSION := 2.66 > -LIBCAP_MD5 := 00afd6e13bc94b2543b1a70770bdb41f > +LIBCAP_VERSION := 2.67 > +LIBCAP_MD5 := 06333f4301657298890fd8d6f1fb4793 > LIBCAP := libcap-$(LIBCAP_VERSION) > LIBCAP_SUFFIX:= tar.xz > LIBCAP_URL := \ > @@ -23,7 +23,7 @@ LIBCAP_URL := \ > LIBCAP_SOURCE:= $(SRCDIR)/$(LIBCAP).$(LIBCAP_SUFFIX) > LIBCAP_DIR := $(BUILDDIR)/$(LIBCAP) > LIBCAP_LICENSE := BSD-3-Clause OR GPL-2.0-only > -LIBCAP_LICENSE_FILES := file://License;md5=e2370ba375efe9e1a095c26d37e483b8 > +LIBCAP_LICENSE_FILES := file://License;md5=2965a646645b72ecee859b43c592dcaa > > # > > # Prepare
Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as aee474d21f56c94ea7b6ff28446a6fa757ea06e7. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:05 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-8-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-validationlayers.make > b/rules/vulkan-validationlayers.make > index 7e7b97bca1eb..df543d66a623 100644 > --- a/rules/vulkan-validationlayers.make > +++ b/rules/vulkan-validationlayers.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += > vulkan-validationlayers > # > # Paths and names > # > -VULKAN_VALIDATIONLAYERS_VERSION := 1.3.236.0 > -VULKAN_VALIDATIONLAYERS_MD5 := a95eab3163458901535b49681abf710f > +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.239.0 > +VULKAN_VALIDATIONLAYERS_MD5 := d18d36356c30719b4e6b30bd5b781c86 > VULKAN_VALIDATIONLAYERS := > vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) > VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz > VULKAN_VALIDATIONLAYERS_URL := > https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX) > @@ -39,10 +39,11 @@ VULKAN_VALIDATIONLAYERS_CONF_OPT := \ > -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \ > -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > - -DINSTALL_TESTS=OFF \ > + -DUPDATE_DEPS=OFF \ > -DUSE_ROBIN_HOOD_HASHING=OFF \ > -DVVL_CPP_STANDARD=20 \ > - -DVVL_ENABLE_ASAN=OFF > + -DVVL_ENABLE_ASAN=OFF \ > + -DVVL_ENABLE_TSAN=OFF > > # > > # Target-Install
Re: [ptxdist] [APPLIED] openssh: Version bump. 9.1p1 -> 9.2p1
Thanks, applied as 68685807070bb2212e67684fb75f9bd97f1b4884. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:09 +0100, Christian Melki wrote: > Some security fixes, minor new features and bugfixes. > Nothing overly exciting. > https://www.openssh.com/txt/release-9.2 > > Signed-off-by: Christian Melki > Message-Id: <20230203132348.637326-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/openssh.make b/rules/openssh.make > index b75942456dd1..704f3e26e1a3 100644 > --- a/rules/openssh.make > +++ b/rules/openssh.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh > # > # Paths and names > # > -OPENSSH_VERSION := 9.1p1 > -OPENSSH_MD5 := 471912038124285c96918882ee190a22 > +OPENSSH_VERSION := 9.2p1 > +OPENSSH_MD5 := f78b2acac4bb299629a8c58ddc3fac63 > OPENSSH := openssh-$(OPENSSH_VERSION) > OPENSSH_SUFFIX := tar.gz > OPENSSH_URL := \
Re: [ptxdist] [APPLIED] hwdata: Version bump. 0.366 -> 0.367
Thanks, applied as c084b64b99ed5cee148e3e0da2fa2a2c467c59e5. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:10 +0100, Christian Melki wrote: > Usual churn of minor updates. > > Signed-off-by: Christian Melki > Message-Id: <20230204172546.3323556-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/hwdata.make b/rules/hwdata.make > index f42aae099e09..bf141c3a89f1 100644 > --- a/rules/hwdata.make > +++ b/rules/hwdata.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata > # > # Paths and names > # > -HWDATA_VERSION := 0.366 > -HWDATA_MD5 := c80465b4b955177a3409f1f4d39d86ca > +HWDATA_VERSION := 0.367 > +HWDATA_MD5 := 0d98838a0566fc972a10377ec79ff988 > HWDATA := hwdata-$(HWDATA_VERSION) > HWDATA_SUFFIX:= tar.gz > HWDATA_URL := > https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)
Re: [ptxdist] [APPLIED] libjpeg: Version bump. 2.1.4 -> 2.1.5.
Thanks, applied as 8308034c10107fc6449c7f904fe2a168bcdc9d8b. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:07 +0100, Christian Melki wrote: > Bugfix release. Nothing overly relevant to most users. > https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.5 > > * License file year changes. Fix hash. > * Add altivec optimizations since ptxdist now supports it. > > Signed-off-by: Christian Melki > Message-Id: <20230202124608.1164456-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libjpeg.make b/rules/libjpeg.make > index 60125b77d145..29cc563ef44d 100644 > --- a/rules/libjpeg.make > +++ b/rules/libjpeg.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg > # > # Paths and names > # > -LIBJPEG_VERSION := 2.1.4 > -LIBJPEG_MD5 := 3241b54016c445e5d8f0ebb0ad9294ed > +LIBJPEG_VERSION := 2.1.5 > +LIBJPEG_MD5 := 1c6e9f8550a82c6d4cd30b370c22a5fd > LIBJPEG_SUFFIX := tar.gz > LIBJPEG := libjpeg-turbo-$(LIBJPEG_VERSION) > LIBJPEG_TARBALL := $(LIBJPEG).$(LIBJPEG_SUFFIX) > @@ -26,7 +26,7 @@ LIBJPEG_SOURCE := $(SRCDIR)/$(LIBJPEG_TARBALL) > LIBJPEG_DIR := $(BUILDDIR)/$(LIBJPEG) > LIBJPEG_LICENSE := IJG, BSD-3-Clause, Zlib > LIBJPEG_LICENSE_FILES := \ > - file://LICENSE.md;md5=a75feaa2de6d8942f50d412241fca1f1 \ > + file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \ > > file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 > \ > > file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=839b9ed7df5168976efc071bee29a76e > > @@ -42,6 +42,9 @@ endif > ifdef PTXCONF_ARCH_ARM_NEON > LIBJPEG_SIMD := y > endif > +ifdef PTXCONF_ARCH_PPC_ALTIVEC > +LIBJPEG_SIMD := y > +endif > > LIBJPEG_CONF_TOOL := cmake > LIBJPEG_CONF_OPT := \
Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.64 -> 0.3.65
Thanks, applied as 7fb40316c46b99bb9ee6dd0b60bd401d3d0e1ef0. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:06 +0100, Michael Tretter wrote: > Signed-off-by: Michael Tretter > Message-Id: <2023020147.3141268-1-m.tret...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pipewire.make b/rules/pipewire.make > index feae36ea9103..96738917141d 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire > # > # Paths and names > # > -PIPEWIRE_VERSION := 0.3.64 > -PIPEWIRE_MD5 := e37730d11bd0c923e423f0a369826fd4 > +PIPEWIRE_VERSION := 0.3.65 > +PIPEWIRE_MD5 := 5c31850705cacd12398da01b9b11cfd0 > PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) > PIPEWIRE_SUFFIX := tar.bz2 > PIPEWIRE_URL := > https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) > @@ -57,6 +57,7 @@ PIPEWIRE_CONF_OPT := \ > -Dbluez5-codec-lc3plus=disabled \ > -Dbluez5-codec-ldac=disabled \ > -Dbluez5-codec-opus=disabled \ > + -Dcompress-offload=disabled \ > -Dcontrol=enabled \ > -Ddbus=enabled \ > -Ddocdir= \ > @@ -85,6 +86,7 @@ PIPEWIRE_CONF_OPT := \ > -Dpipewire-jack=disabled \ > -Dpipewire-v4l2=disabled \ > -Dpw-cat=enabled \ > + -Dpw-cat-ffmpeg=disabled \ > -Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \ > -Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \ > -Droc=disabled \
Re: [ptxdist] [APPLIED] vulkan-headers: 1.3.236.0 -> 1.3.239.0
Thanks, applied as 7c4cc1f074c804b08cc909126d0b5e2fb9b893e0. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:02 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-5-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make > index da62d80f6b6e..4552bff7da38 100644 > --- a/rules/vulkan-headers.make > +++ b/rules/vulkan-headers.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers > # Paths and names > # > > -VULKAN_HEADERS_VERSION := 1.3.236.0 > -VULKAN_HEADERS_MD5 := 9fba7f1ef2c43b6ce3c9660a618e788c > +VULKAN_HEADERS_VERSION := 1.3.239.0 > +VULKAN_HEADERS_MD5 := 284c313634dcda93bd1875fc3d8596b1 > VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) > VULKAN_HEADERS_SUFFIX:= tar.gz > VULKAN_HEADERS_URL := > https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) > @@ -34,6 +34,6 @@ VULKAN_HEADERS_LICENSE_FILES := \ > VULKAN_HEADERS_CONF_TOOL := cmake > VULKAN_HEADERS_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > - -DVULKAN_HEADERS_INSTALL=ON > + -DBUILD_TESTS=OFF > > # vim: syntax=make
Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as 06a97592ccbbd599de06ad5586c0d953a9438cf6. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:04 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-7-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make > index 57a3892bb25a..562bbb795d83 100644 > --- a/rules/vulkan-tools.make > +++ b/rules/vulkan-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools > # > # Paths and names > # > -VULKAN_TOOLS_VERSION := 1.3.236.0 > -VULKAN_TOOLS_MD5 := 36dacbbee6aa4eb14ec0e4c398074044 > +VULKAN_TOOLS_VERSION := 1.3.239.0 > +VULKAN_TOOLS_MD5 := 7af125e5faa076f84f2cc187f5eea3bb > VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) > VULKAN_TOOLS_SUFFIX := tar.gz > VULKAN_TOOLS_URL := > https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as db2f3f17dfeccbe15282584d30918e35acab8361. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:03 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-6-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make > index c683708eaa66..d44087f1a6ba 100644 > --- a/rules/vulkan-loader.make > +++ b/rules/vulkan-loader.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader > # > # Paths and names > # > -VULKAN_LOADER_VERSION:= 1.3.236.0 > -VULKAN_LOADER_MD5:= ed9d0fd06898e508adb4e2bdff2c88a5 > +VULKAN_LOADER_VERSION:= 1.3.239.0 > +VULKAN_LOADER_MD5:= ff690deea26c9ae4815e08c4cd24ebab > VULKAN_LOADER:= vulkan-loader-$(VULKAN_LOADER_VERSION) > VULKAN_LOADER_SUFFIX := tar.gz > VULKAN_LOADER_URL:= > https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX)
Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as 80c58ef611a4f49cc7a375e99ae3f68959a5f4c7. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:01 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-4-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make > index b6e8549b5b90..7aafef293b6d 100644 > --- a/rules/spirv-tools.make > +++ b/rules/spirv-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools > # > # Paths and names > # > -SPIRV_TOOLS_VERSION := 1.3.236.0 > -SPIRV_TOOLS_MD5 := 10172b6f37dda90946cbe0a9ba884c13 > +SPIRV_TOOLS_VERSION := 1.3.239.0 > +SPIRV_TOOLS_MD5 := 8d9ec694f0743e01c15576a80392deb9 > SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION) > SPIRV_TOOLS_SUFFIX := tar.gz > SPIRV_TOOLS_URL := > https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
Re: [ptxdist] [APPLIED] shaderc: version bump v2022.4 -> v2023.2
Thanks, applied as 62463f845d87dd8e9870d43f27051b861ed7484d. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:16:59 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-2-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make > index c81708b0e5d8..204c39c44d41 100644 > --- a/rules/host-shaderc.make > +++ b/rules/host-shaderc.make > @@ -59,7 +59,6 @@ HOST_SHADERC_CONF_OPT := \ > -DBUILD_TESTING=ON \ > -DDISABLE_EXCEPTIONS=OFF \ > -DDISABLE_RTTI=OFF \ > - -DENABLE_CODE_COVERAGE=OFF \ > -DENABLE_CTEST=ON \ > -DENABLE_EXCEPTIONS=OFF \ > -DENABLE_EXCEPTIONS_ON_MSVC=ON \ > @@ -74,10 +73,8 @@ HOST_SHADERC_CONF_OPT := \ > -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \ > -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \ > -DSHADERC_SKIP_EXAMPLES=OFF \ > - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ > -DSHADERC_SKIP_INSTALL=OFF \ > -DSHADERC_SKIP_TESTS=ON \ > - -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ > -DSPIRV_ALLOW_TIMERS=ON \ > -DSPIRV_BUILD_COMPRESSION=OFF \ > -DSPIRV_BUILD_FUZZER=OFF \ > diff --git a/rules/shaderc.make b/rules/shaderc.make > index 2b9b021da7cc..ffb3d3426ec3 100644 > --- a/rules/shaderc.make > +++ b/rules/shaderc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc > # > # Paths and names > # > -SHADERC_VERSION := v2022.4 > -SHADERC_MD5 := 7a3039ee4e489775957aa3015859f902 > +SHADERC_VERSION := v2023.2 > +SHADERC_MD5 := c0cd82a81abd77fe65af1d2685a17ab7 > SHADERC := shaderc-$(SHADERC_VERSION) > SHADERC_SUFFIX := tar.gz > SHADERC_URL := \ > @@ -77,7 +77,6 @@ SHADERC_CONF_OPT:= \ > -DBUILD_TESTING=ON \ > -DDISABLE_EXCEPTIONS=OFF \ > -DDISABLE_RTTI=OFF \ > - -DENABLE_CODE_COVERAGE=OFF \ > -DENABLE_CTEST=ON \ > -DENABLE_EXCEPTIONS=OFF \ > -DENABLE_EXCEPTIONS_ON_MSVC=ON \ > @@ -94,7 +93,6 @@ SHADERC_CONF_OPT:= \ > -DSHADERC_SKIP_EXAMPLES=OFF \ > -DSHADERC_SKIP_INSTALL=OFF \ > -DSHADERC_SKIP_TESTS=ON \ > - -DSKIP_SPIRV_TOOLS_INSTALL=OFF \ > -DSPIRV_ALLOW_TIMERS=ON \ > -DSPIRV_BUILD_COMPRESSION=OFF \ > -DSPIRV_BUILD_FUZZER=OFF \
Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as 35e89b92d8be96530e2152ef310e268c59bdf970. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:17:00 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-3-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make > index 54e02957263e..b947fa11bbd2 100644 > --- a/rules/spirv-headers.make > +++ b/rules/spirv-headers.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers > # > # Paths and names > # > -SPIRV_HEADERS_VERSION:= 1.3.236.0 > -SPIRV_HEADERS_MD5:= da1982a5df290f7a76ff786af4587ffc > +SPIRV_HEADERS_VERSION:= 1.3.239.0 > +SPIRV_HEADERS_MD5:= fc7b442c1c5eaa05e740ea3b1d7f438f > SPIRV_HEADERS:= spirv-headers-$(SPIRV_HEADERS_VERSION) > SPIRV_HEADERS_SUFFIX := tar.gz > SPIRV_HEADERS_URL:= > https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) > @@ -30,6 +30,8 @@ SPIRV_HEADERS_LICENSE_FILES := > file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae > > SPIRV_HEADERS_CONF_TOOL := cmake > SPIRV_HEADERS_CONF_OPT := \ > - $(CROSS_CMAKE_USR) > + $(CROSS_CMAKE_USR) \ > + -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ > + -DSPIRV_HEADERS_SKIP_INSTALL=OFF > > # vim: syntax=make
Re: [ptxdist] [APPLIED] glslang: version bump 1.3.236.0 -> 1.3.239.0
Thanks, applied as 9d90999c6e42e9199634e2f6cc1b6115c1369b5e. Michael [sent from post-receive hook] On Fri, 10 Feb 2023 15:16:58 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230130131147.1190541-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/glslang.make b/rules/glslang.make > index e132f6806ec6..da44f91231ca 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 1.3.236.0 > -GLSLANG_MD5 := 624390dc06d35f359ed14288bb8ccbe1 > +GLSLANG_VERSION := 1.3.239.0 > +GLSLANG_MD5 := 0d43884d4cfe1f374025ce001ed8d724 > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
[ptxdist] [PATCH] libdrm: Version bump. 2.4.114 -> 2.4.115.
Very minor fixes. Just a handful changes since last release. https://gitlab.freedesktop.org/mesa/drm/-/commits/ee558cea20d1f9d822fe1a28e97beaf365bf9d38/ Signed-off-by: Christian Melki --- rules/libdrm.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libdrm.make b/rules/libdrm.make index 84935c597..1be8f47da 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.114 -LIBDRM_MD5 := 07759750351465e5dd39f4fe40f000ea +LIBDRM_VERSION := 2.4.115 +LIBDRM_MD5 := 5403981a20c964f4c893ff91393652bd LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.xz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] dbus: Version bump. 1.15.2 -> 1.15.4.
https://gitlab.freedesktop.org/dbus/dbus/-/blob/6156578eaa5a23110d7dd73cc9153fb799709e63/NEWS Various bugfixes and enhancements. 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 b4b1aa82e..de71f7d55 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.15.2 -DBUS_MD5 := c56de960ea9031b92ee71aaa0e8e72c2 +DBUS_VERSION := 1.15.4 +DBUS_MD5 := 5f948b755ccd7c4d0a32d5b7fa423dd5 DBUS := dbus-$(DBUS_VERSION) DBUS_SUFFIX:= tar.xz DBUS_URL := https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] zstd: Version bump 1.5.2 -> 1.5.4
A "big", minor version bump. https://github.com/facebook/zstd/releases/tag/v1.5.4 Actually so big they skipped 1.5.3? Even though it's > 650 commits, From a normal end user perspective it's mostly performance improvments and some improvements to dictionary compression and large file handling. Signed-off-by: Christian Melki --- rules/zstd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/zstd.make b/rules/zstd.make index 7198117c3..fee30fa8c 100644 --- a/rules/zstd.make +++ b/rules/zstd.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd # # Paths and names # -ZSTD_VERSION := 1.5.2 -ZSTD_MD5 := 6dc24b78e32e7c99f80c9441e40ff8bc +ZSTD_VERSION := 1.5.4 +ZSTD_MD5 := 02b49acde4ebb35f7e47a2a41032ffa8 ZSTD := zstd-$(ZSTD_VERSION) ZSTD_SUFFIX:= tar.gz ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
Very minor bugfix release.
https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
Also do some fixes. As the configuration was very non-complete.
This should help reduce footprint.
Previously we had freetype dependencies,
although sdl2-ttf was using the internal library.
Now opt for external libraries only.
* License file copyright year changed.
* Move patchset forward, applies cleanly.
* Add options to disable internal libraries.
* Add option to enable optional harfbuzz.
* Disable the freetypetest tool.
Signed-off-by: Christian Melki
---
...onfigure-make-opengl-support-switchable.patch | 0
.../autogen.sh | 0
.../{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series | 0
rules/sdl2-ttf.in| 16 ++--
rules/sdl2-ttf.make | 10 +++---
5 files changed, 21 insertions(+), 5 deletions(-)
rename patches/{SDL2_ttf-2.20.1 =>
SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%)
diff --git
a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
similarity index 100%
rename from
patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
rename to
patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh
b/patches/SDL2_ttf-2.20.2/autogen.sh
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/autogen.sh
rename to patches/SDL2_ttf-2.20.2/autogen.sh
diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/series
rename to patches/SDL2_ttf-2.20.2/series
diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
index a14676933..4dafa09ae 100644
--- a/rules/sdl2-ttf.in
+++ b/rules/sdl2-ttf.in
@@ -1,12 +1,24 @@
## SECTION=multimedia_sdl
-config SDL2_TTF
+menuconfig SDL2_TTF
tristate
select SDL2
select FREETYPE
- prompt "SDL2 ttf"
+ select HARFBUZZ if SDL2_TTF_HARFBUZZ
+ prompt "SDL2 ttf "
help
This is a sample library which allows you to use TrueType
fonts in your SDL applications. It comes with an example
program "showfont" which displays an example string for a
given TrueType font file.
+
+if SDL2_TTF
+
+config SDL2_TTF_HARFBUZZ
+ bool
+ prompt "enable harfbuzz support"
+ help
+ Enable support for Harfbuzz (meaning open type, in Persian),
+ the open type shaping engine.
+
+endif
diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
index beaad3992..fd27fc014 100644
--- a/rules/sdl2-ttf.make
+++ b/rules/sdl2-ttf.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
#
# Paths and names
#
-SDL2_TTF_VERSION := 2.20.1
-SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644
+SDL2_TTF_VERSION := 2.20.2
+SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION)
SDL2_TTF_SUFFIX:= tar.gz
SDL2_TTF_URL :=
https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
@@ -23,7 +23,7 @@ SDL2_TTF_SOURCE :=
$(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF)
SDL2_TTF_LICENSE := zlib
SDL2_TTF_LICENSE_FILES := \
- file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371
+ file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68
#
# Prepare
@@ -33,6 +33,10 @@ SDL2_TTF_CONF_TOOL := autoconf
SDL2_TTF_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-freetype-builtin \
+ --disable-freetypetest \
+ --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \
+ --disable-harfbuzz-builtin \
--disable-sdltest
ifdef PTXCONF_SDL2_PULSEAUDIO
--
2.34.1
[ptxdist] [PATCH v2] configure_helper: ignore new Meson 0.63 builtin option
Ignore new Meson builtin option "prefer_static" (since 0.63).
Signed-off-by: Philipp Zabel
---
Changes since v1:
- Drop "pkgconfig.relocatable", which is always set since commit
cd37b00b3023 ("pre/Rules.make: let Meson generate relocatable .pc files")
---
scripts/configure_helper.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 86dee3416d08..e6907cd4eb21 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -149,6 +149,7 @@ meson_blacklist = [
"mandir",
"optimization",
"pkg_config_path",
+ "prefer_static",
"python.install_env",
"python.platlibdir",
"python.purelibdir",
--
2.30.2
Re: [ptxdist] [PATCH] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
On Fri, Feb 10, 2023 at 12:23:39PM +0100, Christian Melki wrote:
> On 2/10/23 12:17 PM, Michael Olbrich wrote:
> > On Wed, Feb 08, 2023 at 10:42:50AM +0100, Christian Melki wrote:
> > > Very minor bugfix release.
> > > https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
> > > Also do some fixes. As the configuration was very non-complete.
> > > This should help reduce footprint if needed.
> > > Ptxdist had freetype dependencies, although sdl2-ttf was using
> > > the internal library.
> > >
> > > * License file copyright year changed.
> > > * Move patchset forward, applies cleanly.
> > > * Add option to control if the mandatory freetype library should
> > > be external (otherwise it must use the internal one).
> > > * Add option to enable optional harfbuzz.
> > > * Add option to enable internal harfbuzz if support is enabled.
> > > * Make the options default reflect the old behavior.
> > > Ie, internal freetype and harfbuzz as default.
> > > * Disable the freetypetest tool.
> > >
> > > Signed-off-by: Christian Melki
> > > ---
> > > ...igure-make-opengl-support-switchable.patch | 0
> > > .../autogen.sh| 0
> > > .../series| 0
> > > rules/sdl2-ttf.in | 46 +--
> > > rules/sdl2-ttf.make | 10 ++--
> > > 5 files changed, 50 insertions(+), 6 deletions(-)
> > > rename patches/{SDL2_ttf-2.20.1 =>
> > > SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch
> > > (100%)
> > > rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%)
> > > rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%)
> > >
> > > diff --git
> > > a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
> > >
> > > b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> > > similarity index 100%
> > > rename from
> > > patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
> > > rename to
> > > patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> > > diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh
> > > b/patches/SDL2_ttf-2.20.2/autogen.sh
> > > similarity index 100%
> > > rename from patches/SDL2_ttf-2.20.1/autogen.sh
> > > rename to patches/SDL2_ttf-2.20.2/autogen.sh
> > > diff --git a/patches/SDL2_ttf-2.20.1/series
> > > b/patches/SDL2_ttf-2.20.2/series
> > > similarity index 100%
> > > rename from patches/SDL2_ttf-2.20.1/series
> > > rename to patches/SDL2_ttf-2.20.2/series
> > > diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
> > > index a14676933..fb68fd5a0 100644
> > > --- a/rules/sdl2-ttf.in
> > > +++ b/rules/sdl2-ttf.in
> > > @@ -1,12 +1,52 @@
> > > ## SECTION=multimedia_sdl
> > > -config SDL2_TTF
> > > +menuconfig SDL2_TTF
> > > tristate
> > > select SDL2
> > > - select FREETYPE
> > > - prompt "SDL2 ttf"
> > > + select FREETYPE if SDL2_TTF_EXTERNAL_FREETYPE
> > > + select HARFBUZZ if SDL2_TTF_EXTERNAL_HARFBUZZ
> > > + prompt "SDL2 ttf "
> > > help
> > > This is a sample library which allows you to use TrueType
> > > fonts in your SDL applications. It comes with an example
> > > program "showfont" which displays an example string for a
> > > given TrueType font file.
> > > +
> > > +if SDL2_TTF
> > > +
> > > +config SDL2_TTF_EXTERNAL_FREETYPE
> > > + bool
> > > + prompt "enable external freetype support"
> > > + help
> > > + Freetype is mandatory for SDL2-ttf.
> > > + And it has a version of freetype built in.
> > > + To reduce code footprint, there is an option
> > > + to use an external freetype library.
> > > + Probably not as well tested against different
> > > + versions of freetype as the internal one.
> > > +
> > > +config SDL2_TTF_HARFBUZZ
> > > + bool
> > > + prompt "enable harfbuzz support"
> > > + default y
> > > + help
> > > + Harfbuzz is optional for SDL2-ttf.
> > > + However, it has a version of harfbuzz built in.
> > > + To reduce code footprint, there is an option
> > > + to disable harfbuzz altogheter.
> > > +
> > > +if SDL2_TTF_HARFBUZZ
> > > +
> > > +config SDL2_TTF_EXTERNAL_HARFBUZZ
> > > + bool
> > > + prompt "enable external harfbuzz support"
> > > + help
> > > + Use this option to build with an external
> > > + harfbuzz library.
> > > + Much like the external freetype option,
> > > + this can be used to reduce footprint by
> > > + deduplicating library use.
> >
> > Hmmm, I would prefer to always us the system libraries or none at all, or
> > are there good reasons to use the built-in versions?
> >
> > Michael
> >
>
> Guess none, beside compatibility? Relying on old broken behavior etc?
> I've built it with the options set for external though. Seems ok.
> Maybe the harfbuzz/freetype circular dependency made the project carry it's
> own implementation?
>
> And I agree,
Re: [ptxdist] [PATCH] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
On 2/10/23 12:17 PM, Michael Olbrich wrote:
On Wed, Feb 08, 2023 at 10:42:50AM +0100, Christian Melki wrote:
Very minor bugfix release.
https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
Also do some fixes. As the configuration was very non-complete.
This should help reduce footprint if needed.
Ptxdist had freetype dependencies, although sdl2-ttf was using
the internal library.
* License file copyright year changed.
* Move patchset forward, applies cleanly.
* Add option to control if the mandatory freetype library should
be external (otherwise it must use the internal one).
* Add option to enable optional harfbuzz.
* Add option to enable internal harfbuzz if support is enabled.
* Make the options default reflect the old behavior.
Ie, internal freetype and harfbuzz as default.
* Disable the freetypetest tool.
Signed-off-by: Christian Melki
---
...igure-make-opengl-support-switchable.patch | 0
.../autogen.sh| 0
.../series| 0
rules/sdl2-ttf.in | 46 +--
rules/sdl2-ttf.make | 10 ++--
5 files changed, 50 insertions(+), 6 deletions(-)
rename patches/{SDL2_ttf-2.20.1 =>
SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%)
diff --git
a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
similarity index 100%
rename from
patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
rename to
patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh
b/patches/SDL2_ttf-2.20.2/autogen.sh
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/autogen.sh
rename to patches/SDL2_ttf-2.20.2/autogen.sh
diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/series
rename to patches/SDL2_ttf-2.20.2/series
diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
index a14676933..fb68fd5a0 100644
--- a/rules/sdl2-ttf.in
+++ b/rules/sdl2-ttf.in
@@ -1,12 +1,52 @@
## SECTION=multimedia_sdl
-config SDL2_TTF
+menuconfig SDL2_TTF
tristate
select SDL2
- select FREETYPE
- prompt "SDL2 ttf"
+ select FREETYPE if SDL2_TTF_EXTERNAL_FREETYPE
+ select HARFBUZZ if SDL2_TTF_EXTERNAL_HARFBUZZ
+ prompt "SDL2 ttf "
help
This is a sample library which allows you to use TrueType
fonts in your SDL applications. It comes with an example
program "showfont" which displays an example string for a
given TrueType font file.
+
+if SDL2_TTF
+
+config SDL2_TTF_EXTERNAL_FREETYPE
+ bool
+ prompt "enable external freetype support"
+ help
+ Freetype is mandatory for SDL2-ttf.
+ And it has a version of freetype built in.
+ To reduce code footprint, there is an option
+ to use an external freetype library.
+ Probably not as well tested against different
+ versions of freetype as the internal one.
+
+config SDL2_TTF_HARFBUZZ
+ bool
+ prompt "enable harfbuzz support"
+ default y
+ help
+ Harfbuzz is optional for SDL2-ttf.
+ However, it has a version of harfbuzz built in.
+ To reduce code footprint, there is an option
+ to disable harfbuzz altogheter.
+
+if SDL2_TTF_HARFBUZZ
+
+config SDL2_TTF_EXTERNAL_HARFBUZZ
+ bool
+ prompt "enable external harfbuzz support"
+ help
+ Use this option to build with an external
+ harfbuzz library.
+ Much like the external freetype option,
+ this can be used to reduce footprint by
+ deduplicating library use.
Hmmm, I would prefer to always us the system libraries or none at all, or
are there good reasons to use the built-in versions?
Michael
Guess none, beside compatibility? Relying on old broken behavior etc?
I've built it with the options set for external though. Seems ok.
Maybe the harfbuzz/freetype circular dependency made the project carry it's own
implementation?
And I agree, but refrained from changing the default behavior.
The duplication bugged be a bit when I stumbled upon it though.
Christian
+
+endif
+
+endif
diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
index beaad3992..724e26ed6 100644
--- a/rules/sdl2-ttf.make
+++ b/rules/sdl2-ttf.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
#
# Paths and names
#
-SDL2_TTF_VERSION := 2.20.1
-SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644
+SDL2_TTF_VERSION := 2.20.2
+SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
Re: [ptxdist] [PATCH] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
On Wed, Feb 08, 2023 at 10:42:50AM +0100, Christian Melki wrote:
> Very minor bugfix release.
> https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
> Also do some fixes. As the configuration was very non-complete.
> This should help reduce footprint if needed.
> Ptxdist had freetype dependencies, although sdl2-ttf was using
> the internal library.
>
> * License file copyright year changed.
> * Move patchset forward, applies cleanly.
> * Add option to control if the mandatory freetype library should
> be external (otherwise it must use the internal one).
> * Add option to enable optional harfbuzz.
> * Add option to enable internal harfbuzz if support is enabled.
> * Make the options default reflect the old behavior.
> Ie, internal freetype and harfbuzz as default.
> * Disable the freetypetest tool.
>
> Signed-off-by: Christian Melki
> ---
> ...igure-make-opengl-support-switchable.patch | 0
> .../autogen.sh| 0
> .../series| 0
> rules/sdl2-ttf.in | 46 +--
> rules/sdl2-ttf.make | 10 ++--
> 5 files changed, 50 insertions(+), 6 deletions(-)
> rename patches/{SDL2_ttf-2.20.1 =>
> SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch (100%)
> rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%)
> rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%)
>
> diff --git
> a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
> b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> similarity index 100%
> rename from
> patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
> rename to
> patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh
> b/patches/SDL2_ttf-2.20.2/autogen.sh
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.1/autogen.sh
> rename to patches/SDL2_ttf-2.20.2/autogen.sh
> diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.1/series
> rename to patches/SDL2_ttf-2.20.2/series
> diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
> index a14676933..fb68fd5a0 100644
> --- a/rules/sdl2-ttf.in
> +++ b/rules/sdl2-ttf.in
> @@ -1,12 +1,52 @@
> ## SECTION=multimedia_sdl
>
> -config SDL2_TTF
> +menuconfig SDL2_TTF
> tristate
> select SDL2
> - select FREETYPE
> - prompt "SDL2 ttf"
> + select FREETYPE if SDL2_TTF_EXTERNAL_FREETYPE
> + select HARFBUZZ if SDL2_TTF_EXTERNAL_HARFBUZZ
> + prompt "SDL2 ttf "
> help
> This is a sample library which allows you to use TrueType
> fonts in your SDL applications. It comes with an example
> program "showfont" which displays an example string for a
> given TrueType font file.
> +
> +if SDL2_TTF
> +
> +config SDL2_TTF_EXTERNAL_FREETYPE
> + bool
> + prompt "enable external freetype support"
> + help
> + Freetype is mandatory for SDL2-ttf.
> + And it has a version of freetype built in.
> + To reduce code footprint, there is an option
> + to use an external freetype library.
> + Probably not as well tested against different
> + versions of freetype as the internal one.
> +
> +config SDL2_TTF_HARFBUZZ
> + bool
> + prompt "enable harfbuzz support"
> + default y
> + help
> + Harfbuzz is optional for SDL2-ttf.
> + However, it has a version of harfbuzz built in.
> + To reduce code footprint, there is an option
> + to disable harfbuzz altogheter.
> +
> +if SDL2_TTF_HARFBUZZ
> +
> +config SDL2_TTF_EXTERNAL_HARFBUZZ
> + bool
> + prompt "enable external harfbuzz support"
> + help
> + Use this option to build with an external
> + harfbuzz library.
> + Much like the external freetype option,
> + this can be used to reduce footprint by
> + deduplicating library use.
Hmmm, I would prefer to always us the system libraries or none at all, or
are there good reasons to use the built-in versions?
Michael
> +
> +endif
> +
> +endif
> diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
> index beaad3992..724e26ed6 100644
> --- a/rules/sdl2-ttf.make
> +++ b/rules/sdl2-ttf.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
> #
> # Paths and names
> #
> -SDL2_TTF_VERSION := 2.20.1
> -SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644
> +SDL2_TTF_VERSION := 2.20.2
> +SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
> SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION)
> SDL2_TTF_SUFFIX := tar.gz
> SDL2_TTF_URL :=
> https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> @@ -23,7 +23,7 @@ SDL2_TTF_SOURCE :=
>
Re: [ptxdist] [PATCH 2/2] Patched lmbench to work with newer GCC versions
On Tue, Feb 07, 2023 at 03:21:39PM +0100, Sven Püschel wrote:
> GCC removed the SunRPC implementation, therefore we're now using
> libtirpc. Also added a patch to include the correct header for
> socklen_t, so that autotools cannot fail to detect the type presence
> correctly.
>
> Signed-off-by: Sven Püschel
> ---
> .../lmbench-3.0-a9-add-libtirpc.diff | 50 +++
> .../lmbench-3.0-a9-fix_socklen_t.diff | 19 +++
> patches/lmbench-3.0-a9/series | 2 +
> rules/lmbench.in | 9 ++--
> 4 files changed, 74 insertions(+), 6 deletions(-)
> create mode 100644 patches/lmbench-3.0-a9/lmbench-3.0-a9-add-libtirpc.diff
> create mode 100644 patches/lmbench-3.0-a9/lmbench-3.0-a9-fix_socklen_t.diff
>
> diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-add-libtirpc.diff
> b/patches/lmbench-3.0-a9/lmbench-3.0-a9-add-libtirpc.diff
> new file mode 100644
> index 0..cebe67f73
> --- /dev/null
> +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-add-libtirpc.diff
> @@ -0,0 +1,50 @@
> +commit 3cabac2f5b1688fc35a3e6af890d1b0193b8c840
> +Author: Sven Püschel
> +Date: Wed Feb 1 08:17:38 2023 +
> +
> +added libtirpc
> +
> +diff --git a/configure.ac b/configure.ac
> +index 0d935e8..415203b 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -27,8 +27,39 @@ AC_SUBST(LT_AGE)
> + #
> + # Checks for programs.
> + #
> ++
> ++# Function copied and modified from
> http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=blob;f=aclocal/libtirpc.m4;h=bddae022693100c810edff042d51b145c8f411a6;hb=HEAD
> ++dnl Checks for TI-RPC library and headers
> ++dnl
> ++AC_DEFUN([AC_LIBTIRPC], [
> ++
> ++ PKG_PROG_PKG_CONFIG([0.9.0])
> ++ PKG_CHECK_MODULES([TIRPC], [libtirpc],
> ++[LIBS="${LIBS} ${TIRPC_LIBS}"
> ++ AM_CFLAGS="${AM_CFLAGS} ${TIRPC_CFLAGS}"
> ++ AC_DEFINE([HAVE_LIBTIRPC], [1],
> ++ [Define to 1 if you have and wish to use
> libtirpc.])])
> ++
> ++ AS_IF([test -n "${LIBTIRPC}"],
> ++ [AC_CHECK_LIB([tirpc], [authgss_free_private_data],
> ++ [AC_DEFINE([HAVE_AUTHGSS_FREE_PRIVATE_DATA], [1],
> ++[Define to 1 if your rpcsec library
> provides authgss_free_private_data])],,
> ++ [${LIBS}])])
> ++
> ++ AS_IF([test -n "${LIBTIRPC}"],
> ++ [AC_CHECK_LIB([tirpc], [libtirpc_set_debug],
> ++ [AC_DEFINE([HAVE_LIBTIRPC_SET_DEBUG], [1],
> ++[Define to 1 if your tirpc library
> provides libtirpc_set_debug])],,
> ++ [${LIBS}])])
> ++
> ++ AC_SUBST([AM_CFLAGS])
> ++ AC_SUBST([LIBS])
> ++
> ++])dnl
> ++
> + AC_PROG_CC
> + AC_PROG_LIBTOOL
> ++AC_LIBTIRPC
> +
> + AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
> +
> diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-fix_socklen_t.diff
> b/patches/lmbench-3.0-a9/lmbench-3.0-a9-fix_socklen_t.diff
> new file mode 100644
> index 0..e1cba8373
> --- /dev/null
> +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-fix_socklen_t.diff
> @@ -0,0 +1,19 @@
> +commit eacfb4af1ecfafa1a0486643c81f313eb183eaa8
> +Author: Sven Püschel
> +Date: Wed Feb 1 08:54:07 2023 +
> +
> +Added missing include for socklen_t check
> +
> +diff --git a/configure.ac b/configure.ac
> +index 415203b..c29e794 100644
> +--- a/configure.ac
> b/configure.ac
> +@@ -100,7 +100,7 @@ AC_CHECK_TYPE([uint64],[CFLAGS="${CFLAGS}
> -DHAVE_uint64"])
> + AC_CHECK_TYPE([uint64_t],[CFLAGS="${CFLAGS} -DHAVE_uint64_t"])
> + AC_CHECK_TYPE([int64],[CFLAGS="${CFLAGS} -DHAVE_int64"])
> + AC_CHECK_TYPE([int64_t],[CFLAGS="${CFLAGS} -DHAVE_int64_t"])
> +-AC_CHECK_TYPE([socklen_t],[CFLAGS="${CFLAGS} -DHAVE_socklen_t"])
> ++AC_CHECK_TYPE([socklen_t],[CFLAGS="${CFLAGS} -DHAVE_socklen_t"], [],
> [[#include ]])
> + AC_CHECK_TYPE([off64_t],[CFLAGS="${CFLAGS} -DHAVE_off64_t"])
> +
> + AC_COMPILE_IFELSE(
> diff --git a/patches/lmbench-3.0-a9/series b/patches/lmbench-3.0-a9/series
> index 0c4ffef30..b2a777897 100644
> --- a/patches/lmbench-3.0-a9/series
> +++ b/patches/lmbench-3.0-a9/series
> @@ -1,3 +1,5 @@
> lmbench-3.0-a9-remove-old-buildsystem.diff
> lmbench-3.0-a9-autotoolize.diff
> lmbench-3.0-a9-rpcheaders.diff
> +lmbench-3.0-a9-add-libtirpc.diff
> +lmbench-3.0-a9-fix_socklen_t.diff
Please regenerate the patches with 'git ptx-patches'.
> diff --git a/rules/lmbench.in b/rules/lmbench.in
> index f3d78e8e6..2e6d5fbcb 100644
> --- a/rules/lmbench.in
> +++ b/rules/lmbench.in
> @@ -1,14 +1,11 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=test_suites
> +## SECTION=test_suites
>
> config LMBENCH
> tristate
> select LIBC_M
> select GCCLIBS_GCC_S
> + # glibc has removed the SunRPC implementation, see
> https://fedoraproject.org/wiki/Changes/SunRPCRemoval, therefore we use
> libtirpc
I don't think wee need that comment here.
Re: [ptxdist] [PATCH 1/2] Revert "lmbench: remove after more than one year in staging"
On Tue, Feb 07, 2023 at 03:21:38PM +0100, Sven Püschel wrote:
> This reverts commit 81761ccf73cb470e310f121f9e62e926e7f7f4aa.
>
> Signed-off-by: Sven Püschel
> ---
> patches/lmbench-3.0-a9/autogen.sh | 1 +
> .../lmbench-3.0-a9-autotoolize.diff | 258 +
> ...lmbench-3.0-a9-remove-old-buildsystem.diff | 924 ++
> .../lmbench-3.0-a9-rpcheaders.diff| 37 +
> patches/lmbench-3.0-a9/series | 3 +
> rules/lmbench.in | 14 +
> rules/lmbench.make| 102 ++
> 7 files changed, 1339 insertions(+)
> create mode 12 patches/lmbench-3.0-a9/autogen.sh
> create mode 100644 patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff
> create mode 100644
> patches/lmbench-3.0-a9/lmbench-3.0-a9-remove-old-buildsystem.diff
> create mode 100644 patches/lmbench-3.0-a9/lmbench-3.0-a9-rpcheaders.diff
> create mode 100644 patches/lmbench-3.0-a9/series
> create mode 100644 rules/lmbench.in
> create mode 100644 rules/lmbench.make
>
> diff --git a/patches/lmbench-3.0-a9/autogen.sh
> b/patches/lmbench-3.0-a9/autogen.sh
> new file mode 12
> index 0..9f8a4cb7d
> --- /dev/null
> +++ b/patches/lmbench-3.0-a9/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff
> b/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff
> new file mode 100644
> index 0..b41b77b91
> --- /dev/null
> +++ b/patches/lmbench-3.0-a9/lmbench-3.0-a9-autotoolize.diff
> @@ -0,0 +1,258 @@
> +From: Robert Schwebel
> +Subject: Add autotool based build system
> +
> +Signed-off-by: Robert Schwebel
> +
> +---
> + Makefile.am |3 +
> + autogen.sh | 22
> + configure.ac| 101
>
> + src/Makefile.am | 100
> +++
> + 4 files changed, 226 insertions(+)
> +
> +Index: b/Makefile.am
> +===
> +--- /dev/null
> b/Makefile.am
> +@@ -0,0 +1,3 @@
> ++SUBDIRS = \
> ++src
> ++
> +Index: b/autogen.sh
> +===
> +--- /dev/null
> b/autogen.sh
> +@@ -0,0 +1,22 @@
> ++#!/bin/bash
> ++
> ++#
> ++# usage:
> ++#
> ++# banner
> ++#
> ++banner() {
> ++echo
> ++TG=`echo $1 | sed -e "s,/.*/,,g"`
> ++LINE=`echo $TG |sed -e "s/./-/g"`
> ++echo $LINE
> ++echo $TG
> ++echo $LINE
> ++echo
> ++}
> ++
> ++banner "autoreconf"
> ++
> ++autoreconf --force --install --symlink -Wall || exit $?
> ++
> ++banner "Finished"
> +Index: b/configure.ac
> +===
> +--- /dev/null
> b/configure.ac
> +@@ -0,0 +1,101 @@
> ++AC_PREREQ(2.59)
> ++
> ++AC_INIT([lmbench], [trunk], [b...@pengutronix.de])
> ++AC_CONFIG_SRCDIR([src/lmdd.c])
> ++AC_CANONICAL_BUILD
> ++AC_CANONICAL_HOST
> ++
> ++AM_MAINTAINER_MODE
> ++
> ++CFLAGS="${CFLAGS} -W -Wall"
> ++
> ++#
> ++# libtool library versioning stuff
> ++#
> ++# Library code modified:REVISION++
> ++# Interfaces changed/added/removed: CURRENT++ REVISION=0
> ++# Interfaces added: AGE++
> ++# Interfaces removed: AGE=0
> ++LT_CURRENT=0
> ++LT_REVISION=0
> ++LT_AGE=0
> ++AC_SUBST(LT_CURRENT)
> ++AC_SUBST(LT_REVISION)
> ++AC_SUBST(LT_AGE)
> ++
> ++
> ++#
> ++# Checks for programs.
> ++#
> ++AC_PROG_CC
> ++AC_PROG_LIBTOOL
> ++
> ++AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
> ++
> ++
> ++#
> ++# Debugging
> ++#
> ++AC_MSG_CHECKING([whether to enable debugging])
> ++AC_ARG_ENABLE(debug,
> ++AS_HELP_STRING([--enable-debug], [enable debugging @<:@default=no@:>@]),
> ++[case "$enableval" in
> ++y | yes) CONFIG_DEBUG=yes ;;
> ++*) CONFIG_DEBUG=no ;;
> ++esac],
> ++[CONFIG_DEBUG=no])
> ++AC_MSG_RESULT([${CONFIG_DEBUG}])
> ++if test "${CONFIG_DEBUG}" = "yes"; then
> ++CFLAGS="${CFLAGS} -Werror -Wsign-compare -Wfloat-equal
> -Wformat-security -g -O1"
> ++AC_DEFINE(DEBUG, 1, [debugging])
> ++else
> ++CFLAGS="${CFLAGS} -O2"
> ++fi
> ++
> ++
> ++#
> ++# header file checks
> ++#
> ++
> ++AC_CHECK_HEADER([pmap_clnt.h],[CFLAGS="${CFLAGS} -DHAVE_pmap_clnt_h"])
> ++
> ++
> ++#
> ++# type checks
> ++#
> ++
> ++AC_CHECK_TYPE([uint],[CFLAGS="${CFLAGS} -DHAVE_uint"])
> ++AC_CHECK_TYPE([uint64],[CFLAGS="${CFLAGS} -DHAVE_uint64"])
> ++AC_CHECK_TYPE([uint64_t],[CFLAGS="${CFLAGS} -DHAVE_uint64_t"])
> ++AC_CHECK_TYPE([int64],[CFLAGS="${CFLAGS} -DHAVE_int64"])
> ++AC_CHECK_TYPE([int64_t],[CFLAGS="${CFLAGS} -DHAVE_int64_t"])
> ++AC_CHECK_TYPE([socklen_t],[CFLAGS="${CFLAGS} -DHAVE_socklen_t"])
> ++AC_CHECK_TYPE([off64_t],[CFLAGS="${CFLAGS} -DHAVE_off64_t"])
> ++
> ++AC_COMPILE_IFELSE(
> ++[
> ++#include
> ++main() { srand48(973); return (int)(1.0E9 * drand48()); }
> ++],
> ++[CFLAGS="${CFLAGS}
Re: [ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options
On Mon, Jan 30, 2023 at 10:37:44AM +0100, Philipp Zabel wrote:
> On Mon, Jan 09, 2023 at 02:46:16PM +0100, Philipp Zabel wrote:
> > Ignore new Meson builtin options "pkgconfig.relocatable" and
> > "prefer_static" (since 0.63).
> >
> > Signed-off-by: Philipp Zabel
>
> Looks like this one fell through the cracks.
>
> As of commit f4c1eef53247 ("host-meson: version bump 0.61.4 -> 1.0.0")
> we have Meson with these options available.
pkgconfig.relocatable is added to the options, so it should not be needed
here. So this patch need updating.
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- |
Re: [ptxdist] [PATCH] u-boot.in: Add host-swig, python3-dev dependencies
On Sun, Jan 29, 2023 at 11:23:56AM +0100, avazquez@gmail.com wrote: > From: Alejandro Vazquez > > Some target configurations require swig and python3-dev. > > For more information: > https://github.com/u-boot/u-boot/blob/v2023.01/scripts/dtc/README > > Signed-off-by: Alejandro Vazquez > --- > platforms/u-boot.in | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 769237081..f784267a4 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -3,6 +3,8 @@ > menuconfig U_BOOT > select BOOTLOADER > select HOST_SYSTEM_PYTHON3 > + select HOST_SYSTEM_PYTHON3_DEV > + select HOST_SWIG This should be conditional, just like the openssl dependency below. Michael > select HOST_OPENSSL if U_BOOT_NEEDS_HOST_OPENSSL > prompt "U-Boot" > bool > -- > 2.34.1 > > > -- 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- |
