1 files changed, 26 insertions, 39 deletions
diff --git a/audio/portmidi/portmidi.SlackBuild b/audio/portmidi/portmidi.SlackBuild
index 4a4c375a4a..89751050e2 100644
--- a/audio/portmidi/portmidi.SlackBuild
+++ b/audio/portmidi/portmidi.SlackBuild
@@ -27,8 +27,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=portmidi
-VERSION=${VERSION:-217}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-2.0.2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -72,7 +72,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr/lib$LIBDIRSUFFIX $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-unzip $CWD/$PRGNAM-src-$VERSION.zip
+unzip $CWD/$PRGNAM-v$VERSION.zip
 cd $PRGNAM
 
 chown -R root:root .
@@ -82,50 +82,37 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# cmake install dir & 64 bit fixes
-patch --verbose -p1 -i $CWD/portmidi-cmake.patch
-
-cmake . \
-  -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-  -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$PKG/usr/bin \
-  -DJAVA_AWT_INCLUDE_PATH="/usr/lib$LIBDIRSUFFIX/java/include" \
-  -DJAVA_INCLUDE_PATH="/usr/lib$LIBDIRSUFFIX/java/include" \
-  -DJAVA_INCLUDE_PATH2="/usr/lib$LIBDIRSUFFIX/java/include/linux" \
-  -DCMAKE_CACHEFILE_DIR=$(pwd) \
-  -DJAVA_JVM_LIBRARY="/usr/lib$LIBDIRSUFFIX/libjvm.so"
-
-# some wrong paths expose with openjdk, fix them
-# https://bugs.archlinux.org/task/29214
-sed -i "s|pm_java/pm_java|pm_java|" pm_java/CMakeFiles/pmdefaults_target.dir/build.make
-
-make all \
-  CFLAGS="$SLKCFLAGS" \
-  PMFLAGS="-DNEWBUFFER" -j1
-make install DESTDIR=$PKG
-
-cd $PKG/usr/lib$LIBDIRSUFFIX
-  rm -f libportmidi_s.a
-  ln -s libportmidi.so libporttime.so
-cd -
-
-# I think this may cause problems unless it's renamed
-mv $PKG/usr/bin/test $PKG/usr/bin/portmiditest
+[ "${PMTESTS:-no}" = yes ] && pmtests=ON || pmtests=OFF
 
-install -m 0644 -D pm_common/pmutil.h $PKG/usr/include
-install -m 0644 -D $CWD/pmdefaults.desktop $PKG/usr/share/applications/pmdefaults.desktop
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=$PKG/usr/bin \
+    -DBUILD_PORTMIDI_TESTS=$pmtests \
+    -DCMAKE_CACHEFILE_DIR=$(pwd) \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  make \
+    CFLAGS="$SLKCFLAGS" \
+    CXXFLAGS="$SLKCFLAGS" \
+    PMFLAGS="-DNEWBUFFER" -j1
 
-install -m 0644 -D pm_java/pmdefaults/pmdefaults-icon.png \
-    $PKG/usr/share/icons/hicolor/128x128/apps/pmdefaults-icon.png
+  make install DESTDIR=$PKG
+cd ..
+
+install -m 0644 -D pm_common/pmutil.h $PKG/usr/include
 
 find $PKG | xargs 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
-cp -a CHANGELOG.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.txt README.txt license.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/README.txt
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc