From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Fri, 25 Feb 2022 15:40:57 +0000 (+0100)
Subject: - patch from Gentoo
X-Git-Tag: auto/th/bb-1.3rc1-11
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fheads%2Fmaster;p=packages%2Fbb.git

- patch from Gentoo
- rel 11
---

diff --git a/bb-1.3.0_rc1-disable-pulse.patch b/bb-1.3.0_rc1-disable-pulse.patch
new file mode 100644
index 0000000..3d78891
--- /dev/null
+++ b/bb-1.3.0_rc1-disable-pulse.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/516964
+--- a/main.c
++++ b/main.c
+@@ -160,6 +160,17 @@ main (int argc, char *argv[])
+   aa_flush (context);
+   if (tolower (aa_getkey (context, 1)) != 'n')
+     {
++      /* Unfortunately recently added native pulseaudio
++       * driver in libmikmod does not allow you to
++       * call 'MikMod_Update' in a non-blocking way.
++       *
++       * It's a known limitation of simple pulseaudio API
++       * thus we derevisted pulseaudio driver to fallback
++       * on alsa, oss or whatever used to work for user.
++       */
++      drv_pulseaudio.Name    = NULL;
++      drv_pulseaudio.Version = NULL;
++
+       MikMod_RegisterAllDrivers ();
+       MikMod_RegisterLoader (&load_s3m);
+       /*md_mode |= DMODE_SOFT_MUSIC; */
diff --git a/bb.spec b/bb.spec
index d055ecf..64ed30a 100644
--- a/bb.spec
+++ b/bb.spec
@@ -2,7 +2,7 @@ Summary:	BB - the portable demo
 Summary(pl.UTF-8):	BB - przenośne demo
 Name:		bb
 Version:	1.3rc1
-Release:	10
+Release:	11
 License:	GPL
 Group:		Applications/Terminal
 Source0:	http://dl.sourceforge.net/aa-project/%{name}-%{version}.tar.gz
@@ -10,7 +10,7 @@ Source0:	http://dl.sourceforge.net/aa-project/%{name}-%{version}.tar.gz
 Patch0:		%{name}-typos.patch
 Patch1:		%{name}-regparm.patch
 Patch2:		segv64.patch
-Patch3:		pulse.patch
+Patch3:		bb-1.3.0_rc1-disable-pulse.patch
 URL:		http://aa-project.sourceforge.net/bb/
 BuildRequires:	aalib-devel >= 1.4
 BuildRequires:	autoconf
diff --git a/pulse.patch b/pulse.patch
deleted file mode 100644
index ae033ce..0000000
--- a/pulse.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bb-1.3.0/timers.c.pulse	2017-06-30 21:37:27.711687696 +0200
-+++ bb-1.3.0/timers.c	2017-06-30 21:46:36.218568976 +0200
-@@ -483,14 +483,17 @@ tl_process_group (tl_group * group, int
- 	      int time = timer->interval - tl_lookup_timer (timer);
- 	      if (time <= 0)
- 		{
-+		  int n;
- 		  if (activated != NULL)
- 		    (*activated)++;
- 		  again = 1;
- 		  tl_reset_timer (timer);
- 		  if (time < -200 * 1000000)
- 		    time = 0;	/*underflow? */
--		  tl_slowdown_timer (timer, time);
--		  time = timer->interval + time;
-+		  n = -(time) / timer->interval + 1;
-+		  time += timer->interval * n;
-+
-+		  tl_slowdown_timer (timer, time - timer->interval);
- 		  timer->handler (timer->userdata);
- 		  tl_update_time ();
- 		}