4 files changed, 44 insertions, 29 deletions
diff --git a/audio/milkytracker/README b/audio/milkytracker/README
index f16c7e8551..b940d275bb 100644
--- a/audio/milkytracker/README
+++ b/audio/milkytracker/README
@@ -1,5 +1,4 @@
 This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create
 standard .MOD and .XM module files.
 
-JACK support is optional and can be added by doing:
-  JACK=yes ./milkytracker.SlackBuild
+lhasa is an optional dependency.
diff --git a/audio/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild
index 7f6841c8f1..fc2a020d71 100644
--- a/audio/milkytracker/milkytracker.SlackBuild
+++ b/audio/milkytracker/milkytracker.SlackBuild
@@ -24,13 +24,14 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=milkytracker
-VERSION=${VERSION:-0.90.86}
+SRCNAM=MilkyTracker
+VERSION=${VERSION:-1.02.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -60,34 +61,37 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $SRCNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -lasound" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --with-jack=${JACK:-no}
+# Thanks fedora
+patch -p1 < $CWD/sdlmain.patch
 
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    -DCMAKE_BUILD_TYPE=Release \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cp $CWD/milkytracker.desktop $PKG/usr/share/applications
 cp resources/pictures/carton.png $PKG/usr/share/pixmaps/milkytracker-icon-128.png
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info
index cdab01e8f0..d1ff04930b 100644
--- a/audio/milkytracker/milkytracker.info
+++ b/audio/milkytracker/milkytracker.info
@@ -1,10 +1,10 @@
 PRGNAM="milkytracker"
-VERSION="0.90.86"
+VERSION="1.02.00"
 HOMEPAGE="http://www.milkytracker.org/"
-DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2"
-MD5SUM="1ef462969cf54ba61748d4d878b5747e"
+DOWNLOAD="https://github.com/milkytracker/MilkyTracker/archive/v1.02.00/milkytracker-1.02.00.tar.gz"
+MD5SUM="ab4c881b8bbd41fde60823c191c7c6ce"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="zziplib"
+REQUIRES="jack-audio-connection-kit zziplib"
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
diff --git a/audio/milkytracker/sdlmain.patch b/audio/milkytracker/sdlmain.patch
new file mode 100644
index 0000000000..3917a062d6
--- /dev/null
+++ b/audio/milkytracker/sdlmain.patch
@@ -0,0 +1,12 @@
+diff -ru MilkyTracker-1.0.0/cmake/FindSDL2.cmake MilkyTracker-sdlmain/cmake/FindSDL2.cmake
+--- MilkyTracker-1.0.0/cmake/FindSDL2.cmake	2017-03-12 21:30:25.000000000 +0200
++++ MilkyTracker-sdlmain/cmake/FindSDL2.cmake	2017-03-19 20:23:15.773398294 +0200
+@@ -93,7 +93,7 @@
+ endif()
+ 
+ set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
++set(SDL2_LIBRARIES ${SDL2_LIBRARY})
+ 
+ include(FindPackageHandleStandardArgs)
+