From 146074f83f58f1483c04a5c05030cd162c16f809ac8577816eaf0dda4a029a30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Dec 2024 01:28:55 +0100 Subject: [PATCH] schismtracker 20241226 --- ...-build-resolve-Wreturn-type-warnings.patch | 87 ------------------- 20241021.tar.gz | 3 - 20241226.tar.gz | 3 + schism-nodate.diff | 10 +-- schismtracker.changes | 22 +++++ schismtracker.spec | 3 +- 6 files changed, 31 insertions(+), 97 deletions(-) delete mode 100644 0001-build-resolve-Wreturn-type-warnings.patch delete mode 100644 20241021.tar.gz create mode 100644 20241226.tar.gz diff --git a/0001-build-resolve-Wreturn-type-warnings.patch b/0001-build-resolve-Wreturn-type-warnings.patch deleted file mode 100644 index 44fd25d..0000000 --- a/0001-build-resolve-Wreturn-type-warnings.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b2528fd86f492e973fe60394cb89c12bdb7254b7 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 21 Oct 2024 20:19:51 +0200 -Subject: [PATCH] build: resolve -Wreturn-type warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Functions without return can produce unpredictable behavior, -and it goes without saying that is bad. -openSUSE has added -Werror=return-type distro-wide, so it is -perhaps fair to do the same here. - -fmt/iti.c: In function ‘load_it_instrument_old’: -fmt/iti.c:157:1: error: control reaches end of non-void function [-Werror=return-type] -fmt/iti.c: In function ‘load_it_instrument’: -fmt/iti.c:207:1: error: control reaches end of non-void function [-Werror=return-type] - -on Wii platform, there are some more: - -../schism/controller.c: In function 'game_controller_insert': -../schism/controller.c:50:1: error: no return statement in function returning non-void [-Werror=return-type] -../schism/controller.c: In function 'controller_quit': -../schism/controller.c:112:1: error: control reaches end of non-void function [-Werror=return-type] ---- - Makefile.am | 2 +- - fmt/iti.c | 2 ++ - schism/controller.c | 3 ++- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index b2a0e990..78e238c1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -444,7 +444,7 @@ schismtracker_SOURCES = \ - schism/version.$(OBJEXT): $(filter-out schism/version.$(OBJEXT),$(schismtracker_OBJECTS)) $(HEADERS) - - schismtracker_CPPFLAGS = -I$(srcdir)/include -I. $(cppflags_wii) $(cppflags_wiiu) --schismtracker_CFLAGS = $(SDL_CFLAGS) $(cflags_alsa) $(cflags_oss) \ -+schismtracker_CFLAGS = -Werror=return-type $(SDL_CFLAGS) $(cflags_alsa) $(cflags_oss) \ - $(cflags_network) $(cflags_x11) $(cflags_fmopl) \ - $(cflags_version) $(cflags_win32) $(cflags_wii) \ - $(cflags_macosx) $(cflags_flac) $(cflags_jack) \ -diff --git a/fmt/iti.c b/fmt/iti.c -index 386a0de1..c2222dcf 100644 ---- a/fmt/iti.c -+++ b/fmt/iti.c -@@ -154,6 +154,7 @@ int load_it_instrument_old(song_instrument_t *instrument, slurp_t *fp) - instrument->vol_env.ticks[n] = node; - instrument->vol_env.values[n] = ihdr.nodes[2 * n + 1]; - } -+ return 1; - } - - int load_it_instrument(song_instrument_t *instrument, slurp_t *fp) -@@ -204,6 +205,7 @@ int load_it_instrument(song_instrument_t *instrument, slurp_t *fp) - instrument->flags |= load_it_envelope(&instrument->vol_env, &ihdr.volenv, 0, 0); - instrument->flags |= load_it_envelope(&instrument->pan_env, &ihdr.panenv, 1, 32); - instrument->flags |= load_it_envelope(&instrument->pitch_env, &ihdr.pitchenv, 2, 32); -+ return 1; - } - - int fmt_iti_load_instrument(slurp_t *fp, int slot) -diff --git a/schism/controller.c b/schism/controller.c -index 9af01479..d96a609d 100644 ---- a/schism/controller.c -+++ b/schism/controller.c -@@ -40,7 +40,7 @@ struct controller_node { - - static struct controller_node *game_controller_list = NULL; - --static int game_controller_insert(SDL_GameController *controller) -+static void game_controller_insert(SDL_GameController *controller) - { - struct controller_node *node = mem_alloc(sizeof(*node)); - -@@ -109,6 +109,7 @@ int controller_quit(void) - { - game_controller_free(); - SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER); -+ return 1; - } - - int controller_sdlevent(SDL_Event *event) --- -2.47.0 - diff --git a/20241021.tar.gz b/20241021.tar.gz deleted file mode 100644 index c57c371..0000000 --- a/20241021.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9615aeb37a29867306b92008c4579be185871ac0156009ce64be406b777b8f5d -size 1081219 diff --git a/20241226.tar.gz b/20241226.tar.gz new file mode 100644 index 0000000..223594e --- /dev/null +++ b/20241226.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32b9e5f3cab7648c89b23449fb7ca2ab77abd9e67e120ced70770710b1e06a58 +size 1187056 diff --git a/schism-nodate.diff b/schism-nodate.diff index c6d349a..3792bbd 100644 --- a/schism-nodate.diff +++ b/schism-nodate.diff @@ -11,12 +11,12 @@ be happening. schism/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: schismtracker-20240529/schism/version.c +Index: schismtracker-20241226/schism/version.c =================================================================== ---- schismtracker-20240529.orig/schism/version.c -+++ schismtracker-20240529/schism/version.c -@@ -52,7 +52,7 @@ static const char* top_banner_normal = - #if !defined(EMPTY_VERSION) +--- schismtracker-20241226.orig/schism/version.c ++++ schismtracker-20241226/schism/version.c +@@ -53,7 +53,7 @@ static const char* top_banner_normal = + #ifndef EMPTY_VERSION "Schism Tracker " VERSION #else - "Schism Tracker built " __DATE__ " " __TIME__ diff --git a/schismtracker.changes b/schismtracker.changes index 4215e78..a117d27 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Dec 27 00:17:59 UTC 2024 - Jan Engelhardt + +- Update to release 20241226 + * Implement Time Information page (accessible via + LShift-LAlt-RAlt-RCtrl-Pause, or the more sane keybind + Ctrl-Alt-T) + * Implement OpenMPT-style loop wrap-around buffer (addresses + playback issues with sample loops + interpolation) + * Much more accurate VU meters in the info page + * Fix handling of Lxx effects + * Fix handling of S7B/S7C effects + * Add support for 32-bit audio output + * Add primitive info reader of EdLib Tracker EDL and D00 files + (loading of the song data is not currently implemented) + * Fix some AIFF and WAV files not being loaded properly + * The default audio sample rate is now 48kHz instead of 44.1kHz + * Instruments Page: Keyjazz now works like Impulse Tracker did + * S3M: Import edit timers from Impulse Tracker and OpenMPT + * S3M: Save Impulse Tracker-style edit timers +- Delete 0001-build-resolve-Wreturn-type-warnings.patch (merged) + ------------------------------------------------------------------- Mon Oct 21 12:55:10 UTC 2024 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index 223a4c5..d2162f9 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -17,7 +17,7 @@ Name: schismtracker -Version: 20241021 +Version: 20241226 Release: 0 Summary: Music editor that matches the look and feel of Impulse Tracker License: GPL-2.0-or-later @@ -25,7 +25,6 @@ Group: Productivity/Multimedia/Sound/Editors and Convertors URL: http://schismtracker.org/ Source: https://github.com/schismtracker/schismtracker/archive/refs/tags/%version.tar.gz Source2: %name.desktop -Patch1: 0001-build-resolve-Wreturn-type-warnings.patch Patch2: schism-nodate.diff BuildRequires: alsa-devel BuildRequires: autoconf