diff options
| -rw-r--r-- | arctracker-LDFLAGS-fix.patch | 12 | ||||
| -rw-r--r-- | arctracker-remove-inline.patch | 106 | ||||
| -rw-r--r-- | arctracker.spec | 12 |
3 files changed, 129 insertions, 1 deletions
diff --git a/arctracker-LDFLAGS-fix.patch b/arctracker-LDFLAGS-fix.patch new file mode 100644 index 0000000..17f94d0 --- /dev/null +++ b/arctracker-LDFLAGS-fix.patch @@ -0,0 +1,12 @@ +diff -u arctracker-0.2.0/Makefile.in arctracker-0.2.0-LDFLAGS-fix/Makefile.in +--- arctracker-0.2.0/Makefile.in 2005-05-26 18:43:30.000000000 +0100 ++++ arctracker-0.2.0-LDFLAGS-fix/Makefile.in 2022-08-29 17:18:24.524298981 +0100 +@@ -24,7 +24,7 @@ + INSTALLDIR=@prefix@ + + arctracker: arctracker.o initialise.o read_mod.o play_mod.o +- $(CC) $(CFLAGS) $(LDFLAGS) $(CLIBS) -o arctracker arctracker.o initialise.o read_mod.o play_mod.o ++ $(CC) $(CFLAGS) $(CLIBS) -o arctracker arctracker.o initialise.o read_mod.o play_mod.o $(LDFLAGS) + + arctracker.o: arctracker.h arctracker.c + $(CC) $(CFLAGS) -c arctracker.c diff --git a/arctracker-remove-inline.patch b/arctracker-remove-inline.patch new file mode 100644 index 0000000..92e6ec0 --- /dev/null +++ b/arctracker-remove-inline.patch @@ -0,0 +1,106 @@ +diff -u arctracker-0.2.0/arctracker.h arctracker-0.2.0-inline-removed/arctracker.h +--- arctracker-0.2.0/arctracker.h 2005-05-26 18:43:30.000000000 +0100 ++++ arctracker-0.2.0-inline-removed/arctracker.h 2022-08-29 17:04:20.018953223 +0100 +@@ -383,7 +383,7 @@ + mono_stereo p_stereo_mode, + program_arguments *p_args); + +-__inline void initialise_values( ++void initialise_values( + mono_stereo p_stereo_mode, + format p_sample_format, + char *buffer_shifter, +@@ -393,18 +393,18 @@ + yn p_pianola, + long p_sample_rate); + +-__inline yn update_counters( ++yn update_counters( + tune_info *p_current_positions, + mod_details *p_module, + yn p_pianola); + +-__inline void get_current_pattern_line( ++void get_current_pattern_line( + tune_info *p_current_positions, + mod_details *p_module, + current_event *p_current_pattern_line, + yn p_pianola); + +-__inline void get_new_note( ++void get_new_note( + current_event *p_current_event, + sample_details *p_sample, + channel_info *p_current_voice, +@@ -414,7 +414,7 @@ + module_type p_module_type, + long p_num_samples); + +-__inline void process_tracker_command( ++void process_tracker_command( + current_event *p_current_event, + channel_info *p_current_voice, + tune_info *p_current_positions, +@@ -423,7 +423,7 @@ + unsigned int *p_periods, + yn on_event); + +-__inline void process_desktop_tracker_command( ++void process_desktop_tracker_command( + current_event *p_current_event, + channel_info *p_current_voice, + tune_info *p_current_positions, +@@ -433,7 +433,7 @@ + yn on_event, + long p_sample_rate); + +-__inline void prepare_current_frame_sample_data( ++void prepare_current_frame_sample_data( + long *p_current_frame_left_channel, + long *p_current_frame_right_channel, + channel_info *p_voice_info, +@@ -441,7 +441,7 @@ + mono_stereo p_stereo_mode, + unsigned char p_volume); + +-__inline void mix_channels( ++void mix_channels( + long *p_current_frame_left_channel, + long *p_current_frame_right_channel, + channel_info *p_voice_info, +@@ -450,7 +450,7 @@ + long *p_right_channel); + + /* +-__inline return_status write_audio_data ( ++return_status write_audio_data ( + output_api p_api, + format p_sample_format, + mono_stereo p_stereo_mode, +@@ -460,7 +460,7 @@ + void *p_ah_ptr) + */ + +-__inline return_status write_audio_data( ++return_status write_audio_data( + output_api p_api, + channel_info *p_voice_info, + mod_details *p_module, +@@ -471,7 +471,7 @@ + void *p_ah_ptr, + long p_nframes); + +-__inline void write_channel_audio_data( ++void write_channel_audio_data( + int p_ch, + channel_info *p_voice_info, + long p_nframes, +@@ -481,7 +481,7 @@ + unsigned char p_volume, + int stridelen); + +-__inline return_status output_data( ++return_status output_data( + output_api p_api, + char p_buffer_shifter, + format p_sample_format, diff --git a/arctracker.spec b/arctracker.spec index ee25447..3df5515 100644 --- a/arctracker.spec +++ b/arctracker.spec @@ -1,15 +1,20 @@ Name: arctracker Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plays Tracker and Desktop Tracker files from the Acorn Archimedes License: GPLv2+ URL: http://sourceforge.net/projects/arctracker/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +BuildRequires: gcc + # enable ALSA sound output BuildRequires: alsa-lib-devel +Patch0: arctracker-remove-inline.patch +Patch1: arctracker-LDFLAGS-fix.patch + %description This program is designed to play modfiles that have been created using the Tracker and Desktop Tracker programs that run on the Acorn Archimedes and @@ -17,6 +22,8 @@ compatible range of microcomputers. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %configure --prefix=%{buildroot}%{_prefix} @@ -32,5 +39,8 @@ mkdir -p %{buildroot}%{_bindir} %doc COPYING README %changelog +* Mon Aug 29 2022 Richard Fearn <richardfearn@gmail.com> - 0.2.0-2 +- Fix compilation on Fedora 36 + * Sun May 3 2015 Richard Fearn <richardfearn@gmail.com> - 0.2.0-1 - Initial package for Fedora |