[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#878668: stretch-pu: package simutrans/120.1.3+repack-3



Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

Hello,

I would like to fix Debian bug #869029 [1] in Stretch. It is currently
not possible to enable sound for simutrans which was not intended.

The solution for Stretch differs from Buster/Sid. In Stretch the
0500-config.diff patch is applied but the configuration options are
overwritten during the auto-reconfiguration step. There are multiple
ways to correct this issue and I opted for patching configure.ac
directly. I simply changed the backend from SDL to mixer_sdl and now
the sound is working again.

Please find attached the debdiff for Stretch. Jessie is not affected.

Regards,

Markus

[1] https://bugs.debian.org/869029
diff -Nru simutrans-120.1.3+repack/debian/changelog simutrans-120.1.3+repack/debian/changelog
--- simutrans-120.1.3+repack/debian/changelog	2016-11-17 11:03:50.000000000 +0100
+++ simutrans-120.1.3+repack/debian/changelog	2017-10-15 01:03:51.000000000 +0200
@@ -1,3 +1,11 @@
+simutrans (120.1.3+repack-3+deb9u1) stretch; urgency=medium
+
+  * Team upload.
+  * Enable sound for simutrans again. Switch from SDL to mixer_sdl backend.
+    (Closes: #869029)
+
+ -- Markus Koschany <apo@debian.org>  Sun, 15 Oct 2017 01:03:51 +0200
+
 simutrans (120.1.3+repack-3) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff -Nru simutrans-120.1.3+repack/debian/patches/mixer-sdl.patch simutrans-120.1.3+repack/debian/patches/mixer-sdl.patch
--- simutrans-120.1.3+repack/debian/patches/mixer-sdl.patch	1970-01-01 01:00:00.000000000 +0100
+++ simutrans-120.1.3+repack/debian/patches/mixer-sdl.patch	2017-10-15 01:03:51.000000000 +0200
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo@debian.org>
+Date: Sun, 15 Oct 2017 01:02:45 +0200
+Subject: mixer sdl
+
+Enable sound for simutrans.
+
+Bug-Debian: https://bugs.debian.org/869029
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 05a2143..f447a3f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,9 +74,9 @@ then
+ 	AC_MSG_WARN([Using SDL2 backend!])
+ elif test "$ac_cv_lib_SDL_SDL_Init" == yes
+ then
+-	AC_SUBST(backend, sdl)
++	AC_SUBST(backend, mixer_sdl)
+ 	AC_SUBST(color, 16)
+-	AC_MSG_WARN([Using SDL backend!])
++	AC_MSG_WARN([Using Mixer SDL backend!])
+ elif test "$ac_cv_lib_allegro_get_desktop_resolution" == yes
+ then
+ 	AC_SUBST(backend, allegro)
diff -Nru simutrans-120.1.3+repack/debian/patches/series simutrans-120.1.3+repack/debian/patches/series
--- simutrans-120.1.3+repack/debian/patches/series	2016-11-17 11:03:50.000000000 +0100
+++ simutrans-120.1.3+repack/debian/patches/series	2017-10-15 01:03:51.000000000 +0200
@@ -6,3 +6,4 @@
 #0510-missing_uncommon_mk.patch
 reproducible-build.patch
 sha1.patch
+mixer-sdl.patch

Reply to: