update to hydrogen 0.9.6 (actual release.)

includes:
- fixes for NetBSD
- cppunit tests
- pulseaudio support (not yet enabled?)
- several new --options
- fixes for JACK support (this, and the NetBSD fixes remove all our
  local patches!)
- fixes for drumkit loading
- wants newer libarchive than NetBSD or pkgsrc have; use libtar for now
- updates to playlist support
- uses snprintf() over sprintf()
- better undo/redo support
- copy/paste support for particular notes

4 files changed, 20 insertions, 66 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 6432ef5efa6..c3628bf3747 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.43 2014/03/09 10:48:48 wiedi Exp $
+# $NetBSD: Makefile,v 1.44 2014/08/05 04:59:35 mrg Exp $
 
-DISTNAME=	hydrogen-0.9.6-beta3
-PKGNAME=	hydrogen-0.9.6.beta3
+DISTNAME=	0.9.6
+PKGNAME=	hydrogen-0.9.6
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/hydrogen-music/hydrogen/archive/
 
+# Hydrogen publishes files like "hydrogen-0.9.6/0.9.6.tar.gz"
+DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${PKGNAME}
+
 MAINTAINER=	mrg@eterna.com.au
 HOMEPAGE=	http://www.hydrogen-music.org/
 COMMENT=	Real time drum machine/sequencer
@@ -14,12 +18,17 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
 MAKE_ENV+=	QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
+#CONFIGURE_ENV+=	LADSPA_PATH=${BUILDLINK_PREFIX.ladspa}/lib/ladspa
 
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DWANT_OSS=ON
-CMAKE_ARGS+=	-DWANT_LIBARCHIVE=ON
 CMAKE_ARGS+=	-DWANT_JACK=OFF
 CMAKE_ARGS+=	-DWANT_LRDF=OFF
+# options.mk this, and ladspa.
+CMAKE_ARGS+=	-DWANT_PULSEAUDIO=OFF
+# NetBSD libarchive is old?
+CMAKE_ARGS+=	-DWANT_LIBARCHIVE=OFF
+CMAKE_ARGS+=	-DWANT_LIBTAR=ON
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,11 +40,13 @@ CMAKE_ARGS+=	-DWANT_ALSA=OFF
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-.include "../../archivers/libarchive/buildlink3.mk"
+.include "../../devel/libtar/buildlink3.mk"
 .if ${OPSYS} == "Linux"
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../audio/libsndfile/buildlink3.mk"
+#.include "../../audio/ladspa/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 68f2b2c115c..e3bb9137bf0 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.9 2014/04/19 14:46:52 joerg Exp $
+$NetBSD: distinfo,v 1.10 2014/08/05 04:59:35 mrg Exp $
 
-SHA1 (hydrogen-0.9.6-beta3.tar.gz) = 9d1f0b58e62ad5e14ca9ee9d2f38d68d2c1a2585
-RMD160 (hydrogen-0.9.6-beta3.tar.gz) = ecfd94480a5a1e70e587e242dea8e159f4bb0bbd
-Size (hydrogen-0.9.6-beta3.tar.gz) = 6217398 bytes
-SHA1 (patch-CMakeLists.txt) = 6055aacc17e38710c9b96783cfd6d5b7285bfb04
-SHA1 (patch-src_gui_src_PlayerControl.cpp) = 803dc5ee27f5e3f0124ab876116bbc1d0388d902
+SHA1 (hydrogen-0.9.6/0.9.6.tar.gz) = fc3587cef005e2332e2bd456ec39d32ff6a12dfa
+RMD160 (hydrogen-0.9.6/0.9.6.tar.gz) = 1fda76f464c52b76888b62b8fd222b07be489b86
+Size (hydrogen-0.9.6/0.9.6.tar.gz) = 6626513 bytes
diff --git a/audio/hydrogen/patches/patch-CMakeLists.txt b/audio/hydrogen/patches/patch-CMakeLists.txt
deleted file mode 100644
index 90a883df236..00000000000
--- a/audio/hydrogen/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/04/19 14:46:52 joerg Exp $
-
-look for -lossaudio on NetBSD.
-
---- CMakeLists.txt.orig	2013-02-21 18:53:51.000000000 +0000
-+++ CMakeLists.txt
-@@ -53,7 +53,11 @@ ELSE()
- 	OPTION(WANT_JACKSESSION "Enable use of Jack-Session-Handler" ON)
- ENDIF()
- 
--OPTION(WANT_OSS          "Include OSS (Open Sound System) support" OFF)
-+IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
-+	OPTION(WANT_OSS          "Include OSS (Open Sound System) support" ON)
-+ELSE()
-+	OPTION(WANT_OSS          "Include OSS (Open Sound System) support" OFF)
-+ENDIF()
- OPTION(WANT_ALSA         "Include ALSA (Advanced Linux Sound Architecture) support" ON)
- OPTION(WANT_JACK         "Include JACK (Jack Audio Connection Kit) support" ON)
- OPTION(WANT_PORTAUDIO    "Include PortAudio support" OFF)
-@@ -88,7 +92,7 @@ ELSE()
- ENDIF()
- 
- #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining")
--SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines")
-+SET(CMAKE_CXX_FLAGS "-O2")
- SET(CMAKE_CXX_FLAGS_RELEASE "")
- SET(CMAKE_CXX_FLAGS_DEBUG "-g ")#-Winline")
- 
-@@ -159,7 +163,11 @@ ENDIF()
- FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
- FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
- FIND_LADSPA(LADSPA ladspa.h noise)
--FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
-+IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
-+    FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
-+ELSE()
-+    FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
-+ENDIF()
- FIND_HELPER(JACK jack jack/jack.h jack)
- FIND_HELPER(JACKSESSION jack jack/session.h jack)
- IF(APPLE)
diff --git a/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp b/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp
deleted file mode 100644
index d7a07a19a02..00000000000
--- a/audio/hydrogen/patches/patch-src_gui_src_PlayerControl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_gui_src_PlayerControl.cpp,v 1.1 2014/03/06 10:16:15 mrg Exp $
-
---- src/gui/src/PlayerControl.cpp.orig	2013-02-21 10:53:51.000000000 -0800
-+++ src/gui/src/PlayerControl.cpp	2014-03-06 00:47:13.000000000 -0800
-@@ -624,7 +624,8 @@
- 
- 	// time
- 	float fFrames = m_pEngine->getAudioOutput()->m_transport.m_nFrames;
--	if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT )
-+	if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT &&
-+	     Preferences::get_instance()->m_bJackMasterMode != Preferences::NO_JACK_TIME_MASTER )
- 		fFrames =  m_pEngine->getHumantimeFrames();
- 	float fSampleRate = m_pEngine->getAudioOutput()->getSampleRate();
- 	if ( fSampleRate != 0 ) {