openvdb: diff for NMU version 10.0.1-2.3
Control: tags 1061216 + patch
Control: tags 1061216 + pending
Dear maintainer,
I've prepared an NMU for openvdb (versioned as 10.0.1-2.3) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.
* Disable AX until ported to newer LLVM. (Closes: #1061216)
* Revert Maintainer change and Ubuntu changelog entries from the previous NMU.
* Add missing changes from debian/control to debian/control.in.
cu
Adrian
diffstat for openvdb-10.0.1 openvdb-10.0.1
changelog | 45 +++++++++------------------------------------
control | 15 +++++++--------
control.in | 7 +++----
rules | 3 ++-
4 files changed, 21 insertions(+), 49 deletions(-)
diff -Nru openvdb-10.0.1/debian/changelog openvdb-10.0.1/debian/changelog
--- openvdb-10.0.1/debian/changelog 2025-01-08 17:08:55.000000000 +0200
+++ openvdb-10.0.1/debian/changelog 2025-01-09 14:39:36.000000000 +0200
@@ -1,45 +1,18 @@
-openvdb (10.0.1-2.2) unstable; urgency=medium
+openvdb (10.0.1-2.3) unstable; urgency=medium
* Non-maintainer upload.
- * Fix build with -std=c++17. Closes: #1083179.
-
- -- Matthias Klose <doko@debian.org> Wed, 08 Jan 2025 16:08:55 +0100
-
-openvdb (10.0.1-2.1build6) plucky; urgency=medium
-
- * No-change rebuild for Python 3.13 as the default.
-
- -- Matthias Klose <doko@ubuntu.com> Fri, 03 Jan 2025 14:42:35 +0100
-
-openvdb (10.0.1-2.1build5) noble; urgency=medium
-
- * No change rebuild against fixed liblog4cplus-2.0.5t64.
-
- -- Matthias Klose <doko@ubuntu.com> Sun, 14 Apr 2024 19:42:12 +0200
-
-openvdb (10.0.1-2.1build4) noble; urgency=high
+ * Disable AX until ported to newer LLVM. (Closes: #1061216)
+ * Revert Maintainer change and Ubuntu changelog entries from the previous NMU.
+ * Add missing changes from debian/control to debian/control.in.
- * No change rebuild against liblog4cplus-2.0.5t64.
+ -- Adrian Bunk <bunk@debian.org> Thu, 09 Jan 2025 14:39:36 +0200
- -- Julian Andres Klode <juliank@ubuntu.com> Mon, 08 Apr 2024 17:01:08 +0200
-
-openvdb (10.0.1-2.1build3) noble; urgency=medium
-
- * No-change rebuild for CVE-2024-3094
-
- -- Steve Langasek <steve.langasek@ubuntu.com> Sun, 31 Mar 2024 06:42:31 +0000
-
-openvdb (10.0.1-2.1build2) noble; urgency=medium
-
- * No-change rebuild against libllvm14 t64.
-
- -- Matthias Klose <doko@ubuntu.com> Thu, 14 Mar 2024 20:41:00 +0100
-
-openvdb (10.0.1-2.1build1) noble; urgency=medium
+openvdb (10.0.1-2.2) unstable; urgency=medium
- * No-change rebuild against libimath-3-1-29t64
+ * Non-maintainer upload.
+ * Fix build with -std=c++17. Closes: #1083179.
- -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 11 Mar 2024 16:11:23 +0000
+ -- Matthias Klose <doko@debian.org> Wed, 08 Jan 2025 16:08:55 +0100
openvdb (10.0.1-2.1) unstable; urgency=medium
diff -Nru openvdb-10.0.1/debian/control openvdb-10.0.1/debian/control
--- openvdb-10.0.1/debian/control 2024-03-11 18:11:22.000000000 +0200
+++ openvdb-10.0.1/debian/control 2025-01-09 14:39:36.000000000 +0200
@@ -1,14 +1,13 @@
Source: openvdb
Section: libs
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Uploaders: Mathieu Malaterre <malat@debian.org>
-Build-Depends: dpkg-dev (>= 1.22.5), bison (>= 3.0),
+Build-Depends: bison (>= 3.0),
cmake (>= 3.18),
debhelper (>= 13),
dh-python,
- dpkg-dev (>= 1.18.0),
+ dpkg-dev (>= 1.22.5),
flex (>= 2.6),
help2man,
libblosc-dev (>= 1.17.0),
@@ -32,7 +31,7 @@
libxrandr-dev,
libxxf86vm-dev,
libz-dev | zlib1g-dev (>= 1.2.7),
- llvm-14-dev [amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32],
+ llvm-14-dev [kfreebsd-i386],
pkg-config,
python3-dev (>= 3.7),
python3-numpy (>= 1.19.0)
@@ -66,7 +65,7 @@
Replaces: libopenvdb-ax10.0
Breaks: libopenvdb-ax10.0 (<< ${source:Version})
Multi-Arch: same
-Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
+Architecture: kfreebsd-i386
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Sparse Volume Processing toolkit - lib
@@ -96,7 +95,7 @@
This is the package for developping OpenVDB applications
Package: libopenvdb-ax-dev
-Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
+Architecture: kfreebsd-i386
Section: libdevel
Depends: libblosc-dev,
libimath-dev,
@@ -157,7 +156,7 @@
vdb_render and vdb_view.
Package: libopenvdb-ax-tools
-Architecture: amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
+Architecture: kfreebsd-i386
Section: utils
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Sparse Volume Processing toolkit - runtime
diff -Nru openvdb-10.0.1/debian/control.in openvdb-10.0.1/debian/control.in
--- openvdb-10.0.1/debian/control.in 2024-03-11 18:11:22.000000000 +0200
+++ openvdb-10.0.1/debian/control.in 2025-01-09 14:39:36.000000000 +0200
@@ -1,14 +1,13 @@
Source: openvdb
Section: libs
Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Uploaders: Mathieu Malaterre <malat@debian.org>
Build-Depends: bison (>= 3.0),
cmake (>= 3.18),
debhelper (>= 13),
dh-python,
- dpkg-dev (>= 1.18.0),
+ dpkg-dev (>= 1.22.5),
flex (>= 2.6),
help2man,
libblosc-dev (>= 1.17.0),
@@ -100,7 +99,7 @@
Section: libdevel
Depends: libblosc-dev,
libimath-dev,
- libopenvdb10.0t64 (= ${binary:Version}),
+ libopenvdb-ax10.0t64 (= ${binary:Version}),
libtbb-dev,
${misc:Depends}
Description: Sparse Volume Processing toolkit - dev
diff -Nru openvdb-10.0.1/debian/rules openvdb-10.0.1/debian/rules
--- openvdb-10.0.1/debian/rules 2025-01-08 17:06:37.000000000 +0200
+++ openvdb-10.0.1/debian/rules 2025-01-09 14:39:36.000000000 +0200
@@ -7,7 +7,8 @@
# OpenVDB AX is a beast to compile on some low mem arches such as mipsel (https://bugs.debian.org/1025144)
# Do not build AX on alpha & hppa since no LLVM
-AX_ARCHS=amd64 arm64 armel armhf i386 mips64el ppc64el s390x arc hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
+# Disabled until upstream supports recent LLVM (dead kfreebsd-i386 as placeholder)
+AX_ARCHS=kfreebsd-i386
ifneq (,$(filter $(DEB_HOST_ARCH), $(AX_ARCHS)))
WITH_AX=ON
else
Reply to: