From c39e0a777f9819e5c398e7125a0dcdf42477b403 Mon Sep 17 00:00:00 2001 From: Joonas Sarajärvi Date: Jun 28 2016 08:15:30 +0000 Subject: Revert "2016-05-31: Retired because it depends on rtmidi, which was" This reverts commit 5f75a5fd6240bda653d8aff80d4ef3dc6b61587a. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..752d25e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +milkytracker-0.90.80.tar.bz2 +/milkytracker-0.90.85.tar.bz2 +/milkytracker-0.90.86.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index aef3922..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -2016-05-31: Retired because it depends on rtmidi, which was -retired, because it was orphaned for more than six weeks. - diff --git a/milkytracker-0.90.86-alsalib.patch b/milkytracker-0.90.86-alsalib.patch new file mode 100644 index 0000000..c6f00a3 --- /dev/null +++ b/milkytracker-0.90.86-alsalib.patch @@ -0,0 +1,12 @@ +diff -ru milkytracker-0.90.86/src/tracker/Makefile.am milkytracker-0.90.86-alsalib/src/tracker/Makefile.am +--- milkytracker-0.90.86/src/tracker/Makefile.am 2013-11-09 12:57:21.000000000 +0200 ++++ milkytracker-0.90.86-alsalib/src/tracker/Makefile.am 2016-01-24 21:35:50.811383214 +0200 +@@ -76,7 +76,7 @@ + $(top_builddir)/src/ppui/osinterface/libosinterface.a \ + $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \ + $(top_builddir)/src/compression/zziplib/generic/libzzip.a \ +-$(Z_LIBS) ++$(Z_LIBS) $(ALSA_LIBS) + #$(ZZIP_LIBS) read below + + # NOTE: The MilkyTracker source contains a MODIFIED version of the zzip diff --git a/milkytracker-0.90.86-system-rtmidi.patch b/milkytracker-0.90.86-system-rtmidi.patch new file mode 100644 index 0000000..051c029 --- /dev/null +++ b/milkytracker-0.90.86-system-rtmidi.patch @@ -0,0 +1,46 @@ +diff -ru milkytracker-0.90.86/src/midi/Makefile.am milkytracker-0.90.86-system-rtmidi/src/midi/Makefile.am +--- milkytracker-0.90.86/src/midi/Makefile.am 2013-11-09 12:57:21.000000000 +0200 ++++ milkytracker-0.90.86-system-rtmidi/src/midi/Makefile.am 2016-01-24 22:27:45.054750663 +0200 +@@ -1,8 +1,8 @@ + noinst_LIBRARIES = libmidi.a + +-libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp rtmidi/RtMidi.cpp ++libmidi_a_SOURCES = posix/MidiReceiver_pthread.cpp + +-noinst_HEADERS = posix/MidiReceiver_pthread.h rtmidi/RtError.h rtmidi/RtMidi.h \ ++noinst_HEADERS = posix/MidiReceiver_pthread.h \ + MidiTools.h + + AM_CPPFLAGS=-D__LINUX_ALSASEQ__ -D__LINUX__ -DMILKYTRACKER ${ALSA_CFLAGS} \ +diff -ru milkytracker-0.90.86/src/midi/posix/MidiReceiver_pthread.cpp milkytracker-0.90.86-system-rtmidi/src/midi/posix/MidiReceiver_pthread.cpp +--- milkytracker-0.90.86/src/midi/posix/MidiReceiver_pthread.cpp 2013-11-09 02:11:58.000000000 +0200 ++++ milkytracker-0.90.86-system-rtmidi/src/midi/posix/MidiReceiver_pthread.cpp 2016-01-30 21:44:35.243989528 +0200 +@@ -32,7 +32,6 @@ + #include "Tracker.h" + #include "PPMutex.h" + #include "RtMidi.h" +-#include "RtError.h" + #include "PPSystem.h" + #include + #include "MidiTools.h" +@@ -64,7 +63,7 @@ + midiin = new RtMidiIn(); + midiin->openPort(deviceID); + } +- catch (RtError &error) ++ catch (RtMidiError &error) + { + error.printMessage(); + goto cleanup; +diff -ru milkytracker-0.90.86/src/tracker/Makefile.am milkytracker-0.90.86-system-rtmidi/src/tracker/Makefile.am +--- milkytracker-0.90.86/src/tracker/Makefile.am 2013-11-09 12:57:21.000000000 +0200 ++++ milkytracker-0.90.86-system-rtmidi/src/tracker/Makefile.am 2016-01-30 22:19:46.557714000 +0200 +@@ -76,7 +76,7 @@ + $(top_builddir)/src/ppui/osinterface/libosinterface.a \ + $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \ + $(top_builddir)/src/compression/zziplib/generic/libzzip.a \ +-$(Z_LIBS) $(ALSA_LIBS) ++$(Z_LIBS) $(ALSA_LIBS) -lrtmidi + #$(ZZIP_LIBS) read below + + # NOTE: The MilkyTracker source contains a MODIFIED version of the zzip diff --git a/milkytracker-0.90.86-zziplib-fixes.patch b/milkytracker-0.90.86-zziplib-fixes.patch new file mode 100644 index 0000000..b2c1f7d --- /dev/null +++ b/milkytracker-0.90.86-zziplib-fixes.patch @@ -0,0 +1,12 @@ +diff -ru milkytracker-0.90.86/src/compression/zziplib/generic/fseeko.cpp milkytracker-0.90.86-zziplib-fixes/src/compression/zziplib/generic/fseeko.cpp +--- milkytracker-0.90.86/src/compression/zziplib/generic/fseeko.cpp 2013-11-09 02:11:58.000000000 +0200 ++++ milkytracker-0.90.86-zziplib-fixes/src/compression/zziplib/generic/fseeko.cpp 2016-01-30 21:52:24.503454707 +0200 +@@ -144,7 +144,7 @@ + name[len] = '\0'; + return name; + } +- ___ auto struct zzip_file_header header; ++ ___ struct zzip_file_header header; + if (zzip_entry_fread_file_header (entry, &header) + && ( len = zzip_file_header_namlen(&header) )) { + char* name = (char*)malloc (len+1); diff --git a/milkytracker.desktop b/milkytracker.desktop new file mode 100644 index 0000000..7a7c72a --- /dev/null +++ b/milkytracker.desktop @@ -0,0 +1,10 @@ + +[Desktop Entry] +Name=MilkyTracker +Comment=Module tracker +Exec=milkytracker %U +Terminal=false +Type=Application +Icon=milkytracker +StartupNotify=false +Categories=AudioVideo;Audio;Sequencer; diff --git a/milkytracker.spec b/milkytracker.spec new file mode 100644 index 0000000..1ef3adb --- /dev/null +++ b/milkytracker.spec @@ -0,0 +1,145 @@ +Name: milkytracker +Version: 0.90.86 +Release: 2%{?dist} +Summary: Module tracker software for creating music + +Group: Applications/Multimedia +License: GPLv3+ +URL: http://www.milkytracker.org/ +Source0: http://milkytracker.org/files/%{name}-%{version}.tar.bz2 +Source1: %{name}.desktop +Patch0: milkytracker-0.90.86-alsalib.patch +Patch1: milkytracker-0.90.86-system-rtmidi.patch +Patch2: milkytracker-0.90.86-zziplib-fixes.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: SDL-devel +BuildRequires: desktop-file-utils +BuildRequires: rtmidi-devel +BuildRequires: zlib-devel +BuildRequires: jack-audio-connection-kit-devel + +Provides: bundled(zziplib) = 0.13.47 + +%description +MilkyTracker is an application for creating music in the .MOD and .XM formats. +Its goal is to be free replacement for the popular Fasttracker II software. + +%prep +%setup -q +find . -regex '.*\.\(cpp\|h\|inl\)' -print0 | xargs -0 chmod 644 + +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +# Explicitly remove source files +rm -rf src/compression/zlib/ +rm -rf src/midi/rtmidi/ + +%build +autoreconf +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +# copy the icon +mkdir -p %{buildroot}%{_datadir}/pixmaps +cp -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png + +# copy the desktop file +desktop-file-install \ +%if 0%{?fedora} && 0%{?fedora} < 19 + --vendor fedora \ +%endif + --dir=%{buildroot}%{_datadir}/applications/ %{SOURCE1} + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING NEWS README +%{_bindir}/milkytracker +%if 0%{?fedora} && 0%{?fedora} < 19 +%{_datadir}/applications/fedora-%{name}.desktop +%else +%{_datadir}/applications/%{name}.desktop +%endif +%{_datadir}/pixmaps/milkytracker.png + +%changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.90.86-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Jan 30 2016 Joonas Sarajärvi - 0.90.86-1 +- Updated to new upstream release +- Use bundled copy of zziplib +- Zip file support was fixed (bz #1270882) + +* Wed Jun 17 2015 Fedora Release Engineering - 0.90.85-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 0.90.85-10 +- Rebuilt for GCC 5 C++11 ABI change + +* Sun Aug 17 2014 Fedora Release Engineering - 0.90.85-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.90.85-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.90.85-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Toshio Kuratomi - 0.90.85-6 +- Remove the --vendor flag from desktop-file-install https://fedorahosted.org/fesco/ticket/1077 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.90.85-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Aug 03 2012 Joonas Sarajärvi - 0.90.85-4 +- Fix build error from invalid C++ type conversions + +* Fri Jul 20 2012 Fedora Release Engineering - 0.90.85-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.90.85-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jun 08 2011 Joonas Sarajärvi - 0.90.85-1 +- Update to upstream version 0.90.85 +- Redo the build system tweaks to avoid using bundled zziplib +- Fix integer type errors + +* Tue Feb 08 2011 Fedora Release Engineering - 0.90.80-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 0.90.80-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0.90.80-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri May 30 2008 Mamoru Tasaka - 0.90.80-3 +- Use system-wide zziplib (zlib is not used directly) + +* Mon May 26 2008 Joonas Sarajärvi - 0.90.80-2 +- Set Source0 to use macros for easier updating. +- Removed the --without-jack configuration option. +- Added -p to the cp command to preserve the timestamp. +- Replaced /usr/share with a macro. +- Added a line to prep to set correct permissions for source files extracted from the tarball. +- Modified a Makefile.am to not compile the included static zlib library. + +* Sat May 3 2008 Joonas Sarajärvi - 0.90.80-1 +- Initial RPM release. + diff --git a/sources b/sources new file mode 100644 index 0000000..00146b5 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +1ef462969cf54ba61748d4d878b5747e milkytracker-0.90.86.tar.bz2