From 055b9341d955ef3a1eef633a05dad03f2ecbb5d5 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Jun 19 2011 22:27:13 +0000 Subject: Update to MusE-2.0-beta2 --- diff --git a/.gitignore b/.gitignore index 0b1fa8b..36f2dae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /muse-1.1.tar.gz /muse-2.0alpha.tar.gz +/muse-2.0beta2.tar.gz diff --git a/muse-gcc46.patch b/muse-gcc46.patch deleted file mode 100644 index 3748db4..0000000 --- a/muse-gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN muse-2.0alpha.old/muse/memory.h muse-2.0alpha/muse/memory.h ---- muse-2.0alpha.old/muse/memory.h 2010-12-23 06:19:46.000000000 -0500 -+++ muse-2.0alpha/muse/memory.h 2011-02-08 18:37:21.000000000 -0500 -@@ -11,6 +11,7 @@ - - #include - #include -+#include - #include - - // most of the following code is based on examples diff --git a/muse-noglyphsource.patch b/muse-noglyphsource.patch new file mode 100644 index 0000000..87adf3d --- /dev/null +++ b/muse-noglyphsource.patch @@ -0,0 +1,13 @@ +diff -rupN muse-2.0beta2.old/share/scoreglyphs/CMakeLists.txt muse-2.0beta2/share/scoreglyphs/CMakeLists.txt +--- muse-2.0beta2.old/share/scoreglyphs/CMakeLists.txt 2011-05-06 11:28:39.000000000 -0400 ++++ muse-2.0beta2/share/scoreglyphs/CMakeLists.txt 2011-06-18 23:25:23.000000000 -0400 +@@ -20,9 +20,6 @@ + + file (GLOB scoreglyph_files *.png LICENSE) + +-subdirs( feta-original +- ) +- + install( FILES ${scoreglyph_files} + DESTINATION ${MusE_SHARE_DIR}/scoreglyphs + ) diff --git a/muse-svn680to681.patch b/muse-svn680to681.patch deleted file mode 100644 index a38edaa..0000000 --- a/muse-svn680to681.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: packaging/muse.desktop -=================================================================== ---- packaging/muse.desktop (revision 680) -+++ packaging/muse.desktop (working copy) -@@ -6,4 +6,4 @@ - Type=Application - Exec=muse - Terminal=false --Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio; -+Categories=Sequencer;Midi;X-Jack;X-Sequencers;X-MIDI;Audio;AudioVideo; -Index: README.softsynth -=================================================================== ---- README.softsynth (revision 680) -+++ README.softsynth (working copy) -@@ -73,7 +73,7 @@ - "organ" implements a gui connected bidirectional - to the synth via stdin/stdout - -- - fluid, is the adapted version of Peter Hanappe�s -+ - fluid, is the adapted version of Peter Hanappe´s - sample based fluid synthesizer (formerly known as iiwu) - - loadable sound fonts - - multi timbral -Index: synti/vam/README -=================================================================== ---- synti/vam/README (revision 680) -+++ synti/vam/README (working copy) -@@ -1,6 +1,6 @@ - VAM: Virtual Analog for MusE - -- by Josef Lindman H�rnlund -+ by Josef Lindman Hörnlund - - - *** WARNING! VAM has at the time some significant problems -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 680) -+++ CMakeLists.txt (working copy) -@@ -80,7 +80,7 @@ - - ## Top documentation dir - IF(NOT DEFINED MusE_DOC_DIR) -- SET(MusE_DOC_DIR ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}-${MusE_VERSION_FULL}/) -+ SET(MusE_DOC_DIR ${SHARE_INSTALL_PREFIX}/doc/${MusE_INSTALL_NAME}/) - ENDIF(NOT DEFINED MusE_DOC_DIR) - - ## Data directory -@@ -348,7 +348,7 @@ - INCLUDE(CPack) - ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") - --set(CMAKE_CXX_FLAGS "-Wl,-rpath,${QT_LIBRARY_DIR} -Wall -Wextra -Winvalid-pch -fno-exceptions ${CMAKE_CXX_FLAGS}") -+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Winvalid-pch -fno-exceptions ${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fomit-frame-pointer -ffast-math -fstrength-reduce ${CMAKE_CXX_FLAGS_RELEASE}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -DQT_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}") - -Index: README.de -=================================================================== ---- README.de (revision 680) -+++ README.de (working copy) -@@ -6,14 +6,14 @@ - dies ist MusE, der Open Source MIDI/Audio Sequencer. - - MusE steht unter der GNU General Public Licence (GPL). --F�r Einzelheiten siehe COPYING. -+Für Einzelheiten siehe COPYING. - - ,-----------------------------------------------------------------. - | HINWEIS | - |-----------------------------------------------------------------| --| Viel Teile des Codes von MusE sind EXPERIMENTELL und k�nnen | --| zu Programmabst�rzen und wer wei� was sonst noch allem | --| f�hren. | -+| Viel Teile des Codes von MusE sind EXPERIMENTELL und können | -+| zu Programmabstürzen und wer weiß was sonst noch allem | -+| führen. | - | SIE BENUTZEN DIESE SOFTWARE AUF EIGENES RISIKO! | - `-----------------------------------------------------------------' - -@@ -36,18 +36,18 @@ - download: - http://jackit.sourceforge.net/download/ - -- - fluidsynth-1.0.3 (die synti fr�her bekannt als "iiwusynth") von -+ - fluidsynth-1.0.3 (die synti früher bekannt als "iiwusynth") von - http://savannah.nongnu.org/download/fluid - - - Linux Kernel mit rtc (RealTimeClock) Treiber (device /dev/rtc) -- ("low latency patches" f�r minimales timing-jitter w�ren fein) -+ ("low latency patches" für minimales timing-jitter wären fein) - - - ALSA von http://www.alsa-project.org/ - Version 0.9.x oder neuer - - - gcc >= 4.x.x - -- - nat�rlich: eine Soundkarte und/oder irgendwelche Midi Ger�te -+ - natürlich: eine Soundkarte und/oder irgendwelche Midi Geräte - - ============================= - Kompilierung -Index: utils/CMakeLists.txt -=================================================================== ---- utils/CMakeLists.txt (revision 680) -+++ utils/CMakeLists.txt (working copy) -@@ -18,8 +18,11 @@ - # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - #============================================================================= - --install( FILES -+file(GLOB utils_files - muse-find-unused-wavs - muse-song-convert.py -+ ) -+ -+install (PROGRAMS ${utils_files} - DESTINATION ${MusE_SHARE_DIR}/utils/ - ) -Index: SECURITY -=================================================================== ---- SECURITY (revision 680) -+++ SECURITY (working copy) -@@ -234,7 +234,7 @@ - ________________________________________________________________________________ - - --This document was written by J�rn Nettingsmeier -+This document was written by Jörn Nettingsmeier - - Corrections and improvements welcome. - -Index: muse/CMakeLists.txt -=================================================================== ---- muse/CMakeLists.txt (revision 680) -+++ muse/CMakeLists.txt (working copy) -@@ -233,7 +233,6 @@ - widgets - - ${QT_LIBRARIES} -- QtSvg - ${SNDFILE_LIBRARIES} - ${SAMPLERATE_LIBRARIES} - ${UUID_LIBRARIES} diff --git a/muse.spec b/muse.spec index f97ed74..15b46a5 100644 --- a/muse.spec +++ b/muse.spec @@ -1,4 +1,4 @@ -%global prerelease alpha +%global prerelease beta2 Name: muse Summary: Midi/Audio Music Sequencer @@ -6,7 +6,7 @@ Summary: Midi/Audio Music Sequencer # See: https://fedoraproject.org/wiki/AudioCreation Epoch: 1 Version: 2.0 -Release: 0.3.alpha%{?dist} +Release: 0.4.%{prerelease}%{?dist} # synti/vam is GPLv2+ # original freeverb plugin was public domain # some of the widgets are GPLv2 @@ -18,18 +18,8 @@ License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://www.muse-sequencer.org/ Source0: https://downloads.sourceforge.net/project/lmuse/%{name}-%{version}/%{name}-%{version}%{?prerelease}.tar.gz -# Bunch of packaging related fixes. From upstream trunk: -# o Added missing AudioVideo category to the .desktop file. -# o Fixed the executable name in the .desktop file. -# o Converted README.softsynth, synti/vam/README, README.de, SECURITY to UTF8. -# o Made the default MusE_DOC_DIR consistent with other default definitions. -# o Removed explicit rpath to ${QT_LIBRARY_DIR}. cmake should add it automatically -# if there's need. -# o Removed unnecessary linkage to libQtSvg. -# o utils are installed with executable permissons. -Patch0: muse-svn680to681.patch -# Fix build failure against gcc-4.6. Upstreamed: -Patch1: muse-gcc46.patch +# Don't install score fonts. From trunk: +Patch0: muse-noglyphsource.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -57,9 +47,7 @@ for Linux. %prep %setup -q -n %{name}-%{version}%{?prerelease} -%patch0 -p0 -%patch1 -p1 - +%patch0 -p1 %build mkdir -p %{_target_platform} @@ -73,6 +61,8 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} -C %{_target_platform} +# install release notes +cp -a readme_muse*.txt %{buildroot}/%{_docdir}/%{name}-%{version}/ %check desktop-file-validate \ @@ -104,8 +94,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/%{name}-%{version}*/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/64x64/apps/%{name}_icon.png +%{_mandir}/man1/grepmidi* +%{_mandir}/man1/%{name}* +%{_datadir}/mime/packages/muse.xml %changelog +* Sat Jun 18 2011 Orcan Ogetbil - 1:2.0-0.4.beta2 +- Update to MusE-2.0-beta2 + * Tue Feb 08 2011 Orcan Ogetbil - 1:2.0-0.3.alpha - Fix build failure against gcc-4.6 diff --git a/sources b/sources index 79bdcd0..a2af19b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9622b5bbba33add3f0e49a719e924879 muse-2.0alpha.tar.gz +1da3b10bcde157b1fee5921267ada8ac muse-2.0beta2.tar.gz