From ac3dc9843f4476b0c9adc25d489ffe40067a1e23 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Jan 09 2018 02:57:59 +0000 Subject: Update to 3.0 --- diff --git a/.gitignore b/.gitignore index 2f7eca3..20459df 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /muse-2.1.1.tar.gz /muse-2.1.2.tar.gz /muse-2.2.1.tar.gz +/muse-3.0.tar.gz diff --git a/muse.spec b/muse.spec index 18adb11..6f89c2f 100644 --- a/muse.spec +++ b/muse.spec @@ -1,23 +1,16 @@ -%global maj 2.2 +%global maj 3.0 # No need to provide & require internal libraries %filter_provides_in %{_libdir}/%{name}-%{maj}.*/.*/.*\.so$ %filter_from_requires /libmuse_.*\.so.*/d %filter_setup -# lv2 gtk2 helper target -%ifarch x86_64 -%global LV2_GTK_HELPER lv2Gtk2Helper64.so -%else -%global LV2_GTK_HELPER lv2Gtk2Helper32.so -%endif - Name: muse Summary: Midi/Audio Music Sequencer # Epoch is set to 1 for PlanetCCRMA compatibility. # See: https://fedoraproject.org/wiki/AudioCreation Epoch: 1 -Version: 2.2.1 -Release: 8%{?dist} +Version: 3.0 +Release: 1%{?dist} # original freeverb plugin was public domain # givertcap (not built) is GPLv2 # The rest, including the core of muse is distributed under GPLv2+ @@ -25,11 +18,10 @@ License: Public Domain and GPLv2 and GPLv2+ and LGPLv2+ Group: Applications/Multimedia URL: http://www.muse-sequencer.org/ Source0: https://downloads.sourceforge.net/project/lmuse/%{name}-%{maj}/%{name}-%{version}.tar.gz - -# Fixed upstream -Patch0: muse-gcc6.patch -# Fixed upstream -Patch1: muse-gcc7.patch +# FIX build issue due to use of GNU extensions. Upstreamed. +Patch0: muse-glibc227.patch +# FIX build against newer gcc. Upstreamed. +Patch1: muse-makepair.patch BuildRequires: alsa-lib-devel BuildRequires: cmake @@ -39,14 +31,18 @@ BuildRequires: fluidsynth-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: ladspa-devel BuildRequires: lash-devel +BuildRequires: libinstpatch-devel BuildRequires: liblo-devel BuildRequires: lilv-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: pkgconfig -BuildRequires: python2-devel -BuildRequires: qt4-devel - +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qttools-static +# Only Fedora > 27 has recent enough rtaudio +%if 0%{fedora} > 27 +BuildRequires: rtaudio-devel +%endif # For lv2 plugins BuildRequires: gtkmm24-devel @@ -61,27 +57,17 @@ for Linux. %prep %setup -q +%patch0 -p1 -b .gnusource +%patch1 -p1 -b .makepair -%patch0 -p1 -b .gcc6 -%patch1 -p1 -b .gcc7 - -# remove precompiled binaries -find . -name "*.so" -exec rm {} \; - -# install only the helper with the appropriate bitness -sed -i "s|\(install(FILES\).*|\1 %LV2_GTK_HELPER|" muse/lv2Gtk2Helper/CMakeLists.txt - -# Module dependency fix. This is fixed in upstream trunk -sed -i 's|awl|awl widgets|' muse/liste/CMakeLists.txt synti/deicsonze/CMakeLists.txt muse/instruments/CMakeLists.txt %build -make -C muse/lv2Gtk2Helper/ %LV2_GTK_HELPER DEBUGFLAGS="%{optflags} -std=gnu++14" FLAGS32= FLAGS64= - +export CMAKE_CXX_FLAGS="-D_GNU_SOURCE" mkdir -p %{_target_platform} pushd %{_target_platform} %{cmake} .. \ - -DMusE_DOC_DIR=%{_pkgdocdir}/ \ - -DENABLE_PYTHON=1 + -DMusE_DOC_DIR=%{_pkgdocdir}/ + make %{?_smp_mflags} @@ -112,6 +98,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files +%license COPYING %{_pkgdocdir} %{_bindir}/%{name}* %{_bindir}/grepmidi @@ -124,6 +111,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/mime/packages/muse.xml %changelog +* Sun Jan 07 2018 Orcan Ogetbil - 3.0-1 +- Update to 3.0 + * Thu Aug 03 2017 Fedora Release Engineering - 1:2.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index cbbeb9a..83b5f8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -985e96c9513d0b2baad8386bc0adc4d8 muse-2.2.1.tar.gz +SHA512 (muse-3.0.tar.gz) = 688b87ad093d137446b8b1f65937e0ddccc6077a308d974e939c5c91acb9cb7d8fe2809b6c4782d08ad0ffd7680adc1550dfa58cc8c438a5be13c232130aad5c