Your message dated Sat, 31 Aug 2024 11:57:07 +0000
with message-id <[email protected]>
and subject line Bug#1018008: fixed in libvdpau-va-gl 0.4.2-2
has caused the Debian Bug report #1018008,
regarding libvdpau-va-gl FTCBFS: fails running shader-bundle-tool
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1018008: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018008
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libvdpau-va-gl
Version: 0.4.2-1
Tags: patch
User: [email protected]
Usertags: ftcbfs
libvdpau-va-gl fails to cross build from source, because it fails
running shader-bundle-tool. Other distributions have already recognized
that this build-time tool is not architecture-dependent and should be
built for the build architecture (e.g. voidlinux and oe). Doing so is
close to impossible with CMake (because it doesn't have a notion of
build architecture), so this patch allows providing the tool externally
and makes the Debian package construct it beforehand. The upstream
changes should be upstreamable (and improving the situation at voidlinux
and oe). Please consider applying the whole patch.
Helmut
diff --minimal -Nru libvdpau-va-gl-0.4.2/debian/changelog
libvdpau-va-gl-0.4.2/debian/changelog
--- libvdpau-va-gl-0.4.2/debian/changelog 2016-10-07 10:56:46.000000000
+0200
+++ libvdpau-va-gl-0.4.2/debian/changelog 2022-08-22 20:37:27.000000000
+0200
@@ -1,3 +1,11 @@
+libvdpau-va-gl (0.4.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Build shader-bundle-tool with the build architecture
+ compiler. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]> Mon, 22 Aug 2022 20:37:27 +0200
+
libvdpau-va-gl (0.4.2-1) unstable; urgency=medium
* New upstream release.
diff --minimal -Nru libvdpau-va-gl-0.4.2/debian/clean
libvdpau-va-gl-0.4.2/debian/clean
--- libvdpau-va-gl-0.4.2/debian/clean 1970-01-01 01:00:00.000000000 +0100
+++ libvdpau-va-gl-0.4.2/debian/clean 2022-08-22 20:37:25.000000000 +0200
@@ -0,0 +1 @@
+debian/shader-bundle-tool
diff --minimal -Nru libvdpau-va-gl-0.4.2/debian/patches/cross.patch
libvdpau-va-gl-0.4.2/debian/patches/cross.patch
--- libvdpau-va-gl-0.4.2/debian/patches/cross.patch 1970-01-01
01:00:00.000000000 +0100
+++ libvdpau-va-gl-0.4.2/debian/patches/cross.patch 2022-08-22
20:37:27.000000000 +0200
@@ -0,0 +1,24 @@
+--- libvdpau-va-gl-0.4.2.orig/glsl/CMakeLists.txt
++++ libvdpau-va-gl-0.4.2/glsl/CMakeLists.txt
+@@ -10,13 +10,19 @@
+ list(APPEND shader_list ${CMAKE_CURRENT_SOURCE_DIR}/${item})
+ endforeach(item)
+
++if(SHADER_BUNDLE_TOOL_EXECUTABLE)
++ add_executable(shader-bundle-tool IMPORTED)
++ set_target_properties(shader-bundle-tool PROPERTIES IMPORTED_LOCATION
"${SHADER_BUNDLE_TOOL_EXECUTABLE}")
++else()
++ add_executable(shader-bundle-tool shader-bundle-tool.cc)
++endif()
++
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/shaders.c
${CMAKE_CURRENT_BINARY_DIR}/shaders.h
+- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/shader-bundle-tool
${CMAKE_CURRENT_BINARY_DIR}/shaders.h ${CMAKE_CURRENT_BINARY_DIR}/shaders.c
${shader_list}
++ COMMAND shader-bundle-tool ${CMAKE_CURRENT_BINARY_DIR}/shaders.h
${CMAKE_CURRENT_BINARY_DIR}/shaders.c ${shader_list}
+ DEPENDS ${shader_list} shader-bundle-tool
+ )
+ add_custom_target(shader-bundle-src DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/shaders.c ${CMAKE_CURRENT_BINARY_DIR}/shaders.h)
+
+-add_executable(shader-bundle-tool shader-bundle-tool.cc)
+ add_library(shader-bundle STATIC ${CMAKE_CURRENT_BINARY_DIR}/shaders.c)
+ add_dependencies(shader-bundle shader-bundle-src)
diff --minimal -Nru libvdpau-va-gl-0.4.2/debian/patches/series
libvdpau-va-gl-0.4.2/debian/patches/series
--- libvdpau-va-gl-0.4.2/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ libvdpau-va-gl-0.4.2/debian/patches/series 2022-08-22 20:30:59.000000000
+0200
@@ -0,0 +1 @@
+cross.patch
diff --minimal -Nru libvdpau-va-gl-0.4.2/debian/rules
libvdpau-va-gl-0.4.2/debian/rules
--- libvdpau-va-gl-0.4.2/debian/rules 2016-10-07 10:56:46.000000000 +0200
+++ libvdpau-va-gl-0.4.2/debian/rules 2022-08-22 20:37:27.000000000 +0200
@@ -1,12 +1,19 @@
#!/usr/bin/make -f
# -*- makefile -*-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildtools.mk
export DEB_CPPFLAGS_MAINT_APPEND = -DNDEBUG
%:
dh $@
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+override_dh_auto_configure:
+ $(CXX_FOR_BUILD) glsl/shader-bundle-tool.cc -o debian/shader-bundle-tool
+ dh_auto_configure --
-DSHADER_BUNDLE_TOOL_EXECUTABLE=$(CURDIR)/debian/shader-bundle-tool
+endif
+
override_dh_auto_test:
# Cannot run tests without a X11 server (with VAAPI support)
--- End Message ---
--- Begin Message ---
Source: libvdpau-va-gl
Source-Version: 0.4.2-2
Done: Vincent Bernat <[email protected]>
We believe that the bug you reported is fixed in the latest version of
libvdpau-va-gl, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Vincent Bernat <[email protected]> (supplier of updated libvdpau-va-gl package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 24 Aug 2022 07:39:09 +0200
Source: libvdpau-va-gl
Architecture: source
Version: 0.4.2-2
Distribution: unstable
Urgency: medium
Maintainer: Vincent Bernat <[email protected]>
Changed-By: Vincent Bernat <[email protected]>
Closes: 1018008
Changes:
libvdpau-va-gl (0.4.2-2) unstable; urgency=medium
.
[ Jelmer Vernooij ]
* Migrate repository from alioth to salsa.
.
[ Helmut Grohne ]
* Fix FTCBFS: Build shader-bundle-tool with the build architecture
compiler. (Closes: #1018008)
Checksums-Sha1:
7ebd5eca3a7af029d69a7f95f35ec0e4c2e93e09 2019 libvdpau-va-gl_0.4.2-2.dsc
12ca4cc5309ebc4ccb5a92d401cb6ea9c3df3054 117912
libvdpau-va-gl_0.4.2.orig.tar.gz
184c8d3b85c810772c30ee8c8f101ecca6de2ac7 3520
libvdpau-va-gl_0.4.2-2.debian.tar.xz
c6d52390f60a1c897598ac38de00bf5a039b7c85 11901
libvdpau-va-gl_0.4.2-2_amd64.buildinfo
Checksums-Sha256:
0138345c68958dfc67772a4d0f7a8285b157ef81b6489a7b650fa3506e8ee71c 2019
libvdpau-va-gl_0.4.2-2.dsc
8ba4998c89e143495a5b9fb2795c518c25b94cf9ca9626fc9680afd26ef1e3fa 117912
libvdpau-va-gl_0.4.2.orig.tar.gz
836349e768dbfa42775c7c4ed07d56c1a6dbf945cd4a61383ccffb20b6d91086 3520
libvdpau-va-gl_0.4.2-2.debian.tar.xz
74ca06b1c560924e894b2d60a045697617f0cc2755fbd3653b76769ed37bc41d 11901
libvdpau-va-gl_0.4.2-2_amd64.buildinfo
Files:
5dda5ac576dfd614f8c32f08b9a8ed9c 2019 libs optional libvdpau-va-gl_0.4.2-2.dsc
da6653b5d86bfa18e2b19a909d292b68 117912 libs optional
libvdpau-va-gl_0.4.2.orig.tar.gz
dd86373580937421165ce046cc9c7331 3520 libs optional
libvdpau-va-gl_0.4.2-2.debian.tar.xz
28367cfc6e5dd8564cd3e9c3ba9669ae 11901 libs optional
libvdpau-va-gl_0.4.2-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJGBAEBCAAwFiEErvI0h2bzccaJpzYAlaQv6DU1JfkFAmbS2VUSHGJlcm5hdEBk
ZWJpYW4ub3JnAAoJEJWkL+g1NSX5lekP/i/ImaZ6shQHy5hob6/8y45y7+1crQQJ
oAPUkD2z50LthDP1QMqGNI3zXBmeUESYqEGu+XdBtKLXmFcNXtjFbLPvacdp5mYj
IgzX3zUzvwrBASbkCUVfwq/cTb99/8H9BHTj3CR8UtoUfeD0977Kb4U/qx5D1iv8
PcGG44BcQ1Vq8D6bhJVfEWDC1W/6AMUsJatooT7St3eSBp4Ok8Rcs6tZqtAtPyvC
E+xwqZ4YaC6FwsWpFdStWSohCth5CJNOW9YkdTRG4t1NdKeGou2dtL1Xz4YQN2eA
K4L44c7+SCLnUHwboF94OZ36AiyG+N/8AaSE0H+vqgEgEJWFKWmdHW/EvI7f+k1G
JRDcPtBHPhH4kni0HK2kRI/hfdG0HOqtZt33oxg18vw1TyO23cTAup2yEO378Gl+
Lj1aFyxJX98Ec52dOibwpOgdgmK9o8rAsfQMF2tMg9wnlw3R+orsob2KgZ5TTY4B
my+8mdphU/TBl52eaeJ3c2lU8Y5kazgYdX1elifJDZrql12dAgZf0u3s+eEG0ULL
hkm3QSz/pY/aqaBpfxfMYyJRq4Lka9R3+DCcsW9KuxKxfH8mYZX5BqwpQ+GmnxHQ
TRGEhEy1FU49BABOueZ9AYPRV3OeRKdEu0ePTJ3CMjLGjErUSheZ0AlOVfirC5Ag
SR2eKGt993Xv
=tJeI
-----END PGP SIGNATURE-----
pgp6gIc24ez8m.pgp
Description: PGP signature
--- End Message ---
