[Git][xorg-team/lib/libdrm][debian-unstable] Enable build libdrm-intel1 for riscv64
Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libdrm
Commits:
1f73f0ef by Bo YU at 2025-03-28T18:05:00+08:00
Enable build libdrm-intel1 for riscv64
- - - - -
3 changed files:
- debian/changelog
- debian/control
- debian/rules
Changes:
=
debian/changelog
=
@@ -1,3 +1,12 @@
+libdrm (2.4.124-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ [Han Gao]
+ * Enable build libdrm-intel1 for riscv64. (Closes: #1085314)
+
+ -- Bo YU Fri, 28 Mar 2025 18:04:14 +0800
+
libdrm (2.4.124-1) unstable; urgency=medium
* New upstream release.
=
debian/control
=
@@ -24,7 +24,7 @@ Section: libdevel
Architecture: linux-any hurd-any
Depends:
libdrm2 (= ${binary:Version}),
- libdrm-intel1 (= ${binary:Version}) [amd64 i386 hurd-i386 x32],
+ libdrm-intel1 (= ${binary:Version}) [amd64 i386 hurd-i386 x32 riscv64],
libdrm-radeon1 (= ${binary:Version}),
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-amdgpu1 (= ${binary:Version}),
@@ -104,7 +104,7 @@ Description: Userspace interface to kernel DRM services --
runtime
This is a udeb, or a microdeb, for the debian-installer.
Package: libdrm-intel1
-Architecture: amd64 arm64 i386 hurd-i386 x32
+Architecture: amd64 arm64 i386 hurd-i386 x32 riscv64
Depends:
${shlibs:Depends},
${misc:Depends},
=
debian/rules
=
@@ -32,8 +32,8 @@ else
NOUVEAU = no
endif
-# Intel is only on x86 and arm64:
-ifneq (,$(filter amd64 arm64 i386,$(DEB_HOST_ARCH_CPU)))
+# Intel is only on x86, arm64 and riscv64:
+ifneq (,$(filter amd64 arm64 i386 riscv64,$(DEB_HOST_ARCH_CPU)))
ifneq (,$(filter linux hurd,$(DEB_HOST_ARCH_OS)))
INTEL = yes
endif
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libdrm/-/commit/1f73f0ef2d3ff6040fa7e6ace6a4d7c99f5f704a
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libdrm/-/commit/1f73f0ef2d3ff6040fa7e6ace6a4d7c99f5f704a
You're receiving this email because of your account on salsa.debian.org.
[Git][xorg-team/lib/libxv][debian-unstable] control: Migrate to pkgconf.
Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxv Commits: fc98fd72 by Timo Aaltonen at 2025-03-28T23:15:52+02:00 control: Migrate to pkgconf. - - - - - 2 changed files: - debian/changelog - debian/control Changes: = debian/changelog = @@ -11,6 +11,7 @@ libxv (2:1.0.13-1) UNRELEASED; urgency=medium * control: Migrate to x11proto-dev. * New upstream release. * control: Migrate to debhelper-compat 13. + * control: Migrate to pkgconf. [ Debian Janitor ] * Remove constraints unnecessary since buster: = debian/control = @@ -8,7 +8,7 @@ Build-Depends: libx11-dev, libxext-dev, x11proto-dev, - pkg-config, + pkgconf, quilt, xutils-dev, Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libxv.git View it on GitLab: https://salsa.debian.org/xorg-team/lib/libxv/-/commit/fc98fd72ada7999ef6e8027954c28833b51e88d1 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libxv/-/commit/fc98fd72ada7999ef6e8027954c28833b51e88d1 You're receiving this email because of your account on salsa.debian.org.
[Git][xorg-team/lib/libdrm][debian-unstable] Add xf86drm-Handle-NULL-in-drmCopyVersion.patch
Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libdrm Commits: 90ad0a8b by Daniel van Vugt at 2025-03-28T16:56:17+08:00 Add xf86drm-Handle-NULL-in-drmCopyVersion.patch To avoid SIGSEGV when some kernel drivers leave strings NULL. https://bugs.launchpad.net/bugs/2104352 - - - - - 2 changed files: - debian/patches/series - + debian/patches/xf86drm-Handle-NULL-in-drmCopyVersion.patch Changes: = debian/patches/series = @@ -1,2 +1,3 @@ 01_default_perms.diff amdgpu-add-env-support-for-amdgpu-ids.patch +xf86drm-Handle-NULL-in-drmCopyVersion.patch = debian/patches/xf86drm-Handle-NULL-in-drmCopyVersion.patch = @@ -0,0 +1,34 @@ +From: Daniel van Vugt +Date: Thu, 27 Mar 2025 17:41:37 +0800 +Subject: xf86drm: Handle NULL in drmCopyVersion + +Just as it is already handled in the caller, `drmGetVersion`. + +I'm not sure what the offending driver is, but the Ubuntu incidents +seem to be coming from a dual Intel/Nvidia machine. And they show +it is `card1` so I'm guessing `nvidia-drm` is the offender. + +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2104352 +--- + xf86drm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xf86drm.c b/xf86drm.c +index 6ca5626..b5db577 100644 +--- a/xf86drm.c b/xf86drm.c +@@ -1343,11 +1343,11 @@ static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s) + d->version_minor = s->version_minor; + d->version_patchlevel = s->version_patchlevel; + d->name_len = s->name_len; +-d->name = strdup(s->name); ++d->name = s->name ? strdup(s->name) : NULL; + d->date_len = s->date_len; +-d->date = strdup(s->date); ++d->date = s->date ? strdup(s->date) : NULL; + d->desc_len = s->desc_len; +-d->desc = strdup(s->desc); ++d->desc = s->desc ? strdup(s->desc) : NULL; + } + + View it on GitLab: https://salsa.debian.org/xorg-team/lib/libdrm/-/commit/90ad0a8bf3d14d459903eb65d4ffe3fb9ceadbcc -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libdrm/-/commit/90ad0a8bf3d14d459903eb65d4ffe3fb9ceadbcc You're receiving this email because of your account on salsa.debian.org.
