rpms/mscore/devel mscore-arm-buildfix.patch, NONE, 1.1 mscore-use-default-soundfont.patch, 1.2, 1.3 mscore.spec, 1.5, 1.6 mscore-use-pclite-soundfont.patch, 1.2, NONE

Thu Dec 24 12:05:31 UTC 2009

Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19633

Modified Files:
	mscore-use-default-soundfont.patch mscore.spec 
Added Files:
	mscore-arm-buildfix.patch 
Removed Files:
	mscore-use-pclite-soundfont.patch 
Log Message:
* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
- Add default soundfont support for exported audio files
- Rebuild against new libsndfile for additional functionality
- Drop F-10 related bits from specfile
- Make fonts subpackage noarch
- Fix build failure on arm architecture


mscore-arm-buildfix.patch:
 barline.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE mscore-arm-buildfix.patch ---
--- mscore-0.9.5.old/mscore/mscore/barline.cpp	2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/barline.cpp	2009-12-22 08:42:39.000000000 -0500
@@ -96,7 +96,7 @@ void BarLine::draw(QPainter& p) const
       {
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
 
       QPen pen(p.pen());
       pen.setWidthF(lw);
@@ -274,7 +274,7 @@ void BarLine::read(QDomElement e)
 QRectF BarLine::bbox() const
       {
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       Spatium w = score()->styleS(ST_barWidth);
       qreal dw  = 0.0;
 
@@ -366,7 +366,7 @@ void BarLine::updateGrips(int* grips, QR
       *grips   = 1;
       qreal lw = point(score()->styleS(ST_barWidth));
       qreal y1, y2;
-      getY(&y1, &y2);
+      getY((double*)&y1, (double*)&y2);
       grip[0].translate(QPointF(lw * .5, y2) + canvasPos());
       }
 
@@ -413,7 +413,7 @@ void BarLine::editDrag(int, const QPoint
 void BarLine::endEditDrag()
       {
       double y1, h2;
-      getY(&y1, &h2);
+      getY((double*)&y1, (double*)&h2);
       yoff      = 0.0;
       qreal ay1 = canvasPos().y();
       qreal ay2 = ay1 + h2;

mscore-use-default-soundfont.patch:
 exportaudio.cpp |    4 ++--
 mscore.qrc      |    2 +-
 preferences.cpp |    4 ++--
 seq.cpp         |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

Index: mscore-use-default-soundfont.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore-use-default-soundfont.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mscore-use-default-soundfont.patch	22 Aug 2009 01:27:15 -0000	1.2
+++ mscore-use-default-soundfont.patch	24 Dec 2009 12:05:31 -0000	1.3
@@ -1,6 +1,21 @@
+diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
+--- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp	2009-08-12 09:28:22.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/exportaudio.cpp	2009-12-22 08:17:53.000000000 -0500
+@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
+             p = QString(getenv("DEFAULT_SOUNDFONT"));
+       if (p.isEmpty()) {
+             //
+-            // fallback to integrated soundfont
++            // fallback to default soundfont
+             //
+-            p = ":/data/piano1.sf2";
++	    p = INSTPREFIX "/share/soundfonts/default.sf2";
+             }
+       bool rv = synth->loadSoundFont(p);
+       if (!rv) {
 diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
 --- mscore-0.9.5.old/mscore/mscore/mscore.qrc	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-08-21 12:40:12.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/mscore.qrc	2009-12-22 08:15:49.000000000 -0500
 @@ -35,7 +35,7 @@
        <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
        <file>data/splash.jpg</file>
@@ -12,7 +27,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        <file>data/undo.svg</file>
 diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
 --- mscore-0.9.5.old/mscore/mscore/preferences.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-08-21 12:41:51.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/preferences.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -142,7 +142,7 @@ void Preferences::init()
  
        enableMidiInput    = true;
@@ -33,7 +48,7 @@ diff -rupN mscore-0.9.5.old/mscore/mscor
        showPlayPanel   = s.value("showPlayPanel", false).toBool();
 diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
 --- mscore-0.9.5.old/mscore/mscore/seq.cpp	2009-08-12 09:28:22.000000000 -0400
-+++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-08-21 12:38:37.000000000 -0400
++++ mscore-0.9.5/mscore/mscore/seq.cpp	2009-12-22 08:15:49.000000000 -0500
 @@ -221,9 +221,9 @@ bool Seq::init()
                    p = QString(getenv("DEFAULT_SOUNDFONT"));
              if (p.isEmpty()) {


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mscore.spec	22 Aug 2009 01:27:15 -0000	1.5
+++ mscore.spec	24 Dec 2009 12:05:31 -0000	1.6
@@ -1,15 +1,15 @@
 %global fontfamilyname %{name}
 %global majorver -0.9
-%if 0%{?fedora} >= 12
-%global fontpackagename fonts
+%if 0%{?fedora} > 11
+%global buildflags %{optflags} -fno-var-tracking-assignments
 %else
-%global fontpackagename %{fontfamilyname}-fonts
+%global buildflags %{optflags}
 %endif
 
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       0.9.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -36,8 +36,9 @@ Patch1:        %{name}-no-awl-plugin.pat
 # inform the users about the existence of different choices for common files.
 # The font files need to be separated due to the font packaging guidelines.
 Patch2:        %{name}-separate-commonfiles.patch
-# On Fedora < 11 there is no default soundfont
-Patch10:       %{name}-use-pclite-soundfont.patch
+# qreal is float on arm. getY() expects double:
+# http://www.musescore.org/en/node/3726
+Patch3:        %{name}-arm-buildfix.patch
 # Use Fedora's default soundfont instead of the removed one:
 Patch11:       %{name}-use-default-soundfont.patch
 
@@ -47,46 +48,20 @@ BuildRequires: alsa-lib-devel
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libsndfile-devel >= 1.0.19
 BuildRequires: portaudio-devel
 BuildRequires: qt4-devel
 
-# Fonts related:
-BuildRequires: fontforge
-BuildRequires: fontpackages-devel
-BuildRequires: t1utils
-BuildRequires: texlive
-%if 0%{?fedora} >= 11
-BuildRequires: tex-cm-lgc
-%else
-BuildRequires: tetex-font-cm-lgc
-%endif
-
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} >= 12
-BuildRequires: libsndfile-devel >= 1.0.19
-%endif
-
-# fontpackages-1.21 has different behavior
-%if 0%{?fedora} >= 12
 Requires:      %{name}-fonts = %{version}-%{release}
-%else
-Requires:      %{name}-%{fontfamilyname}-fonts = %{version}-%{release}
-%endif
+Requires:      soundfont2-default
+# For scripting
+Requires:      qtscriptbindings
+
 
 # Doxygen documentation is huge and it is for musescore development only. 
 # Hence we don't build it for now. Otherwise it needs:
 # BuildRequires: graphviz doxygen texlive-latex texlive-dvips
 
-# On Fedora < 11 there is no default soundfont
-%if 0%{?fedora} >= 11
-Requires:      soundfont2-default
-%else
-Requires:      PersonalCopy-Lite-soundfont
-%endif
-
-# For scripting
-Requires:      qtscriptbindings
-
 Provides:      musescore = %{name}-%{version}-%{release}
 
 %description
@@ -101,19 +76,22 @@ highlights:
     * Import and export of MusicXML and Standard MIDI Files (SMF)
     * Available in 12 languages
 
-# fontpackages-1.21 has different behavior
-%package %{fontpackagename}
+%package fonts
 Summary:       MuseScore fonts
 Group:         User Interface/X
 License:       GPL+ with exceptions and OFL
 Requires:      fontpackages-filesystem
-%if "%{fontpackagename}" == "fonts"
+BuildArch:     noarch
+BuildRequires: fontforge
+BuildRequires: fontpackages-devel
+BuildRequires: t1utils
+BuildRequires: texlive
+BuildRequires: tex-cm-lgc
 # Note: this line should be updated carefully on each update:
-Obsoletes:     mscore-mscore-fonts < 0.9.5-1
+Obsoletes:     mscore-mscore-fonts < 0.9.5-2
 Provides:      mscore-mscore-fonts = %{version}-%{release}
-%endif
 
-%description %{fontpackagename}
+%description fonts
 MuseScore is a free cross platform WYSIWYG music notation program.
 
 This package contains the musical notation fonts for use of MuseScore.
@@ -121,20 +99,19 @@ This package contains the musical notati
 %prep
 %setup -q 
 
-%if 0%{?fedora} < 11
-%patch10 -p1 -b .pclite.soundfont
-%else
 %patch11 -p1 -b .default.soundfont
-%endif
 %patch1 -p1 -b .noawlplugin
 %patch2 -p1 -b .separatecommon
+%patch3 -p1 -b .arm
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
 
+
+
 # Force Fedora specific flags:
-find . -name CMakeLists.txt -exec sed -i 's|-O3|%{optflags}|' {} \;
-find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{optflags}|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-O3|%{buildflags} -fno-var-tracking-assignments|' {} \;
+find . -name CMakeLists.txt -exec sed -i 's|-fno-exceptions|%{buildflags} -fno-var-tracking-assignments|' {} \;
 
 # Do not build the bundled qt scripting interface:
 sed -i 's|scriptgen||' %{name}/CMakeLists.txt
@@ -153,11 +130,6 @@ rm -f %{name}/%{name}/fonts/*.ttf
 # Fix GenericName
 sed -i 's|GenericName=.*|GenericName=Music Score Typesetter|' %{name}/packaging/mscore.desktop
 
-# Fedora 10&11's libsndfile is too old :(
-%if 0%{?fedora} < 12
-sed -i 's|HAS_AUDIOFILE TRUE|HAS_AUDIOFILE FALSE|' %{name}/CMakeLists.txt
-%endif
-
 # Disable rpath
 sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
 
@@ -166,7 +138,7 @@ sed -i '/rpath/d' %{name}/%{name}/CMakeL
 mkdir build
 pushd build
    export PATH=${PATH}:%{_libdir}/qt4/bin
-   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
+   %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{buildflags}" ../mscore
    make lupdate %{?_smp_flags}
    make lrelease %{?_smp_flags}
    make %{?_smp_flags} VERBOSE=1
@@ -266,14 +238,17 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
-# fontpackages-1.21 has different behavior
-%if "%{fontpackagename}" == "fonts"
 %_font_pkg %{fontfamilyname}*.ttf
-%else
-%_font_pkg -n %{fontfamilyname} %{fontfamilyname}*.ttf
-%endif
+
 
 %changelog
+* Tue Dec 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-2
+- Add default soundfont support for exported audio files
+- Rebuild against new libsndfile for additional functionality
+- Drop F-10 related bits from specfile
+- Make fonts subpackage noarch
+- Fix build failure on arm architecture
+
 * Fri Aug 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.5-1
 - Update to 0.9.5
 


--- mscore-use-pclite-soundfont.patch DELETED ---


