Signed-off-by: Igor Gnatenko <i.gnatenko.brain@xxxxxxxxx>
---
.gitignore | 1 +
MuseScore-2.0.1-remove-mp3-support.patch | 71 --------------------------------
mscore.spec | 12 +++---
sources | 2 +-
4 files changed, 8 insertions(+), 78 deletions(-)
delete mode 100644 MuseScore-2.0.1-remove-mp3-support.patch
diff --git a/.gitignore b/.gitignore
index 774255e..4af4c37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mscore-0.9.6.2-free.tar.bz2
/mscore-1.3-free.tar.bz2
/MuseScore-2.0.0.zip
/MuseScore-2.0.1.zip
+/MuseScore-2.0.2.zip
diff --git a/MuseScore-2.0.1-remove-mp3-support.patch b/MuseScore-2.0.1-remove-mp3-support.patch
deleted file mode 100644
index 0988891..0000000
--- a/MuseScore-2.0.1-remove-mp3-support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -uNr MuseScore-2.0.1/CMakeLists.txt MuseScore-2.0.1.lame/CMakeLists.txt
---- MuseScore-2.0.1/CMakeLists.txt 2015-06-14 16:46:08.607596427 -0600
-+++ MuseScore-2.0.1.lame/CMakeLists.txt 2015-06-11 21:46:12.191493236 -0600
-@@ -50,7 +50,6 @@
- include (UsePkgConfig1)
- include (TargetDoc)
- include (FindPulseAudio)
--include (FindLame)
- include (GetCompilerVersion)
- include (CreatePrecompiledHeader)
-
-@@ -443,7 +442,6 @@
- ${OGG_INCDIR}
- ${VORBIS_INCDIR}
- ${SNDFILE_INCDIR}
-- ${LAME_INCLUDE_DIR}
- )
-
- ##
-diff -uNr MuseScore-2.0.1/mscore/CMakeLists.txt MuseScore-2.0.1.lame/mscore/CMakeLists.txt
---- MuseScore-2.0.1/mscore/CMakeLists.txt 2015-06-14 16:46:08.831600086 -0600
-+++ MuseScore-2.0.1.lame/mscore/CMakeLists.txt 2015-06-13 11:01:20.298736472 -0600
-@@ -226,7 +226,7 @@
- importgtp.cpp importgtp-gp4.cpp importgtp-gp5.cpp importgtp-gp6.cpp fotomode.cpp drumtools.cpp
- selinstrument.cpp texteditor.cpp editstafftype.cpp texttools.cpp
- editpitch.cpp editstringdata.cpp editraster.cpp pianotools.cpp mediadialog.cpp
-- workspace.cpp exportmp3.cpp chordview.cpp
-+ workspace.cpp chordview.cpp
- album.cpp albummanager.cpp
- textstyle.cpp
- lineproperties.cpp stafftextproperties.cpp splitstaff.cpp
-diff -uNr MuseScore-2.0.1/mscore/file.cpp MuseScore-2.0.1.lame/mscore/file.cpp
---- MuseScore-2.0.1/mscore/file.cpp 2015-06-14 16:46:08.873600773 -0600
-+++ MuseScore-2.0.1.lame/mscore/file.cpp 2015-06-11 21:47:33.668903316 -0600
-@@ -1541,7 +1541,6 @@
- fl.append(tr("FLAC Audio (*.flac)"));
- fl.append(tr("Ogg Vorbis Audio (*.ogg)"));
- #endif
-- fl.append(tr("MP3 Audio (*.mp3)"));
- fl.append(tr("Standard MIDI File (*.mid)"));
- fl.append(tr("MusicXML File (*.xml)"));
- fl.append(tr("Compressed MusicXML File (*.mxl)"));
-@@ -1605,7 +1604,6 @@
- fl.append(tr("FLAC Audio (*.flac)"));
- fl.append(tr("Ogg Vorbis Audio (*.ogg)"));
- #endif
-- fl.append(tr("MP3 Audio (*.mp3)"));
- fl.append(tr("Standard MIDI File (*.mid)"));
- fl.append(tr("MusicXML File (*.xml)"));
- fl.append(tr("Compressed MusicXML File (*.mxl)"));
-@@ -1801,8 +1799,6 @@
- else if (ext == "wav" || ext == "flac" || ext == "ogg")
- rv = saveAudio(cs, fn);
- #endif
-- else if (ext == "mp3")
-- rv = saveMp3(cs, fn);
- else if (ext == "spos") {
- // save positions of segments
- rv = savePositions(cs, fn, true);
-diff -uNr MuseScore-2.0.1/mscore/musescore.cpp MuseScore-2.0.1.lame/mscore/musescore.cpp
---- MuseScore-2.0.1/mscore/musescore.cpp 2015-06-14 16:46:08.913601426 -0600
-+++ MuseScore-2.0.1.lame/mscore/musescore.cpp 2015-06-11 21:48:08.914513598 -0600
-@@ -2142,8 +2142,6 @@
- if (fn.endsWith(".wav") || fn.endsWith(".ogg") || fn.endsWith(".flac"))
- return mscore->saveAudio(cs, fn);
- #endif
-- if (fn.endsWith(".mp3"))
-- return mscore->saveMp3(cs, fn);
- if (fn.endsWith(".spos"))
- return savePositions(cs, fn, true);
- if (fn.endsWith(".mpos"))
diff --git a/mscore.spec b/mscore.spec
index a4f1061..41faedc 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -3,8 +3,8 @@
Name: mscore
Summary: Music Composition & Notation Software
-Version: %{shortver}.1
-Release: 4%{?dist}
+Version: %{shortver}.2
+Release: 1%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
# the rest is GPLv2
@@ -34,9 +34,6 @@ Patch2: musescore-2.0.1-dso-linking.patch
Patch3: MuseScore-2.0.1-fix-desktop-file.patch
# Use CXXFLAGS for precompiled header
Patch4: musescore-2.0.1-fix-flags-for-precompiled-header.patch
-# Drop mp3 support due to no lame in fedora
-# http://musescore.org/en/node/57736
-Patch5: MuseScore-2.0.1-remove-mp3-support.patch
BuildRequires: alsa-lib-devel
BuildRequires: cmake
@@ -124,7 +121,6 @@ This package contains the musical notation fonts for use of MuseScore.
%patch2 -p1 -b .dso
%patch3 -p1
%patch4 -p1 -b .fixflags
-%patch5 -p1
# Remove the precompiled binary
rm thirdparty/rtf2html/rtf2html
@@ -150,6 +146,7 @@ pushd build.release
%cmake -DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_CXX_FLAGS="%{optflags} -fsigned-char" \
-DCMAKE_CXX_FLAGS_RELEASE="%{optflags} -std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -fsigned-char" \
+ -DBUILD_LAME=OFF \
..
# make PREFIX=/usr lupdate %{?_smp_flags}
make PREFIX=/usr lrelease %{?_smp_flags}
@@ -301,6 +298,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/appdata/%{fontfamilyname}.metainfo.xml
%changelog
+* Sun Aug 02 2015 Igor Gnatenko <ignatenkobrain@xxxxxxxxxxxxxxxxx> - 2.0.2-1
+- Update to 2.0.2
+
* Tue Jul 14 2015 Brendan Jones <brendan.jones.it@xxxxxxxxx> 2.0.1-4
- Rebuilt
diff --git a/sources b/sources
index f393d41..96fa109 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-018db9e7be71b2189b3bb2834ca58c34 MuseScore-2.0.1.zip
+146fe596c42d2038bbb615f09c632a11 MuseScore-2.0.2.zip
--
2.5.0
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
