4 files changed, 61 insertions, 46 deletions
diff --git a/multimedia/MuseScore/MuseScore.SlackBuild b/multimedia/MuseScore/MuseScore.SlackBuild
index cdbf20d539..e4a512fbec 100644
--- a/multimedia/MuseScore/MuseScore.SlackBuild
+++ b/multimedia/MuseScore/MuseScore.SlackBuild
@@ -3,7 +3,7 @@
 # Maintained by Klaatu at member.fsf dot org
 
 PRGNAM=MuseScore
-VERSION=${VERSION:-3.0.4}
+VERSION=${VERSION:-3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -20,22 +20,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip -d $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -45,27 +29,55 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  #must hardcode arch or it fails as 32bit
-  sed -i 's|m32|m64|' ./CMakeLists.txt
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
-sed -i 's| qmake| qmake-qt5|' build/FindQt5.cmake
-make release PREFIX=/usr CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" LDFLAGS="-pthread"
-make install PREFIX=/usr DESTDIR=$PKG UPDATE_CACHE=FALSE
+set -e
 
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/* $PKG/usr/man/
-rm -rf $PKG/usr/share/man
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# Copy over sound files for installation.
+cp $CWD/MuseScore_General-License.md share/sound
+cp $CWD/MuseScore_General.sf3 share/sound
 
+# Turn off Qt crash reporter.  Option isn't available in Makefile,
+# so turn it off in CMakeLists.txt
+sed -i '/(BUILD_CRASH_REPORTER/s|ON)|OFF)|' CMakeLists.txt
+sed -i 's|share/man|man|' CMakeLists.txt
+#musescore doesn't like to build with webengine with qt4 installed
+#because the qmake finder finds the qt4 version. lets patch this
+sed -i 's/qmake)/qmake-qt5)/g' build/FindQt5.cmake
+make release \
+  PREFIX=/usr \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  LDFLAGS="-pthread" \
+  DOWNLOAD_SOUNDFONT=OFF \
+  USE_SYSTEM_FREETYPE=ON \
+  BUILD_WEBENGINE=ON \
+  VERBOSE=1
+make install \
+  -C build.release \
+  DESTDIR=$PKG \
+  UPDATE_CACHE=FALSE
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a  LICENSE.* README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/MuseScore/MuseScore.info b/multimedia/MuseScore/MuseScore.info
index 73752599f5..e03572ea59 100644
--- a/multimedia/MuseScore/MuseScore.info
+++ b/multimedia/MuseScore/MuseScore.info
@@ -1,10 +1,14 @@
 PRGNAM="MuseScore"
-VERSION="3.0.4"
+VERSION="3.2"
 HOMEPAGE="http://www.musescore.org/"
-DOWNLOAD="https://github.com/musescore/MuseScore/releases/download/v3.0.4/MuseScore-3.0.4.zip"
-MD5SUM="fc840dbbc8fb4564fad1ea00a4d22ae9"
+DOWNLOAD="https://github.com/musescore/MuseScore/archive/v3.2/MuseScore-3.2.tar.gz \
+          http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General.sf3 \
+          http://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/MuseScore_General-License.md"
+MD5SUM="f7b6a53fea406c0a0e90c12ee347c056 \
+        3e02cc70ae6df3077d0003bbcb95456c \
+        6ab9352030223f909bb36b8f067c7d26"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit jack-audio-connection-kit portaudio portmidi lame"
+REQUIRES="qt5-webkit jack2 lame portaudio portmidi"
 MAINTAINER="Klaatu"
 EMAIL="klaatu@member.fsf.org"
diff --git a/multimedia/MuseScore/README b/multimedia/MuseScore/README
index 5be5806add..26c3e9a318 100644
--- a/multimedia/MuseScore/README
+++ b/multimedia/MuseScore/README
@@ -1,12 +1,11 @@
-MuseScore is a free and open source cross-platform WYSIWYG music
-notation program. Its features include:
+MuseScore is a free cross platform WYSIWYG music notation
+program, licenced under GNU GPL. Features:
+  * WYSIWYG, notes are entered on a "virtual note sheet"
+  * unlimited number of staves
+  * up to four voices/staff
+  * easy and fast note entry with mouse, keyboard or midi
+  * integrated sequencer and FluidSynth software synthesizer
+  * import and export of MusicXml and standard midifiles (SMF)
+  * platform independent code for Linux, Windows and Mac
 
-* WYSIWYG, notes are entered on a "virtual note sheet"
-* Unlimited number of staves
-* Up to four voices/staff
-* Easy and fast note entry with mouse, keyboard or midi
-* Integrated sequencer and FluidSynth software synthesizer
-* Import and export of MusicXml and standard midifiles (SMF)
-* Platform independent code for Linux, Windows and Mac
-
-NOTE: You can replace jack-audio-connection-kit with jack2
+Optional dependency:  portaudio
diff --git a/multimedia/MuseScore/slack-desc b/multimedia/MuseScore/slack-desc
index eef687bd27..26d3afcfd3 100644
--- a/multimedia/MuseScore/slack-desc
+++ b/multimedia/MuseScore/slack-desc
@@ -8,12 +8,12 @@
          |-----handy-ruler------------------------------------------------------|
 MuseScore: MuseScore (WYSIWYG Music Score Typesetter)
 MuseScore:
-MuseScore: MuseScore is a free cross platform WYSIWYG music composition and
-MuseScore: notation program.
-MuseScore:
-MuseScore: It is licensed under the GNU GPL.
+MuseScore: MuseScore is a free cross platform WYSIWYG music notation program,
+MuseScore: licensed under GNU GPL.
 MuseScore:
 MuseScore: Homepage: http://www.musescore.org/
 MuseScore:
 MuseScore:
 MuseScore:
+MuseScore:
+MuseScore: