From ea84a0c2a4a78fcc00d45486fb605b07003237dd61505a1939169313ba3722d4 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 21 Oct 2024 17:40:48 +0200 Subject: [PATCH] schismtracker 20241021 --- ...-build-resolve-Wreturn-type-warnings.patch | 87 +++++++++++++++++++ 20240909.tar.gz | 3 - 20241021.tar.gz | 3 + schismtracker.changes | 17 ++++ schismtracker.spec | 6 +- 5 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 0001-build-resolve-Wreturn-type-warnings.patch delete mode 100644 20240909.tar.gz create mode 100644 20241021.tar.gz diff --git a/0001-build-resolve-Wreturn-type-warnings.patch b/0001-build-resolve-Wreturn-type-warnings.patch new file mode 100644 index 0000000..44fd25d --- /dev/null +++ b/0001-build-resolve-Wreturn-type-warnings.patch @@ -0,0 +1,87 @@ +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/20240909.tar.gz b/20240909.tar.gz deleted file mode 100644 index 1e6187a..0000000 --- a/20240909.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e29fb646e08ae210f027d1c8aaed4b6a0514b731202cb437a37b9685d40d6cd -size 1073624 diff --git a/20241021.tar.gz b/20241021.tar.gz new file mode 100644 index 0000000..c57c371 --- /dev/null +++ b/20241021.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9615aeb37a29867306b92008c4579be185871ac0156009ce64be406b777b8f5d +size 1081219 diff --git a/schismtracker.changes b/schismtracker.changes index 6cb5491..4215e78 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Oct 21 12:55:10 UTC 2024 - Jan Engelhardt + +- Update to release 20241021 + * Fix search on the Load Module page + * Wii U support + * Fix portamento in both volume and effect column at the same + time + * Allow importing of IEEE floating point WAV and AU files + * POSIX: Use ~/.config/schism by default; ~/.schism is used if + it is available as a fallback + * MIDI/JACK: Both midi in and out should work flawlessly now + * S3M: Fix sample import under big endian architectures + * IT: Fix V81-VFF commands in old Schism Tracker ITs + * XM: Import ModPlug Tracker Command X extensions +- Add 0001-build-resolve-Wreturn-type-warnings.patch + ------------------------------------------------------------------- Tue Sep 10 09:32:16 UTC 2024 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index e098f0d..223a4c5 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -17,15 +17,15 @@ Name: schismtracker -Version: 20240909 +Version: 20241021 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/archive/refs/tags/%version.tar.gz -#Source: https://github.com/schismtracker/schismtracker/releases/download/%version/%name-%version.source.tar.gz Source2: %name.desktop +Patch1: 0001-build-resolve-Wreturn-type-warnings.patch Patch2: schism-nodate.diff BuildRequires: alsa-devel BuildRequires: autoconf @@ -52,7 +52,7 @@ bugfixes and changes to improve IT playback. %autosetup -p1 %build -if [ ! -e configure ]; then autoreconf -fi; fi +autoreconf -fi %configure %make_build