- Update to release 20220807

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=46

0001-configure.ac-Accept-SDL-1.2.50.patch

@@ -1,28 +0,0 @@
-From e52565aa278d4662a3ed1e2ef413a8c6d1f09f0c Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Sun, 12 Jun 2022 19:56:16 +0200
-Subject: [PATCH] configure.ac: Accept SDL 1.2.50+
-
-1.2.50+ (currently 1.2.52) is the version returned by the SDL 1.2 compatibility library[1].
-
-1: https://github.com/libsdl-org/sdl12-compat
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 58bf2963..0e6b2eb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,7 +64,7 @@ AC_SUBST(SDL_CONFIG)
- if test "x$SDL_CONFIG" == "x"; then
-         AC_MSG_ERROR([*** sdl-config not found.])
- fi
--if $SDL_CONFIG --version | grep -qv 1.2.1; then
-+if $SDL_CONFIG --version | grep -qv '1.2.\[1-9\]'; then
-         AC_MSG_ERROR([*** SDL version >= 1.2.10 not found.])
- fi
- SDL_CFLAGS=$($SDL_CONFIG --cflags)
--- 
-2.36.1
-

20220506.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a537a8db2ec15f289946dbbb61b7509e3a72e10777de0f5fc7ca3591b36b238
-size 1310121

20220807.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4746b014dbecffdc80d370288d9c26235551183318ea326732f3925e5a5867ef
+size 1278129

schism-alsa.diff

@@ -38,11 +38,11 @@ option.
  schism/audio_playback.c |    7 +------
  1 file changed, 1 insertion(+), 6 deletions(-)
 
-Index: schismtracker-20170910/schism/audio_playback.c
+Index: schismtracker-20220807/schism/audio_playback.c
 ===================================================================
---- schismtracker-20170910.orig/schism/audio_playback.c
+--- schismtracker-20220807.orig/schism/audio_playback.c
-+++ schismtracker-20170910/schism/audio_playback.c
++++ schismtracker-20220807/schism/audio_playback.c
-@@ -1281,15 +1281,10 @@ static int _audio_open(const char *drive
+@@ -1295,15 +1295,10 @@ static int _audio_open(const char *drive
  	if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
  		return 0;
  
@@ -51,7 +51,7 @@ Index: schismtracker-20170910/schism/audio_playback.c
 -	is set. (see SDL_alsa_audio.c: http://tinyurl.com/ybf398f)
 -	If hw doesn't exist, so be it -- let this fail, we'll fall back to the dummy device, and the
 -	user can pick a more reasonable device later. */
- 	if (SDL_AudioDriverName(driver_name, sizeof(driver_name)) != NULL && !strcmp(driver_name, "alsa")) {
+ 	if ((driver_name = SDL_GetCurrentAudioDriver()) != NULL && !strcmp(driver_name, "alsa")) {
  		char *dev = getenv("AUDIODEV");
  		if (!dev || !*dev)
 -			put_env_var("AUDIODEV", "hw");

schismtracker.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Aug  7 11:43:55 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 20220807
+  * Use SDL2 instead of SDL1.2. This fixes various
+    platform-dependent issues with video code, adds support for
+    new audio drivers such as JACK, and removes the System
+    Configuration video driver choices in favor of video scaling
+    method selection.
+  * Fix multitrack mono audio export.
+  * Support ADPCM and stereo samples in XM files.
+- Drop 0001-configure.ac-Accept-SDL-1.2.50.patch
+
 -------------------------------------------------------------------
 Wed Jun 22 22:44:47 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 

schismtracker.spec

@@ -17,7 +17,7 @@
 
 
 Name:           schismtracker
-Version:        20220506
+Version:        20220807
 Release:        0
 Summary:        Music editor that matches the look and feel of Impulse Tracker
 License:        GPL-2.0-or-later
@@ -28,7 +28,6 @@ Source2:        %name.desktop
 Patch1:         schism-alsa.diff
 Patch2:         schism-nodate.diff
 Patch3:         schism-deptrack.diff
-Patch4:         0001-configure.ac-Accept-SDL-1.2.50.patch
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -37,7 +36,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  python3-base
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xv)