diff --git a/20240614.tar.gz b/20240614.tar.gz deleted file mode 100644 index 942129b..0000000 --- a/20240614.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91200e61f7b5a5c1193ca491e2ea9cd5fd74f2462e5af88a7e8d9e7c115481ac -size 1077018 diff --git a/20240630.tar.gz b/20240630.tar.gz new file mode 100644 index 0000000..92e3682 --- /dev/null +++ b/20240630.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55822248685eb6f3d99f95536a93969198eae92dda41cbde7f39fa1384bc758a +size 1082397 diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..305d0ac --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1719762585 +commit: c854a2cdaf12bff585c1527c928864c3033ce55c49044dcc784a97c60e670a98 +url: https://src.opensuse.org/jengelh/schismtracker +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..a85b724 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c90ed39479f8978993c5c48b8bc27abd9a0305178b91ffb5116ab230073e5f6 +size 256 diff --git a/compile.diff b/compile.diff deleted file mode 100644 index 7cd9c3b..0000000 --- a/compile.diff +++ /dev/null @@ -1,31 +0,0 @@ -From eed0cd370d7f60b84d85ce7ba64a9fd688eb2665 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 20 Jun 2024 12:09:24 +0200 -Subject: [PATCH] build: workaround pedantic requirements -References: https://github.com/schismtracker/schismtracker/pull/472 - -Yeah yeah, schism_exit isn't supposed to return, but short of adding a non-portable -__attribute__((noreturn)), let's just add a return to make the compiler happy. - -schism/audio_playback.c: In function "_audio_init_head": -schism/audio_playback.c:1510:1: error: control reaches end of -non-void function [-Werror=return-type] - 1510 | } ---- - schism/audio_playback.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/schism/audio_playback.c b/schism/audio_playback.c -index 2c671826..58fd0f28 100644 ---- a/schism/audio_playback.c -+++ b/schism/audio_playback.c -@@ -1507,6 +1507,7 @@ fail: - const char* err = SDL_GetError(); - if (err) fprintf(stderr, "%s\n", err); - schism_exit(1); -+ return 0; - } - - // Set up audio_buffer, reset the sample count, and kick off the mixer --- -2.45.2 diff --git a/schism-deptrack.diff b/schism-deptrack.diff deleted file mode 100644 index 6343a0b..0000000 --- a/schism-deptrack.diff +++ /dev/null @@ -1,37 +0,0 @@ -From: Jan Engelhardt - -There are some manual commands which create dependency files, and -they do fail if they concurrently try to create the directory -(because it does something like test -e auto || mkdir auto, rather -than checking just the return value of mkdir for EISDIR.) - -Anyway, create the directory beforehand. ---- - Makefile.am | 1 + - configure.ac | 1 + - 2 files changed, 2 insertions(+) - -Index: schismtracker-20240609/Makefile.am -=================================================================== ---- schismtracker-20240609.orig/Makefile.am -+++ schismtracker-20240609/Makefile.am -@@ -149,6 +149,7 @@ CLEANFILES = \ - auto/helptext.c - - auto/default-font.c: Makefile.am scripts/bin2h.sh scripts/build-font.sh $(fonts) -+ ${MKDIR_P} auto - sh $(srcdir)/scripts/build-font.sh $(srcdir) $(fonts) >$@ - - auto/helptext.c: Makefile.am scripts/genhelp.pl $(helptexts) -Index: schismtracker-20240609/configure.ac -=================================================================== ---- schismtracker-20240609.orig/configure.ac -+++ schismtracker-20240609/configure.ac -@@ -111,6 +111,7 @@ AM_PROG_CC_C_O - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S -+AC_PROG_MKDIR_P - - dnl do we have Git - AC_CHECK_TOOL([GIT], [git]) diff --git a/schismtracker.changes b/schismtracker.changes index 829fc92..fe31694 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jun 30 15:48:11 UTC 2024 - Jan Engelhardt + +- Update to release 20240630 + * Add DSM format loader (thanks @RepellantMold) + * Fix a crash upon loading some IT modules made in Modplug and + its derivatives +- Delete schism-deptrack.diff (merged) + ------------------------------------------------------------------- Sat Jun 15 12:56:29 UTC 2024 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index 67b42c0..de7eaf8 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -17,7 +17,7 @@ Name: schismtracker -Version: 20240614 +Version: 20240630 Release: 0 Summary: Music editor that matches the look and feel of Impulse Tracker License: GPL-2.0-or-later @@ -26,9 +26,7 @@ URL: http://schismtracker.org/ Source: https://github.com/schismtracker/schismtracker/archive/refs/tags/%version.tar.gz #Source: https://github.com/schismtracker/schismtracker/releases/download/%version/%name-%version.source.tar.gz Source2: %name.desktop -Patch1: compile.diff Patch2: schism-nodate.diff -Patch3: schism-deptrack.diff BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake