audio/portmidi: Updated for version 2.0.2.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 42 insertions, 98 deletions

diff --git a/audio/portmidi/README b/audio/portmidi/README
index f2660611fc..3cf119c996 100644
--- a/audio/portmidi/README
+++ b/audio/portmidi/README
@@ -1,3 +1,15 @@
 PortMidi is a computer library for real time input and output of
 MIDI data.  It is designed to be portable to many different operating
 systems.  PortMidi is part of the PortMusic project.
+
+OPTIONS:
+
+By default only the headers and libraries are installed.  To build the
+test programs:
+
+  PMTESTS=yes ./portmidi.SlackBuild
+
+The test programs are:
+
+fast fastrcv latency midiclock midithread midithru mm multivirtual qtest
+recvvirtual sendvirtual sysex testio virttest
diff --git a/audio/portmidi/portmidi-cmake.patch b/audio/portmidi/portmidi-cmake.patch
deleted file mode 100644
index 7c5f772f45..0000000000
--- a/audio/portmidi/portmidi-cmake.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -U 3 -H -d -r -N -- portmidi-old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.txt
---- portmidi-old/pm_common/CMakeLists.txt	2009-11-20 07:18:06.000000000 +0100
-+++ portmidi/pm_common/CMakeLists.txt	2010-10-17 20:02:53.278000042 +0200
-@@ -125,9 +125,9 @@
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-static pmjni
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- #  INSTALL(FILES portmidi.h ../porttime/porttime.h
--#    DESTINATION /usr/local/include)
-+#    DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
- endif(UNIX)
-diff -U 3 -H -d -r -N -- portmidi-old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
---- portmidi-old/pm_dylib/CMakeLists.txt	2009-11-20 06:41:09.000000000 +0100
-+++ portmidi/pm_dylib/CMakeLists.txt	2010-10-17 20:02:53.279000042 +0200
-@@ -59,7 +59,7 @@
- 
-     set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-     set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
--    set(INSTALL_NAME_DIR "/usr/local/lib")
-+    set(INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-     message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
-   else(APPLE)
-     # LINUX settings...
-@@ -120,8 +120,8 @@
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-   INSTALL(TARGETS portmidi-dynamic
--    LIBRARY DESTINATION /usr/local/lib
--    ARCHIVE DESTINATION /usr/local/lib)
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-   INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
--    DESTINATION /usr/local/include)
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
- endif(UNIX)
-diff -U 3 -H -d -r -N -- portmidi-old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
---- portmidi-old/pm_java/CMakeLists.txt	2009-11-04 16:20:44.000000000 +0100
-+++ portmidi/pm_java/CMakeLists.txt	2010-10-17 20:10:46.411000043 +0200
-@@ -39,9 +39,9 @@
- 
-     # install the libraries (Linux only)
-     INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
--      DESTINATION /usr/share/java)
-+      DESTINATION ${CMAKE_INSTALL_PREFIX}/share/java)
-     INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
--      DESTINATION /usr/local/bin)
-+      DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-   endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
diff --git a/audio/portmidi/portmidi.SlackBuild b/audio/portmidi/portmidi.SlackBuild
index 4a4c375a4a..fb64a9ce37 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:-1}
 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
diff --git a/audio/portmidi/portmidi.info b/audio/portmidi/portmidi.info
index bacb48b400..af5e2c8f60 100644
--- a/audio/portmidi/portmidi.info
+++ b/audio/portmidi/portmidi.info
@@ -1,10 +1,10 @@
 PRGNAM="portmidi"
-VERSION="217"
+VERSION="2.0.2"
 HOMEPAGE="http://portmedia.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/portmedia/portmidi-src-217.zip"
-MD5SUM="03f46fd3947e2ef4c8c465baaf832241"
+DOWNLOAD="https://downloads.sourceforge.net/project/portmedia/portmidi/v2.0.2/portmidi-v2.0.2.zip"
+MD5SUM="1bf08bbdb9f96175034908ca0cbf136b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jdk"
+REQUIRES=""
 MAINTAINER="David Woodfall"
 EMAIL="dave@slackbuilds.org"