Source: dsda-doom
Version: 0.25.6+dfsg-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

dsda-doom fails to cross build from source, because the upstream build
system requires a native build pass to build native tools, which are
imported via an import file into the cross build. This native pass has
not been implemented in the Debian package yet. I'm attaching a patch
for your convenience.

Helmut
diff --minimal -Nru dsda-doom-0.25.6+dfsg/debian/changelog 
dsda-doom-0.25.6+dfsg/debian/changelog
--- dsda-doom-0.25.6+dfsg/debian/changelog      2023-01-31 07:51:06.000000000 
+0100
+++ dsda-doom-0.25.6+dfsg/debian/changelog      2023-02-10 18:06:35.000000000 
+0100
@@ -1,3 +1,10 @@
+dsda-doom (0.25.6+dfsg-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add a native build pass. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 10 Feb 2023 18:06:35 +0100
+
 dsda-doom (0.25.6+dfsg-1) unstable; urgency=medium
 
   * New upstream version 0.25.6+dfsg.
diff --minimal -Nru dsda-doom-0.25.6+dfsg/debian/clean 
dsda-doom-0.25.6+dfsg/debian/clean
--- dsda-doom-0.25.6+dfsg/debian/clean  1970-01-01 01:00:00.000000000 +0100
+++ dsda-doom-0.25.6+dfsg/debian/clean  2023-02-10 18:06:33.000000000 +0100
@@ -0,0 +1 @@
+build-native
diff --minimal -Nru dsda-doom-0.25.6+dfsg/debian/control 
dsda-doom-0.25.6+dfsg/debian/control
--- dsda-doom-0.25.6+dfsg/debian/control        2022-12-31 12:39:03.000000000 
+0100
+++ dsda-doom-0.25.6+dfsg/debian/control        2023-02-10 18:06:35.000000000 
+0100
@@ -12,12 +12,16 @@
  libdumb1-dev,
  libfluidsynth-dev,
  libgl1-mesa-dev | libgl-dev,
+ libgl1-mesa-dev:native | libgl-dev:native,
  libglu1-mesa-dev | libglu-dev,
+ libglu1-mesa-dev:native | libglu-dev:native,
  libmad0-dev,
  libportmidi-dev [linux-any],
  libsdl2-dev (>= 2.0.7),
+ libsdl2-dev:native (>= 2.0.7),
  libsdl2-image-dev,
  libsdl2-mixer-dev,
+ libsdl2-mixer-dev:native,
  libsdl2-net-dev,
  libvorbis-dev
 Standards-Version: 4.6.1
diff --minimal -Nru dsda-doom-0.25.6+dfsg/debian/rules 
dsda-doom-0.25.6+dfsg/debian/rules
--- dsda-doom-0.25.6+dfsg/debian/rules  2022-12-31 12:49:58.000000000 +0100
+++ dsda-doom-0.25.6+dfsg/debian/rules  2023-02-10 18:06:35.000000000 +0100
@@ -10,12 +10,17 @@
                --with bash_completion
 
 override_dh_auto_configure:
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+       dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure 
-Bbuild-native
+       dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_build -Bbuild-native
+endif
        dh_auto_configure -- \
                -DCMAKE_INSTALL_BINDIR=games \
-               -DDSDAPWADDIR=/usr/share/dsda-doom
+               -DDSDAPWADDIR=/usr/share/dsda-doom \
+               $(if $(filter 
$(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)),,-DIMPORT_EXECUTABLES=../build-native/ImportExecutables.cmake)
 
 override_dh_installchangelogs:
-       dh_installchangelogs -- patch_notes/v$(basename 
$(DEB_VERSION_UPSTREAM_REVISION))*
+       dh_installchangelogs -- patch_notes/v$(basename 
$(DEB_VERSION_UPSTREAM))*
 
 override_dh_gencontrol:
        dh_gencontrol -pprboom-plus             -- 
-v3:$(DEB_VERSION_UPSTREAM_REVISION)

Reply via email to