Control: tags 1126399 + patch Control: tags 1126399 + pending Dear maintainer,
I've prepared an NMU for cpu-x (versioned as 5.4.0-0.2) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for cpu-x-5.4.0 cpu-x-5.4.0 changelog | 7 +++ patches/0001-use-default-cpu-instead-of-ia64.patch | 43 +++++++++++++++++++++ patches/series | 1 3 files changed, 51 insertions(+) diff -Nru cpu-x-5.4.0/debian/changelog cpu-x-5.4.0/debian/changelog --- cpu-x-5.4.0/debian/changelog 2025-08-28 12:44:33.000000000 +0300 +++ cpu-x-5.4.0/debian/changelog 2026-02-23 14:30:09.000000000 +0200 @@ -1,3 +1,10 @@ +cpu-x (5.4.0-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with nasm 3. (Closes: #1126399) + + -- Adrian Bunk <[email protected]> Mon, 23 Feb 2026 14:30:09 +0200 + cpu-x (5.4.0-0.1) unstable; urgency=medium * NMU diff -Nru cpu-x-5.4.0/debian/patches/0001-use-default-cpu-instead-of-ia64.patch cpu-x-5.4.0/debian/patches/0001-use-default-cpu-instead-of-ia64.patch --- cpu-x-5.4.0/debian/patches/0001-use-default-cpu-instead-of-ia64.patch 1970-01-01 02:00:00.000000000 +0200 +++ cpu-x-5.4.0/debian/patches/0001-use-default-cpu-instead-of-ia64.patch 2026-02-23 14:13:03.000000000 +0200 @@ -0,0 +1,43 @@ +From 34c3cc84812a9b64760a261c72b0ddf02ae85f2c Mon Sep 17 00:00:00 2001 +From: Dominik 'Rathann' Mierzejewski <[email protected]> +Date: Tue, 14 Oct 2025 13:37:48 +0200 +Subject: use default cpu instead of ia64 + +Recent NASM release (3.0+) enforces cpu levels more strictly, causing +assembly to fail otherwise. + +Fixes #401 . +--- + src/core/bandwidth/OOC/utility-x86-64bit.asm | 2 +- + src/core/bandwidth/routines-x86-64bit.asm | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/bandwidth/OOC/utility-x86-64bit.asm b/src/core/bandwidth/OOC/utility-x86-64bit.asm +index 259d9f4b..9c360540 100644 +--- a/src/core/bandwidth/OOC/utility-x86-64bit.asm ++++ b/src/core/bandwidth/OOC/utility-x86-64bit.asm +@@ -20,7 +20,7 @@ + ;============================================================================= + + bits 64 +-cpu ia64 ++cpu default + + ; Note: + ; Unix ABI says integer param are put in these registers in this order: +diff --git a/src/core/bandwidth/routines-x86-64bit.asm b/src/core/bandwidth/routines-x86-64bit.asm +index 67c9d5fe..675f8800 100644 +--- a/src/core/bandwidth/routines-x86-64bit.asm ++++ b/src/core/bandwidth/routines-x86-64bit.asm +@@ -38,7 +38,7 @@ + %endif + + bits 64 +-cpu ia64 ++cpu default + + global CopyWithMainRegisters + global _CopyWithMainRegisters +-- +2.47.3 + diff -Nru cpu-x-5.4.0/debian/patches/series cpu-x-5.4.0/debian/patches/series --- cpu-x-5.4.0/debian/patches/series 2025-08-28 12:44:33.000000000 +0300 +++ cpu-x-5.4.0/debian/patches/series 2026-02-23 14:13:28.000000000 +0200 @@ -1,2 +1,3 @@ 2001_build-with-PIE.patch 2002_avoid-format-security-compiler-flag.patch +0001-use-default-cpu-instead-of-ia64.patch
