From 2ee83992a1065b411613ce3b7c03cf17f43c161c5c29cca4aa325d8e5c3b1128 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 25 May 2024 09:40:20 +0000
Subject: [PATCH] - Update to release 20240523

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=75
---
 ...for-Instrument-Mode-when-handling-No.patch | 27 -------------------
 schismtracker-20240515.source.tar.gz          |  3 ---
 schismtracker-20240523.tar.gz                 |  3 +++
 schismtracker.changes                         |  8 ++++++
 schismtracker.spec                            |  9 ++++---
 5 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch
 delete mode 100644 schismtracker-20240515.source.tar.gz
 create mode 100644 schismtracker-20240523.tar.gz

diff --git a/0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch b/0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch
deleted file mode 100644
index bc7b8e6..0000000
--- a/0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 943993a1c038c43dd9c3c326fe9f981eeb6c4fcf Mon Sep 17 00:00:00 2001
-From: Paper <paper@paper.us.eu.org>
-Date: Thu, 16 May 2024 22:23:16 -0400
-Subject: [PATCH] player/fx: check for Instrument Mode when handling
- NoMapEffects.it
-
-Fixes #437. Simple fix, annoying though :)
----
- player/effects.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/player/effects.c b/player/effects.c
-index 814fff29..31c5239e 100644
---- a/player/effects.c
-+++ b/player/effects.c
-@@ -2153,7 +2153,7 @@ void csf_process_effects(song_t *csf, int firsttick)
- 		// This is probably the single biggest WTF replayer bug in Impulse Tracker.
- 		// In instrument mode, when an note + instrument is triggered that does not map to any sample, the entire cell (including potentially present global effects!)
- 		// is ignored. Even better, if on a following row another instrument number (this time without a note) is encountered, we end up in the same situation!
--		if (instr > 0 && instr < MAX_INSTRUMENTS && csf->instruments[instr] != NULL)
-+		if (csf->flags & SONG_INSTRUMENTMODE && instr > 0 && instr < MAX_INSTRUMENTS && csf->instruments[instr] != NULL)
- 		{
- 			uint8_t note = (chan->row_note != NOTE_NONE) ? chan->row_note : chan->new_note;
- 			if (NOTE_IS_NOTE(note) && csf->instruments[instr]->sample_map[note - NOTE_FIRST] == 0)
--- 
-2.45.0
-
diff --git a/schismtracker-20240515.source.tar.gz b/schismtracker-20240515.source.tar.gz
deleted file mode 100644
index 5bf27d6..0000000
--- a/schismtracker-20240515.source.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac4a320b8cf4cb5ec44b8f384df2276d053791fb5161b974008c6867c84da3f9
-size 1178544
diff --git a/schismtracker-20240523.tar.gz b/schismtracker-20240523.tar.gz
new file mode 100644
index 0000000..ce6fc00
--- /dev/null
+++ b/schismtracker-20240523.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44b3de30ad0c72c540f60cfdfe4f3906c5756023fd17e23a0977646d425d0863
+size 1183711
diff --git a/schismtracker.changes b/schismtracker.changes
index bb3b00a..662c98d 100644
--- a/schismtracker.changes
+++ b/schismtracker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat May 25 09:10:32 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 20240523
+  * Fix an issue where F4 would silence all samples when in sample mode
+- Remove 0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch
+  (merged)
+
 -------------------------------------------------------------------
 Fri May 17 05:57:18 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/schismtracker.spec b/schismtracker.spec
index fcecf7b..1070cdc 100644
--- a/schismtracker.spec
+++ b/schismtracker.spec
@@ -17,18 +17,21 @@
 
 
 Name:           schismtracker
-Version:        20240515
+Version:        20240523
 Release:        0
 Summary:        Music editor that matches the look and feel of Impulse Tracker
 License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
 URL:            http://schismtracker.org/
-Source:         https://github.com/schismtracker/schismtracker/releases/download/%version/%name-%version.source.tar.gz
+Source:         %name-%version.tar.gz
+# Pointless double-packing this time; sources are in
+# schismtracker-20240523.tar.gz which is (only) in
+# schismtracker-20240523.source.zip.
+#Source:         https://github.com/schismtracker/schismtracker/releases/download/%version/%name-%version.source.tar.gz
 Source2:        %name.desktop
 Patch1:         schism-alsa.diff
 Patch2:         schism-nodate.diff
 Patch3:         schism-deptrack.diff
-Patch4:         0001-player-fx-check-for-Instrument-Mode-when-handling-No.patch
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  automake