[ptxdist] [PATCH] qt-everywhere-opensource-src: Removed whitespace error from patch
fixed 'warning: 1 line adds whitespace errors.' when running 'ptxdist extract --git qt5' Signed-off-by: Sven Püschel --- .../0001-CVE-2023-4863-5.15.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch index f4462608f..9d5b9fdf3 100644 --- a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch +++ b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch @@ -424,7 +424,7 @@ index 2b46f5bec641..d72147658721 100644 +#include + + #include -+ ++ #ifdef HAVE_CONFIG_H - #include "src/webp/config.h" - #endif -- 2.45.0
[ptxdist] [PATCH 9/9] vulkan-validationlayers: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/vulkan-validationlayers.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-validationlayers.make b/rules/vulkan-validationlayers.make index 6bfca4e359ce..e88a77710eb3 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.280.0 -VULKAN_VALIDATIONLAYERS_MD5:= 04805a2454d6e6facc9ca6651d04dbbf +VULKAN_VALIDATIONLAYERS_VERSION:= 1.3.283.0 +VULKAN_VALIDATIONLAYERS_MD5:= 28c871c2e13cc7b7e4ea7d2685c3a075 VULKAN_VALIDATIONLAYERS:= vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz VULKAN_VALIDATIONLAYERS_URL:= https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX) @@ -32,6 +32,7 @@ VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake VULKAN_VALIDATIONLAYERS_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SELF_VVL=OFF \ -DBUILD_TESTS=OFF \ -DBUILD_WERROR=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \ -- 2.39.2
[ptxdist] [PATCH] shaderc: version bump v2024.0 -> v2024.1
Signed-off-by: Philipp Zabel --- rules/shaderc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/shaderc.make b/rules/shaderc.make index aedc79f308f2..7e816ee46352 100644 --- a/rules/shaderc.make +++ b/rules/shaderc.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc # # Paths and names # -SHADERC_VERSION:= v2024.0 -SHADERC_MD5:= c29fbe8f3c10fc0097e04327e1f64a73 +SHADERC_VERSION:= v2024.1 +SHADERC_MD5:= 3d445aeffa0ad59f62b87124454f85f6 SHADERC:= shaderc-$(SHADERC_VERSION) SHADERC_SUFFIX := tar.gz SHADERC_URL:= \ -- 2.39.2
[ptxdist] [PATCH 8/9] vulkan-utility-libraries: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/vulkan-utility-libraries.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-utility-libraries.make b/rules/vulkan-utility-libraries.make index 6ef2d3fe724c..9d0468c81455 100644 --- a/rules/vulkan-utility-libraries.make +++ b/rules/vulkan-utility-libraries.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_UTILITY_LIBRARIES) += vulkan-utility-libraries # # Paths and names # -VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.280.0 -VULKAN_UTILITY_LIBRARIES_MD5 := c611d59dcabce5d0ee11f5f6521666aa +VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.283.0 +VULKAN_UTILITY_LIBRARIES_MD5 := 76d884af52443fb91df589b8e43c51e5 VULKAN_UTILITY_LIBRARIES := vulkan-utility-libraries-$(VULKAN_UTILITY_LIBRARIES_VERSION) VULKAN_UTILITY_LIBRARIES_SUFFIX:= tar.gz VULKAN_UTILITY_LIBRARIES_URL := https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-$(VULKAN_UTILITY_LIBRARIES_VERSION).$(VULKAN_UTILITY_LIBRARIES_SUFFIX) @@ -34,6 +34,7 @@ VULKAN_UTILITY_LIBRARIES_CONF_OPT := \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=OFF \ -DUPDATE_DEPS=OFF \ + -DVUL_MOCK_ANDROID=OFF \ -DVUL_WERROR=OFF # vim: syntax=make -- 2.39.2
[ptxdist] [PATCH 7/9] vulkan-tools: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/vulkan-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make index 8b7c9624538c..78fdb0c5d57b 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.280.0 -VULKAN_TOOLS_MD5 := f68e21f73b893d882e5f97959f489757 +VULKAN_TOOLS_VERSION := 1.3.283.0 +VULKAN_TOOLS_MD5 := 2cb87f3f848335b7e2a76326ffdcce00 VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) VULKAN_TOOLS_SUFFIX:= tar.gz VULKAN_TOOLS_URL := https://github.com/KhronosGroup/Vulkan-Tools/archive/vulkan-sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 5/9] vulkan-headers: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/vulkan-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make index 73d4969d1358..2e66b091f68e 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.280.0 -VULKAN_HEADERS_MD5 := 6a5ff0b86c072300fac88cfdd3996c75 +VULKAN_HEADERS_VERSION := 1.3.283.0 +VULKAN_HEADERS_MD5 := 5d9916540db7cb0ca59d0146f0c638a1 VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) VULKAN_HEADERS_SUFFIX := tar.gz VULKAN_HEADERS_URL := https://github.com/KhronosGroup/Vulkan-Headers/archive/vulkan-sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 6/9] vulkan-loader: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/vulkan-loader.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make index 40a89591ebe4..161bdca98b2b 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.280.0 -VULKAN_LOADER_MD5 := 282d32eab31abf5aa14ec59be8e8ae19 +VULKAN_LOADER_VERSION := 1.3.283.0 +VULKAN_LOADER_MD5 := 80b9bfeba8132c76f897b3de300eaa70 VULKAN_LOADER := vulkan-loader-$(VULKAN_LOADER_VERSION) VULKAN_LOADER_SUFFIX := tar.gz VULKAN_LOADER_URL := https://github.com/KhronosGroup/Vulkan-Loader/archive/vulkan-sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX) @@ -48,6 +48,7 @@ VULKAN_LOADER_CONF_OPT:= \ -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_WAYLAND) \ -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \ -DBUILD_WSI_XLIB_SUPPORT=OFF \ + -DCODE_COVERAGE=OFF \ -DFALLBACK_CONFIG_DIRS=/etc/xdg \ -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ -DLOADER_CODEGEN=OFF \ -- 2.39.2
[ptxdist] [PATCH 4/9] volk: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/volk.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/volk.make b/rules/volk.make index 92e2a9f1d4ad..6c3ea71af6f2 100644 --- a/rules/volk.make +++ b/rules/volk.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VOLK) += volk # # Paths and names # -VOLK_VERSION := 1.3.280.0 -VOLK_MD5 := 2154f24cd28be1adcf48ac34cb0daa59 +VOLK_VERSION := 1.3.283.0 +VOLK_MD5 := 41574b56a258bc6b8654879e5c363d5c VOLK := volk-$(VOLK_VERSION) VOLK_SUFFIX:= tar.gz VOLK_URL := https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-$(VOLK_VERSION).$(VOLK_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 3/9] spirv-tools: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/spirv-tools.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make index 9df598a84e75..c80d2fdf1646 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.280.0 -SPIRV_TOOLS_MD5:= d55af678b61667313d478db9399c09d4 +SPIRV_TOOLS_VERSION:= 1.3.283.0 +SPIRV_TOOLS_MD5:= c2dc7b5d6e9083974bc4659205a43931 SPIRV_TOOLS:= spirv-tools-$(SPIRV_TOOLS_VERSION) SPIRV_TOOLS_SUFFIX := tar.gz SPIRV_TOOLS_URL:= https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 2/9] spirv-headers: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/spirv-headers.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make index aab2edd4029a..6d547d274929 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.280.0 -SPIRV_HEADERS_MD5 := 438892138fe25c123cdacd05eb4a4b17 +SPIRV_HEADERS_VERSION := 1.3.283.0 +SPIRV_HEADERS_MD5 := 5f258f65b4526c053d9ca3cddc94e71b SPIRV_HEADERS := spirv-headers-$(SPIRV_HEADERS_VERSION) SPIRV_HEADERS_SUFFIX := tar.gz SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) -- 2.39.2
[ptxdist] [PATCH 1/9] glslang: version bump 1.3.280.0 -> 1.3.283.0
Signed-off-by: Philipp Zabel --- rules/glslang.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/glslang.make b/rules/glslang.make index 21df9b9dcf23..0999df3e9de8 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION:= 1.3.280.0 -GLSLANG_MD5:= e6105068a700cdeb6d498bb982dcc570 +GLSLANG_VERSION:= 1.3.283.0 +GLSLANG_MD5:= 3fdeb75b8439f1d1008679dd9dae782c GLSLANG:= glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL:= https://github.com/KhronosGroup/glslang/archive/vulkan-sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) -- 2.39.2
Re: [ptxdist] [PATCH v2 2/2] pipewire: version bump 1.0.1 -> 1.0.3
On Wed, 15 May 2024 09:04:24 +0200, Michael Riesch wrote: > https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.0.3 > > Signed-off-by: Michael Riesch Reviewed-by: Michael Tretter > --- > rules/pipewire.make | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/pipewire.make b/rules/pipewire.make > index 8747ebe6c..322ae70a1 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire > # > # Paths and names > # > -PIPEWIRE_VERSION := 1.0.1 > -PIPEWIRE_MD5 := d70bde8000d62df6c03c6dd928ab8948 > +PIPEWIRE_VERSION := 1.0.3 > +PIPEWIRE_MD5 := 92eb16fb925aa9dc9191d8ef7b04687d > PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) > PIPEWIRE_SUFFIX := tar.bz2 > PIPEWIRE_URL := > https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) > > -- > 2.34.1 > > >
Re: [ptxdist] [PATCH v2 1/2] libcamera: version bump 0.0.5 -> 0.2.0
On Wed, 15 May 2024 09:04:23 +0200, Michael Riesch wrote: > Due to an API breakage in libcamera it may be necessary to update the > consumers of the library. One example is pipewire, which needs to be > updated to at least 1.0.2. > > Signed-off-by: Michael Riesch Reviewed-by: Michael Tretter > --- > rules/libcamera.make | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/rules/libcamera.make b/rules/libcamera.make > index 928a95654..23a3c1d6b 100644 > --- a/rules/libcamera.make > +++ b/rules/libcamera.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera > # > # Paths and names > # > -LIBCAMERA_VERSION:= 0.0.5 > -LIBCAMERA_MD5:= cc2f5c0c051319a7e853dc6916807ce5 > +LIBCAMERA_VERSION:= 0.2.0 > +LIBCAMERA_MD5:= 08f0681221c654838e54e6b3a32f89b5 > LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION) > LIBCAMERA_SUFFIX := tar.gz > LIBCAMERA_URL:= > https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) > @@ -79,6 +79,7 @@ LIBCAMERA_CONF_OPT := \ > -Dqcam=$(call ptx/endis,PTXCONF_LIBCAMERA_QCAM)d \ > -Dtest=false \ > -Dtracing=disabled \ > + -Dudev=enabled \ > -Dv4l2=false \ > -Dpycamera=disabled > > > -- > 2.34.1 > > >
[ptxdist] [PATCH v3 2/2] kernel/perf: Make use of libtraceevent
This makes it possible to use with tracepoints and enable the subcommands kmem, kwork, lock, sched and timechart. Signed-off-by: Uwe Kleine-König --- rules/kernel.in | 1 + rules/kernel.make | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/kernel.in b/rules/kernel.in index 817481577..862d52598 100644 --- a/rules/kernel.in +++ b/rules/kernel.in @@ -6,6 +6,7 @@ menuconfig KERNEL select LIBELF_LIBDW if KERNEL_TOOL_PERF select SLANGif KERNEL_TOOL_PERF select BINUTILS if KERNEL_TOOL_PERF + select LIBTRACEEVENTif KERNEL_TOOL_PERF select LIBUNWINDif KERNEL_TOOL_PERF if KERNEL diff --git a/rules/kernel.make b/rules/kernel.make index d82aa27fb..0fe4f1e1b 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -223,7 +223,6 @@ KERNEL_TOOL_PERF_OPTS := \ NO_LIBBIONIC=1 \ NO_LIBCRYPTO=1 \ NO_LIBDW_DWARF_UNWIND= \ - NO_LIBTRACEEVENT=1 \ NO_PERF_READ_VDSO32=1 \ NO_PERF_READ_VDSOX32=1 \ NO_ZLIB= \ -- 2.39.2
[ptxdist] [PATCH v3 1/2] libtraceevent: new package
This is required for perf (PTXCONF_KERNEL_TOOL_PERF) to work with
tracepoints and enable the subcommands kmem, kwork, lock, sched and
timechart.
Signed-off-by: Uwe Kleine-König
---
rules/libtraceevent.in | 8 +
rules/libtraceevent.make | 70
2 files changed, 78 insertions(+)
create mode 100644 rules/libtraceevent.in
create mode 100644 rules/libtraceevent.make
diff --git a/rules/libtraceevent.in b/rules/libtraceevent.in
new file mode 100644
index 0..a3b7b9737
--- /dev/null
+++ b/rules/libtraceevent.in
@@ -0,0 +1,8 @@
+## SECTION=system_libraries
+
+config LIBTRACEEVENT
+ bool
+ prompt "libtraceevent"
+ select HOST_MESON
+ help
+ FIXME
diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
new file mode 100644
index 0..7acc9c965
--- /dev/null
+++ b/rules/libtraceevent.make
@@ -0,0 +1,70 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2024 by Uwe Kleine-Koenig
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
+
+#
+# Paths and names
+#
+LIBTRACEEVENT_VERSION := 1.8.2
+LIBTRACEEVENT_MD5 := 671645965e835ef4236b96851fb889c9
+LIBTRACEEVENT := libtraceevent-$(LIBTRACEEVENT_VERSION)
+LIBTRACEEVENT_SUFFIX := tar.xz
+LIBTRACEEVENT_URL :=
https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
+LIBTRACEEVENT_SOURCE := $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
+LIBTRACEEVENT_DIR := $(BUILDDIR)/$(LIBTRACEEVENT)
+LIBTRACEEVENT_LICENSE := LGPL-2.1 + GPL-2.0
+
+#
+# Prepare
+#
+
+#LIBTRACEEVENT_CONF_ENV:= $(CROSS_ENV)
+
+#
+# meson
+#
+LIBTRACEEVENT_CONF_TOOL:= meson
+
+# There are some more configuration variables that don't have any effect given
+# -Ddoc=false.
+# Currently these are: docbook-suppress-sp, docbook-xls-172, htmldir,
man-bold-literal
+#
+# The variable plugindir defaults to '' which is then interpreted as
+# join_paths(libdir, 'traceevent/plugins')
+LIBTRACEEVENT_CONF_OPT := \
+ $(CROSS_MESON_USR) \
+ -Ddoc=false \
+
+#
+# Target-Install
+#
+
+$(STATEDIR)/libtraceevent.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libtraceevent)
+ @$(call install_fixup, libtraceevent, PRIORITY, optional)
+ @$(call install_fixup, libtraceevent, SECTION, base)
+ @$(call install_fixup, libtraceevent, AUTHOR, "Uwe Kleine-König
")
+ @$(call install_fixup, libtraceevent, DESCRIPTION, missing)
+
+ @$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
+
+ @for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211
sched_switch scsi tlb xen; do \
+ $(call install_lib, libtraceevent, 0, 0, 0644,
libtraceevent/plugins/plugin_$${plugin}); \
+ done
+
+ @$(call install_finish, libtraceevent)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.39.2
[ptxdist] [PATCH v3 0/2] add libtraceevent for perf
Hello, changes since (implicit) v1 available at https://lore.ptxdist.org/ptxdist/zjtm5u8mjdczj...@pengutronix.de/: - split in two patches (suggested by Michael Tretter) - drop commented out targets (suggested by Michael Tretter) - install plugin libraries - comment about unset meson config options changes since v2 available at https://lore.ptxdist.org/ptxdist/zjtm5u8mjdczj...@pengutronix.de/: - use SECTION=system_libraries, sorry missed that when sending v2 :-\ Michael requested that I explicitly set all configuration options to their default value. This felt wrong as most of them don't matter when documentation is disabled (which is the case here). So as a suggested compromise I explicitly listed the unset options. Best regards Uwe Uwe Kleine-König (2): libtraceevent: new package kernel/perf: Make use of libtraceevent rules/kernel.in | 1 + rules/kernel.make| 1 - rules/libtraceevent.in | 8 + rules/libtraceevent.make | 70 4 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 rules/libtraceevent.in create mode 100644 rules/libtraceevent.make base-commit: 9de477ba07b1778daa58537121091d9f3b8ea670 -- 2.39.2
Re: [ptxdist] [PATCH 2/3] libcamera: version bump 0.0.5 -> 0.2.0
Hi mol,
On 5/14/24 18:15, Michael Olbrich wrote:
> On Tue, May 14, 2024 at 04:34:25PM +0200, Michael Riesch wrote:
>> Hi Michael,
>>
>> Sorry for the long silence...
>>
>> On 3/5/24 19:35, Michael Tretter wrote:
>>> On Tue, 05 Mar 2024 11:51:35 +0100, Michael Riesch wrote:
Due to an API breakage in libcamera it may be necessary to update the
consumers of the library. One example is pipewire, which needs to be
updated to at least 1.0.2.
Signed-off-by: Michael Riesch
---
rules/libcamera.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/libcamera.make b/rules/libcamera.make
index 928a95654..c9c4e2055 100644
--- a/rules/libcamera.make
+++ b/rules/libcamera.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera
#
# Paths and names
#
-LIBCAMERA_VERSION := 0.0.5
-LIBCAMERA_MD5 := cc2f5c0c051319a7e853dc6916807ce5
+LIBCAMERA_VERSION := 0.2.0
+LIBCAMERA_MD5 := 08f0681221c654838e54e6b3a32f89b5
>>>
>>> There is a new feature flag for udev support, which should be set
>>> explicitly.
>>
>> Hm. Why? Do you want to disable udev support explicitly?
>>
>> libcamera commit d314d3b9 ("libcamera: Add option to configure udev
>> support") introduces the meson option but sets its default to "auto". If
>> libudev is found (and it should be found, as LIBCAMERA selects
>> UDEV_LIBUDEV) the new feature "Hotplug support" is enabled. As stated in
>> the commit message of d314d3b9, the behavior is not changed by this commit.
>>
>> If one would like to disable udev support explicitly, we would need to
>> introduce a ptxdist option, pass it to meson, and make the dependency on
>> UDEV_LIBUDEV conditional. But personally I don't see any value in that.
>
> 'set explicitly' as in 'enable it explicitly'. This way, the build will
> fail if udev is not detected correctly for some reason.
Ah, got it. Thanks for the clarification.
v2 should have hit your mailbox by now. It still contains the update to
pipewire 1.0.3, although 1.0.6 has been released recently. However,
let's do this step by step, please -> this update is simply to handle
libcamera's API breakage.
Regards, Michael
>
> Michael
>
[ptxdist] [PATCH v2 2/2] pipewire: version bump 1.0.1 -> 1.0.3
https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.0.3 Signed-off-by: Michael Riesch --- rules/pipewire.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pipewire.make b/rules/pipewire.make index 8747ebe6c..322ae70a1 100644 --- a/rules/pipewire.make +++ b/rules/pipewire.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire # # Paths and names # -PIPEWIRE_VERSION := 1.0.1 -PIPEWIRE_MD5 := d70bde8000d62df6c03c6dd928ab8948 +PIPEWIRE_VERSION := 1.0.3 +PIPEWIRE_MD5 := 92eb16fb925aa9dc9191d8ef7b04687d PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) PIPEWIRE_SUFFIX:= tar.bz2 PIPEWIRE_URL := https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2 0/2] libcamera: version bump 0.0.5 -> 0.2.0
Habidere, This series features a long overdue libcamera version bump to v0.2.0 along a pipewire version bump that is required due to an API breakage. Just in time before libcamera v0.3.0 will be released, right, Kieran? ;-) Looking forward to your comments! --- Changes in v2: - drop already accepted patch that fixes the libcamera tarball repo - enable udev/hotplug configuration option explicitly - Link to v1: https://lore.kernel.org/r/20240305-feature-libcamera-0-2-0-v1-0-0625f2fd9...@wolfvision.net --- Michael Riesch (2): libcamera: version bump 0.0.5 -> 0.2.0 pipewire: version bump 1.0.1 -> 1.0.3 rules/libcamera.make | 5 +++-- rules/pipewire.make | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) --- base-commit: 9de477ba07b1778daa58537121091d9f3b8ea670 change-id: 20240305-feature-libcamera-0-2-0-5cc0ab00b499 Best regards, -- Michael Riesch
[ptxdist] [PATCH v2 1/2] libcamera: version bump 0.0.5 -> 0.2.0
Due to an API breakage in libcamera it may be necessary to update the consumers of the library. One example is pipewire, which needs to be updated to at least 1.0.2. Signed-off-by: Michael Riesch --- rules/libcamera.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/libcamera.make b/rules/libcamera.make index 928a95654..23a3c1d6b 100644 --- a/rules/libcamera.make +++ b/rules/libcamera.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera # # Paths and names # -LIBCAMERA_VERSION := 0.0.5 -LIBCAMERA_MD5 := cc2f5c0c051319a7e853dc6916807ce5 +LIBCAMERA_VERSION := 0.2.0 +LIBCAMERA_MD5 := 08f0681221c654838e54e6b3a32f89b5 LIBCAMERA := libcamera-$(LIBCAMERA_VERSION) LIBCAMERA_SUFFIX := tar.gz LIBCAMERA_URL := https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) @@ -79,6 +79,7 @@ LIBCAMERA_CONF_OPT:= \ -Dqcam=$(call ptx/endis,PTXCONF_LIBCAMERA_QCAM)d \ -Dtest=false \ -Dtracing=disabled \ + -Dudev=enabled \ -Dv4l2=false \ -Dpycamera=disabled -- 2.34.1
Re: [ptxdist] [PATCH 20/20] ptxd_make_get: remove FTP support
On Tue, May 14, 2024 at 10:35:52PM +0200, Lucas Stach wrote:
> wget2 as an (almost) drop-in replacement to wget doesn't support the
> FTP(S) protocol. Instead of trying to fix FTP downloads via other
> tools simply remove the support, as it's not really needed anymore
> due to available alternatives.
>
> Signed-off-by: Lucas Stach
> ---
> scripts/lib/ptxd_make_get.sh | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index c06257ee6ebb..615809125932 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -75,7 +75,6 @@ ptxd_make_get_http() {
> echo "Checking URL '${url}'..."
> temp_header="$(mktemp "${PTXDIST_TEMPDIR}/urlcheck.XX")" ||
> ptxd_bailout "failed to create tempfile"
> curl \
> - --ftp-pasv \
> --connect-timeout 30 \
> --retry 5 \
> --user-agent "PTXdist ${PTXDIST_VERSION_FULL}" \
> @@ -101,7 +100,6 @@ ptxd_make_get_http() {
> progress=bar:force
> fi
> wget \
> - --passive-ftp \
> --progress="${progress}" \
> --timeout=30 \
> --tries=5 \
> @@ -526,7 +524,7 @@ ptxd_make_get() {
> ptxd_make_get_download_permitted &&
> ptxd_make_get_svn && return
> ;;
> - http://*|https://*|ftp://*)
> + http://*|https://*)
I think we can drop the options above. Passive FTP is the default anyways
for both curl and wget nowadays. But keep the pattern here for now. I think
we should have a "ptxdist lint" check instead.
Michael
> ptxd_make_get_download_permitted &&
> ptxd_make_get_http && return
> ;;
> --
> 2.39.2
>
>
>
--
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 09/20] gdbserver: remove FTP URL
On Tue, May 14, 2024 at 10:35:41PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/gdbserver.make | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/rules/gdbserver.make b/rules/gdbserver.make > index 2ff2f15395c4..7937158a9851 100644 > --- a/rules/gdbserver.make > +++ b/rules/gdbserver.make > @@ -27,9 +27,7 @@ GDBSERVER_LICENSE_FILES := \ > file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ > file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 > > -GDBSERVER_URL := \ > - $(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \ > - > ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX) Same as gdb. Michael > +GDBSERVER_URL := $(call ptx/mirror, GNU, > gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) > > # > > # Prepare > -- > 2.39.2 > > > -- 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 08/20] gdb: remove FTP URL
On Tue, May 14, 2024 at 10:35:40PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/gdb.make | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/rules/gdb.make b/rules/gdb.make > index c1337427b605..085e1f66fc98 100644 > --- a/rules/gdb.make > +++ b/rules/gdb.make > @@ -24,9 +24,7 @@ GDB_SOURCE := $(SRCDIR)/$(GDB).$(GDB_SUFFIX) > GDB_DIR := $(BUILDDIR)/$(GDB) > GDB_LICENSE := GPL-3.0-or-later > > -GDB_URL := \ > - $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \ > - ftp://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX) This URL is for pre-release snapshots. Please turn it into a https URL instead. Michael > +GDB_URL := $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) > > # > > # Prepare > -- > 2.39.2 > > > -- 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 05/20] efax: replace download URL with HTTPS
On Tue, May 14, 2024 at 10:35:37PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/efax.in | 6 ++ > rules/efax.make | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/rules/efax.in b/rules/efax.in > index ff45094a762e..55379a249aee 100644 > --- a/rules/efax.in > +++ b/rules/efax.in > @@ -1,3 +1,5 @@ > +## SECTION=staging > +## old section: That deserves a comment in the commit message. > ## SECTION=communication You need to add an extra '#' here, otherwise the package is in both sections. Michael > config EFAX > tristate > @@ -16,3 +18,7 @@ config EFAX > files as faxes and receive, print or preview > received faxes. > > + STAGING: remove in PTXdist 2025.06.0 > + Unmaintained in PTXdist. Old upstream and URL are > + dead. "New" development release from 2008 can be found > + here: https://www.cce.com/efax > diff --git a/rules/efax.make b/rules/efax.make > index 80d0abddb07d..ebd2ea65a73e 100644 > --- a/rules/efax.make > +++ b/rules/efax.make > @@ -19,7 +19,7 @@ EFAX_VERSION:= 0.9 > EFAX_MD5 := 23bd3767f87c455c58ccae7f88bce725 > EFAX := efax-$(EFAX_VERSION) > EFAX_SUFFIX := tar.gz > -EFAX_URL := > ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX) > +EFAX_URL := > https://www.ibiblio.org/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX) > EFAX_SOURCE := $(SRCDIR)/$(EFAX).$(EFAX_SUFFIX) > EFAX_DIR := $(BUILDDIR)/$(EFAX) > EFAX_LICENSE := unknown > -- > 2.39.2 > > > -- 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- |
