[info=146074f83f58f1483c04a5c05030cd162c16f809ac8577816eaf0dda4a029a30]
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=90
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
67d4895c32
commit
314c3ec1f5
@ -1,87 +0,0 @@
|
||||
From b2528fd86f492e973fe60394cb89c12bdb7254b7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
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
|
||||
|
||||
BIN
20241021.tar.gz
(Stored with Git LFS)
BIN
20241021.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
20241226.tar.gz
(Stored with Git LFS)
Normal file
BIN
20241226.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
mtime: 1729546721
|
||||
commit: ea84a0c2a4a78fcc00d45486fb605b07003237dd61505a1939169313ba3722d4
|
||||
mtime: 1735259335
|
||||
commit: 146074f83f58f1483c04a5c05030cd162c16f809ac8577816eaf0dda4a029a30
|
||||
url: https://src.opensuse.org/jengelh/schismtracker
|
||||
revision: master
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b644c984d5f61721d3558b5d1fb3afe76d7c20d1d542a9c4d6216c7c179bb987
|
||||
oid sha256:1d6c767b6813e9c2b5f949ccfff063facaa44106048e0fd7d8e0c47599d52704
|
||||
size 256
|
||||
|
||||
@ -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__
|
||||
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 27 00:17:59 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- 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 <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user