hydrogen: Update to 1.0.0-beta1

Switch to qt5.

"please ship it if it works" - kamil

6 files changed, 262 insertions, 289 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 8fe36c5d84b..a09edffde82 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,59 +1,47 @@
-# $NetBSD: Makefile,v 1.55 2018/03/12 11:16:03 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2019/10/26 21:24:34 nia Exp $
 
-DISTNAME=	Hydrogen-0.9.7
-PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	1
+DISTNAME=	Hydrogen-1.0.0-beta1
+PKGNAME=	${DISTNAME:tl:C/-beta/.beta/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=hydrogen-music/}
 GITHUB_PROJECT=	Hydrogen
-GITHUB_TAG=	${PKGVERSION_NOREV}
+GITHUB_TAG=	${PKGVERSION_NOREV:C/.beta/-beta/}
 
 MAINTAINER=	mrg@eterna.com.au
-HOMEPAGE=	http://www.hydrogen-music.org/
+HOMEPAGE=	http://hydrogen-music.org/
 COMMENT=	Real time drum machine/sequencer
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/.beta/-beta/}
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
+USE_LANGUAGES=	c gnu++11
+USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 
-MAKE_ENV+=	QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
-#CONFIGURE_ENV+=	LADSPA_PATH=${BUILDLINK_PREFIX.ladspa}/lib/ladspa
+# C++11
+GCC_REQD+=	4.7
 
-USE_CMAKE=	yes
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
 CMAKE_ARGS+=	-DWANT_OSS=ON
-CMAKE_ARGS+=	-DWANT_JACK=OFF
-CMAKE_ARGS+=	-DWANT_LRDF=OFF
-# options.mk this, and ladspa.
-CMAKE_ARGS+=	-DWANT_PULSEAUDIO=OFF
+.else
+CMAKE_ARGS+=	-DWANT_OSS=OFF
+.endif
+
+CMAKE_ARGS+=	-DWANT_CPPUNIT=OFF
+
 # NetBSD libarchive is old?
 CMAKE_ARGS+=	-DWANT_LIBARCHIVE=OFF
 CMAKE_ARGS+=	-DWANT_LIBTAR=ON
-CMAKE_ARGS+=	-DPKGMANDIR=${PKGMANDIR}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-CMAKE_ARGS+=	-DWANT_ALSA=ON
-.else
-CMAKE_ARGS+=	-DWANT_ALSA=OFF
-.endif
 
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
+.include "options.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 "../../audio/liblo/buildlink3.mk"
+.include "../../audio/ladspa/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/hydrogen/PLIST b/audio/hydrogen/PLIST
index 49bfa41e4df..6cbb5c29c8c 100644
--- a/audio/hydrogen/PLIST
+++ b/audio/hydrogen/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2016/11/30 12:34:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/10/26 21:24:34 nia Exp $
 bin/h2cli
 bin/h2player
-bin/h2synth
 bin/hydrogen
 include/hydrogen/IO/AlsaAudioDriver.h
 include/hydrogen/IO/AlsaMidiDriver.h
@@ -10,8 +9,8 @@ include/hydrogen/IO/CoreAudioDriver.h
 include/hydrogen/IO/CoreMidiDriver.h
 include/hydrogen/IO/DiskWriterDriver.h
 include/hydrogen/IO/FakeDriver.h
+include/hydrogen/IO/JackAudioDriver.h
 include/hydrogen/IO/JackMidiDriver.h
-include/hydrogen/IO/JackOutput.h
 include/hydrogen/IO/MidiCommon.h
 include/hydrogen/IO/MidiInput.h
 include/hydrogen/IO/MidiOutput.h
@@ -25,7 +24,9 @@ include/hydrogen/LashClient.h
 include/hydrogen/LocalFileMng.h
 include/hydrogen/Preferences.h
 include/hydrogen/audio_engine.h
+include/hydrogen/automation_path_serializer.h
 include/hydrogen/basics/adsr.h
+include/hydrogen/basics/automation_path.h
 include/hydrogen/basics/drumkit.h
 include/hydrogen/basics/drumkit_component.h
 include/hydrogen/basics/instrument.h
@@ -38,6 +39,7 @@ include/hydrogen/basics/pattern_list.h
 include/hydrogen/basics/sample.h
 include/hydrogen/basics/song.h
 include/hydrogen/config.h
+include/hydrogen/core_action_controller.h
 include/hydrogen/event_queue.h
 include/hydrogen/fx/Effects.h
 include/hydrogen/fx/LadspaFX.h
@@ -55,6 +57,7 @@ include/hydrogen/midi_map.h
 include/hydrogen/nsm.h
 include/hydrogen/nsm_client.h
 include/hydrogen/object.h
+include/hydrogen/osc_server.h
 include/hydrogen/playlist.h
 include/hydrogen/rt_clock.h
 include/hydrogen/sampler/Sampler.h
@@ -64,7 +67,7 @@ include/hydrogen/synth/Synth.h
 include/hydrogen/timehelper.h
 include/hydrogen/timeline.h
 include/hydrogen/version.h
-lib/libhydrogen-core-${PKGVERSION}.so
+lib/libhydrogen-core-1.0.0.so
 man/man1/hydrogen.1
 share/appdata/hydrogen.appdata.xml
 share/applications/hydrogen.desktop
@@ -77,224 +80,83 @@ share/hydrogen/data/demo_songs/GM_kit_demo2.h2song
 share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
 share/hydrogen/data/demo_songs/TR808kit-demo.h2song
 share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
-share/hydrogen/data/doc/Makefile
-share/hydrogen/data/doc/MidiInstrumentMapping.ods
-share/hydrogen/data/doc/README.DOCUMENTATION.txt
-share/hydrogen/data/doc/TODO
-share/hydrogen/data/doc/img/AudioEngineInfoDialog.png
-share/hydrogen/data/doc/img/CreateNewPattern.png
-share/hydrogen/data/doc/img/Downloading_SoundLibrary.png
-share/hydrogen/data/doc/img/DrumkitExport.png
-share/hydrogen/data/doc/img/DrumkitImport.png
-share/hydrogen/data/doc/img/DrumkitLoad.png
-share/hydrogen/data/doc/img/DrumkitSave.png
-share/hydrogen/data/doc/img/Export_song.png
-share/hydrogen/data/doc/img/FX_send_knobs.png
-share/hydrogen/data/doc/img/GUI_Sections_0.9.5.png
-share/hydrogen/data/doc/img/GUI_Sections_0.9.5_v2.png
-share/hydrogen/data/doc/img/HearNewNotes.png
-share/hydrogen/data/doc/img/Hydrogen_0.9.5_gui.png
-share/hydrogen/data/doc/img/InstrumentMapping.png
-share/hydrogen/data/doc/img/Instrument_General.png
-share/hydrogen/data/doc/img/Instrument_Layers.png
-share/hydrogen/data/doc/img/JackTrans_Master.png
-share/hydrogen/data/doc/img/LADSPA_FX_Properties.png
-share/hydrogen/data/doc/img/MainControls_Rubberband_btn.png
-share/hydrogen/data/doc/img/MainModePattern.png
-share/hydrogen/data/doc/img/MainModeSong.png
-share/hydrogen/data/doc/img/MainPlay.png
-share/hydrogen/data/doc/img/MainRecord.png
-share/hydrogen/data/doc/img/MainStop.png
-share/hydrogen/data/doc/img/MainToolbar.png
-share/hydrogen/data/doc/img/MainToolbar_V2.png
-share/hydrogen/data/doc/img/MainUI_tabbed.png
-share/hydrogen/data/doc/img/MeasureSettings.png
-share/hydrogen/data/doc/img/MidiIN_CPU.png
-share/hydrogen/data/doc/img/Midi_Actions.png
-share/hydrogen/data/doc/img/Mixer.png
-share/hydrogen/data/doc/img/MixerDelay.png
-share/hydrogen/data/doc/img/MixerFX.png
-share/hydrogen/data/doc/img/MixerFXButton.png
-share/hydrogen/data/doc/img/MixerFXEdit.png
-share/hydrogen/data/doc/img/MixerFXEditButton.png
-share/hydrogen/data/doc/img/MixerFXKnob.png
-share/hydrogen/data/doc/img/MixerFXSelect.png
-share/hydrogen/data/doc/img/MixerLED.png
-share/hydrogen/data/doc/img/MixerLoadSample.png
-share/hydrogen/data/doc/img/MixerMute.png
-share/hydrogen/data/doc/img/MixerPan.png
-share/hydrogen/data/doc/img/MixerPlayTest.png
-share/hydrogen/data/doc/img/MixerSolo.png
-share/hydrogen/data/doc/img/MovePatternDown.png
-share/hydrogen/data/doc/img/MovePatternUp.png
-share/hydrogen/data/doc/img/NoteKey.png
-share/hydrogen/data/doc/img/NoteOff_NoteLength.png
-share/hydrogen/data/doc/img/PatternEditor.png
-share/hydrogen/data/doc/img/PatternEditorButtons.png
-share/hydrogen/data/doc/img/PatternEditorControls.png
-share/hydrogen/data/doc/img/PatternEditorDownUp.png
-share/hydrogen/data/doc/img/PatternEditorInstr.png
-share/hydrogen/data/doc/img/PatternEditorInstr_V2.png
-share/hydrogen/data/doc/img/PatternEditorPattern.png
-share/hydrogen/data/doc/img/PatternEditorRecording.png
-share/hydrogen/data/doc/img/PatternEditorSizeRes.png
-share/hydrogen/data/doc/img/PatternEditor_DrumMode.png
-share/hydrogen/data/doc/img/PatternEditor_PianoMode.png
-share/hydrogen/data/doc/img/PreferencesAppearance.png
-share/hydrogen/data/doc/img/PreferencesAppearance_V2.png
-share/hydrogen/data/doc/img/PreferencesAudioSystem.png
-share/hydrogen/data/doc/img/PreferencesAudioSystem_V2.png
-share/hydrogen/data/doc/img/PreferencesAudioSystem_V3.png
-share/hydrogen/data/doc/img/PreferencesGeneral.png
-share/hydrogen/data/doc/img/PreferencesGeneral_V2.png
-share/hydrogen/data/doc/img/PreferencesGeneral_V3.png
-share/hydrogen/data/doc/img/PreferencesMidiSystem.png
-share/hydrogen/data/doc/img/PreferencesMidiSystem_V2.png
-share/hydrogen/data/doc/img/Rec_button.png
-share/hydrogen/data/doc/img/Res.png
-share/hydrogen/data/doc/img/SampleEditor.png
-share/hydrogen/data/doc/img/SampleEditor_V5.png
-share/hydrogen/data/doc/img/SongEditor.png
-share/hydrogen/data/doc/img/SongEditorAddLayer.png
-share/hydrogen/data/doc/img/SongEditorButtons.png
-share/hydrogen/data/doc/img/SongEditorInsertMode.png
-share/hydrogen/data/doc/img/SongEditorLayerClear.png
-share/hydrogen/data/doc/img/SongEditorLayerDownUp.png
-share/hydrogen/data/doc/img/SongEditorSelectInsertMode.png
-share/hydrogen/data/doc/img/SongEditorSelectMode.png
-share/hydrogen/data/doc/img/SongLoop.png
-share/hydrogen/data/doc/img/SongOperations.png
-share/hydrogen/data/doc/img/SoundLibrary.png
-share/hydrogen/data/doc/img/Sound_Library_import.png
-share/hydrogen/data/doc/img/SoundlibraryHierarchy_V3.png
-share/hydrogen/data/doc/img/SoundlibraryHierarchy_V4.png
-share/hydrogen/data/doc/img/Tutorial2.h2song
-share/hydrogen/data/doc/img/TutorialEnd.png
-share/hydrogen/data/doc/img/TutorialStart.png
-share/hydrogen/data/doc/img/Virtual_patterns_menu.png
-share/hydrogen/data/doc/img/add_tag.png
-share/hydrogen/data/doc/img/add_tempo_change.png
-share/hydrogen/data/doc/img/background_BPM.png
-share/hydrogen/data/doc/img/background_Control.png
-share/hydrogen/data/doc/img/background_Control_V2.png
-share/hydrogen/data/doc/img/background_Load.png
-share/hydrogen/data/doc/img/background_Mode.png
-share/hydrogen/data/doc/img/bg_topPanel.png
-share/hydrogen/data/doc/img/bpm.png
-share/hydrogen/data/doc/img/btn_clear_off.png
-share/hydrogen/data/doc/img/btn_draw.png
-share/hydrogen/data/doc/img/btn_edit_on.png
-share/hydrogen/data/doc/img/btn_hear.png
-share/hydrogen/data/doc/img/btn_hear_on.png
-share/hydrogen/data/doc/img/btn_live_on.png
-share/hydrogen/data/doc/img/btn_loop_on.png
-share/hydrogen/data/doc/img/btn_mute_on.png
-share/hydrogen/data/doc/img/btn_new_on.png
-share/hydrogen/data/doc/img/btn_on_on.png
-share/hydrogen/data/doc/img/btn_pattern_mode.png
-share/hydrogen/data/doc/img/btn_play_on.png
-share/hydrogen/data/doc/img/btn_play_on_mixer.png
-share/hydrogen/data/doc/img/btn_quant_off.png
-share/hydrogen/data/doc/img/btn_quant_on.png
-share/hydrogen/data/doc/img/btn_quant_over.png
-share/hydrogen/data/doc/img/btn_record_off.png
-share/hydrogen/data/doc/img/btn_record_over.png
-share/hydrogen/data/doc/img/btn_select.png
-share/hydrogen/data/doc/img/btn_select_off.png
-share/hydrogen/data/doc/img/btn_select_on.png
-share/hydrogen/data/doc/img/btn_solo_on.png
-share/hydrogen/data/doc/img/btn_song_on.png
-share/hydrogen/data/doc/img/btn_stop_on.png
-share/hydrogen/data/doc/img/btn_updown.png
-share/hydrogen/data/doc/img/bypass_on.png
-share/hydrogen/data/doc/img/bypass_over.png
-share/hydrogen/data/doc/img/cpuload.png
-share/hydrogen/data/doc/img/downBtn_on.png
-share/hydrogen/data/doc/img/edit_off.png
-share/hydrogen/data/doc/img/fill_clear_pattern.png
-share/hydrogen/data/doc/img/hearBtn_on.png
-share/hydrogen/data/doc/img/instr_ed0.png
-share/hydrogen/data/doc/img/instr_ed1.png
-share/hydrogen/data/doc/img/item_selected.png
-share/hydrogen/data/doc/img/jack_transport.png
-share/hydrogen/data/doc/img/midi_in.png
-share/hydrogen/data/doc/img/mixer-instrrack_btn.png
-share/hydrogen/data/doc/img/newPatternBtn_on.png
-share/hydrogen/data/doc/img/nl/DrumkitExport.png
-share/hydrogen/data/doc/img/nl/DrumkitImport.png
-share/hydrogen/data/doc/img/nl/DrumkitLoad.png
-share/hydrogen/data/doc/img/nl/DrumkitSave.png
-share/hydrogen/data/doc/img/nl/InstrumentEditorInstrument.png
-share/hydrogen/data/doc/img/nl/InstrumentEditorLayer.png
-share/hydrogen/data/doc/img/nl/Mixer.png
-share/hydrogen/data/doc/img/nl/MixerFX.png
-share/hydrogen/data/doc/img/nl/MixerFXEdit.png
-share/hydrogen/data/doc/img/nl/MixerFXSelect.png
-share/hydrogen/data/doc/img/nl/PatternEditor.png
-share/hydrogen/data/doc/img/nl/PreferencesAppearance.png
-share/hydrogen/data/doc/img/nl/PreferencesAudioSystem.png
-share/hydrogen/data/doc/img/nl/PreferencesMidiSystem.png
-share/hydrogen/data/doc/img/nl/SongEditor.png
-share/hydrogen/data/doc/img/nl/SongEditorInsertMode.png
-share/hydrogen/data/doc/img/nl/SongEditorSelectMode.png
-share/hydrogen/data/doc/img/nl/SongEditorSelectModeCopy.png
-share/hydrogen/data/doc/img/pattern_properties.png
-share/hydrogen/data/doc/img/quantBtn_off.png
-share/hydrogen/data/doc/img/quantBtn_on.png
-share/hydrogen/data/doc/img/recBtn_on.png
-share/hydrogen/data/doc/img/screenshot-director.png
-share/hydrogen/data/doc/img/showFX_on.png
-share/hydrogen/data/doc/img/showPeaks_on.png
-share/hydrogen/data/doc/img/songFuncBtn_on.png
-share/hydrogen/data/doc/img/stacked_mode_V3.png
-share/hydrogen/data/doc/img/tag_bar.png
-share/hydrogen/data/doc/img/tastiera.png
-share/hydrogen/data/doc/img/tempo_bar.png
-share/hydrogen/data/doc/img/upBtn_on.png
-share/hydrogen/data/doc/img_tutorial/Bridge1_4th.png
-share/hydrogen/data/doc/img_tutorial/Bridge3_3a_hh.png
-share/hydrogen/data/doc/img_tutorial/C3_6+7.png
-share/hydrogen/data/doc/img_tutorial/Intro4th.png
-share/hydrogen/data/doc/img_tutorial/PatternBase1.png
-share/hydrogen/data/doc/img_tutorial/PatternBase2.png
-share/hydrogen/data/doc/img_tutorial/Riff1b.png
-share/hydrogen/data/doc/img_tutorial/Riff1c.png
-share/hydrogen/data/doc/img_tutorial/Riff1d.png
-share/hydrogen/data/doc/img_tutorial/Verse8th.png
-share/hydrogen/data/doc/img_tutorial/VerseAll.png
-share/hydrogen/data/doc/img_tutorial/VerseBridge.png
-share/hydrogen/data/doc/img_tutorial/VerseBridge_hh.png
-share/hydrogen/data/doc/manual.docbook
-share/hydrogen/data/doc/manual.html
-share/hydrogen/data/doc/manual.pot
-share/hydrogen/data/doc/manual_ca.po
-share/hydrogen/data/doc/manual_en.html
-share/hydrogen/data/doc/manual_es.po
-share/hydrogen/data/doc/manual_fr.po
-share/hydrogen/data/doc/manual_it.po
-share/hydrogen/data/doc/manual_nl.po
-share/hydrogen/data/doc/tutorial.docbook
-share/hydrogen/data/doc/tutorial.pot
-share/hydrogen/data/doc/tutorial_fr.po
-share/hydrogen/data/doc/tutorial_it.po
-share/hydrogen/data/drumkits/GMkit/clap_Dry_c.flac
-share/hydrogen/data/drumkits/GMkit/cra_Jazz.flac
-share/hydrogen/data/drumkits/GMkit/cra_Rock_a.flac
-share/hydrogen/data/drumkits/GMkit/cym_Jazz.flac
-share/hydrogen/data/drumkits/GMkit/cym_Rock_b.flac
-share/hydrogen/data/drumkits/GMkit/drumkit.xml
-share/hydrogen/data/drumkits/GMkit/emptySample.flac
-share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.flac
-share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.flac
-share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.flac
-share/hydrogen/data/drumkits/GMkit/kick_Dry_b.flac
-share/hydrogen/data/drumkits/GMkit/misc_Cowbell.flac
-share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.flac
-share/hydrogen/data/drumkits/GMkit/sn_Wet_b.flac
-share/hydrogen/data/drumkits/GMkit/stick_Woody.flac
-share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.flac
-share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.flac
-share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.flac
+share/hydrogen/data/drumkits/GMRockKit/24Ride-1.wav
+share/hydrogen/data/drumkits/GMRockKit/24Ride-2.wav
+share/hydrogen/data/drumkits/GMRockKit/24Ride-3.wav
+share/hydrogen/data/drumkits/GMRockKit/24Ride-4.wav
+share/hydrogen/data/drumkits/GMRockKit/24Ride-5.wav
+share/hydrogen/data/drumkits/GMRockKit/Cowbell-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Cowbell-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Cowbell-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Cowbell-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Cowbell-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Crash-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Crash-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Crash-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Crash-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Crash-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/HandClap.wav
+share/hydrogen/data/drumkits/GMRockKit/HatClosed-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/HatClosed-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatClosed-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/HatClosed-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/HatClosed-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatOpen-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/HatOpen-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatOpen-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/HatOpen-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/HatOpen-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatPedal-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/HatPedal-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatPedal-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/HatPedal-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/HatPedal-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Kick-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Kick-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Kick-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Kick-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Kick-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Ride-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Ride-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Ride-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Ride-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Ride-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/SideStick-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/SideStick-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/SideStick-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/SideStick-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/SideStick-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Snare-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Snare-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Snare-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Snare-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Snare-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/SnareRimshot-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/SnareRimshot-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/SnareRimshot-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/SnareRimshot-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/SnareRimshot-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Splash-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Splash-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Splash-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Splash-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Splash-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom1-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom1-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom1-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom1-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom1-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom2-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom2-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom2-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom2-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Tom2-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/TomFloor-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/TomFloor-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/TomFloor-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/TomFloor-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/TomFloor-Softest.wav
+share/hydrogen/data/drumkits/GMRockKit/drumkit.xml
 share/hydrogen/data/drumkits/TR808EmulationKit/808_Clap.flac
 share/hydrogen/data/drumkits/TR808EmulationKit/808_Clave.flac
 share/hydrogen/data/drumkits/TR808EmulationKit/808_Conga.flac
@@ -348,6 +210,8 @@ share/hydrogen/data/i18n/hydrogen.sr.qm
 share/hydrogen/data/i18n/hydrogen.sr.ts
 share/hydrogen/data/i18n/hydrogen.sv.qm
 share/hydrogen/data/i18n/hydrogen.sv.ts
+share/hydrogen/data/i18n/hydrogen.uk.qm
+share/hydrogen/data/i18n/hydrogen.uk.ts
 share/hydrogen/data/i18n/stats.py
 share/hydrogen/data/i18n/updateTranslations.sh
 share/hydrogen/data/img/gray/about/aboutLogo.png
@@ -401,7 +265,6 @@ share/hydrogen/data/img/gray/lcd/LCDSpinBox_down_over.png
 share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_off.png
 share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_on.png
 share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_over.png
-share/hydrogen/data/img/gray/mdiBackground.png
 share/hydrogen/data/img/gray/mixerPanel/background_FX.png
 share/hydrogen/data/img/gray/mixerPanel/btn_edit_off.png
 share/hydrogen/data/img/gray/mixerPanel/btn_edit_on.png
@@ -459,11 +322,8 @@ share/hydrogen/data/img/gray/mixerPanel/showPeaks_on.png
 share/hydrogen/data/img/gray/mixerPanel/showPeaks_over.png
 share/hydrogen/data/img/gray/patternEditor/background_channel.png
 share/hydrogen/data/img/gray/patternEditor/background_rec-new.png
-share/hydrogen/data/img/gray/patternEditor/background_rec.png
 share/hydrogen/data/img/gray/patternEditor/background_res-new.png
-share/hydrogen/data/img/gray/patternEditor/background_res.png
 share/hydrogen/data/img/gray/patternEditor/background_zoom-new.png
-share/hydrogen/data/img/gray/patternEditor/background_zoom.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_off.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_on.png
 share/hydrogen/data/img/gray/patternEditor/btn_dropdown_over.png
@@ -604,12 +464,20 @@ share/hydrogen/data/img/gray/songEditor/btn_select_over.png
 share/hydrogen/data/img/gray/songEditor/btn_up_off.png
 share/hydrogen/data/img/gray/songEditor/btn_up_on.png
 share/hydrogen/data/img/gray/songEditor/btn_up_over.png
+share/hydrogen/data/img/gray/songEditor/btn_viewPL_off.png
+share/hydrogen/data/img/gray/songEditor/btn_viewPL_on.png
+share/hydrogen/data/img/gray/songEditor/btn_viewPL_over.png
+share/hydrogen/data/img/gray/songEditor/btn_viewTL_off.png
+share/hydrogen/data/img/gray/songEditor/btn_viewTL_on.png
+share/hydrogen/data/img/gray/songEditor/btn_viewTL_over.png
 share/hydrogen/data/img/gray/songEditor/playingPattern_off.png
 share/hydrogen/data/img/gray/songEditor/playingPattern_on.png
 share/hydrogen/data/img/gray/songEditor/songEditorLabelABG.png
 share/hydrogen/data/img/gray/songEditor/songEditorLabelBG.png
 share/hydrogen/data/img/gray/songEditor/songEditorLabelSBG.png
 share/hydrogen/data/img/gray/splash/splash.png
+share/hydrogen/data/img/gray/warning.png
+share/hydrogen/data/img/gray/warning.svg
 share/hydrogen/data/img/gray/waveDisplay/background.png
 share/hydrogen/data/img/gray/waveDisplay/bgsamplewavedisplay.png
 share/hydrogen/data/img/gray/waveDisplay/detailsamplewavedisplay.png
@@ -634,3 +502,5 @@ share/hydrogen/data/new_tutorial/img_tutorial/warn.png
 share/hydrogen/data/new_tutorial/tutorial_en.html
 share/hydrogen/data/xsd/drumkit.xsd
 share/hydrogen/data/xsd/drumkit_pattern.xsd
+share/pixmaps/h2-icon.svg
+@pkgdir share/hydrogen/data/doc
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index e91a2f16760..f11304a80eb 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2017/06/28 09:44:43 wiedi Exp $
+$NetBSD: distinfo,v 1.18 2019/10/26 21:24:34 nia Exp $
 
-SHA1 (Hydrogen-0.9.7.tar.gz) = 016c5427d0598f933f0975d6d25434736ba0a0b6
-RMD160 (Hydrogen-0.9.7.tar.gz) = 87d2bed2ef1fd84e5cb9bcfc4a89b40818610ce0
-SHA512 (Hydrogen-0.9.7.tar.gz) = 1480a18d1181d12e92a53e89a4d1c8f4ae9a8a9a02271e6af4089afaaca9d658abb3876dc7db08a453bbe3ab7f66f31567d992f30102818782b62ebba5141f58
-Size (Hydrogen-0.9.7.tar.gz) = 6424575 bytes
-SHA1 (patch-CMakeLists.txt) = 1cece0d6151fd5b7e00ba41e710d52dea9ed0ee6
-SHA1 (patch-src_core_src_logger.cpp) = 27c778a352b917a4a33eeab87b0855a631da471b
+SHA1 (Hydrogen-1.0.0-beta1.tar.gz) = 72caed8b4765e0371c2831b59715b8e4d4879f27
+RMD160 (Hydrogen-1.0.0-beta1.tar.gz) = f21635a71aa4c9607140e55a18035c0bfb70e50a
+SHA512 (Hydrogen-1.0.0-beta1.tar.gz) = 73963a9f400a4d9f6faca41f5f9af2c4b00ebefb16f394a78fe81f7aacb23acee49633803a484e91705da01cb59b4699133f618fac34f6caa7734bcc67bf4518
+Size (Hydrogen-1.0.0-beta1.tar.gz) = 9864135 bytes
+SHA1 (patch-CMakeLists.txt) = 574dbe7406cc24b6884292e2cd9557e569a5ba2f
diff --git a/audio/hydrogen/options.mk b/audio/hydrogen/options.mk
new file mode 100644
index 00000000000..62ea2139c90
--- /dev/null
+++ b/audio/hydrogen/options.mk
@@ -0,0 +1,43 @@
+# $NetBSD: options.mk,v 1.1 2019/10/26 21:24:34 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.hydrogen
+
+PKG_SUPPORTED_OPTIONS+=		alsa jack portaudio pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none"
+PKG_SUGGESTED_OPTIONS+=		portaudio
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CMAKE_ARGS+=	-DWANT_ALSA=ON
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_ALSA=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mjack)
+CMAKE_ARGS+=	-DWANT_JACK=ON
+.include "../../audio/jack/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_JACK=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mportaudio)
+CMAKE_ARGS+=	-DWANT_PORTAUDIO=ON
+.include "../../audio/portaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_PORTAUDIO=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_ARGS+=	-DWANT_PULSEAUDIO=ON
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWANT_PULSEAUDIO=OFF
+.endif
diff --git a/audio/hydrogen/patches/patch-CMakeLists.txt b/audio/hydrogen/patches/patch-CMakeLists.txt
index 58732b46411..ad30a4dfb3c 100644
--- a/audio/hydrogen/patches/patch-CMakeLists.txt
+++ b/audio/hydrogen/patches/patch-CMakeLists.txt
@@ -1,14 +1,103 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2017/06/28 09:44:44 wiedi Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2019/10/26 21:24:34 nia Exp $
 
-support PKGMANDIR
---- CMakeLists.txt.orig	2016-11-05 08:22:50.000000000 +0000
+Allow dependencies to be disabled properly.
+
+Support PKGMANDIR.
+
+--- CMakeLists.txt.orig	2018-03-14 10:03:22.000000000 +0000
 +++ CMakeLists.txt
-@@ -358,7 +358,7 @@ ENDIF()
+@@ -182,12 +182,15 @@ CHECK_INCLUDE_FILES(libtar.h HAVE_LIBTAR
+ CHECK_LIBRARY_EXISTS(tar tar_open "" HAVE_LIBTAR_OPEN)
+ CHECK_LIBRARY_EXISTS(tar tar_close "" HAVE_LIBTAR_CLOSE)
+ CHECK_LIBRARY_EXISTS(tar tar_extract_all "" HAVE_LIBTAR_EXTRACT_ALL)
++
+ IF(HAVE_LIBTAR_H AND HAVE_LIBTAR_OPEN AND HAVE_LIBTAR_CLOSE AND HAVE_LIBTAR_EXTRACT_ALL)
+     SET(LIBTAR_OK TRUE)
+ ELSE()
+     SET(LIBTAR_OK FALSE)
+ ENDIF()
++IF(WANT_LIBTAR)
+ FIND_HELPER(LIBTAR tar tar.h tar)
++ENDIF()
+ IF( NOT LIBTAR_FOUND OR NOT LIBTAR_OK OR NOT ZLIB_FOUND )
+     SET(WANT_LIBTAR FALSE)
+     MANDATORY_PKG(LIBARCHIVE)
+@@ -196,11 +199,20 @@ FIND_HELPER(LIBARCHIVE libarchive archiv
+ IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND)
+     SET(WANT_LIBTAR FALSE)
+ ENDIF()
++
+ FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
++
++IF(WANT_ALSA)
+ FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
++ENDIF()
++
++IF(WANT_LADSPA)
+ FIND_LADSPA(LADSPA ladspa.h noise)
++ENDIF()
+ 
++IF(WANT_OSC)
+ FIND_HELPER(OSC liblo lo/lo.h lo)
++ENDIF()
+ 
+ IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
+ 	FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
+@@ -208,24 +220,45 @@ ELSE()
+ 	FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
+ ENDIF()
+ 
++IF(WANT_JACK)
+ FIND_HELPER(JACK jack jack/jack.h jack)
+ CHECK_LIBRARY_EXISTS(jack jack_port_rename "" HAVE_JACK_PORT_RENAME)
++IF(WANT_JACKSESSION)
+ FIND_HELPER(JACKSESSION jack jack/session.h jack)
++ENDIF()
++ENDIF()
++
+ IF(APPLE)
+     FIND_LIBRARY(AUDIOUNIT_LIBRARY AudioUnit)
+     FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices)
+     FIND_HELPER(COREAUDIO CoreAudio-2.0 coreaudio.h coreaudio)
+     FIND_HELPER(COREMIDI CoreMidi coremidi.h coremidi)
+ ENDIF()
++
++IF(WANT_PORTAUDIO)
+ FIND_HELPER(PORTAUDIO portaudio-2.0 portaudio.h portaudio)
+ FIND_HELPER(PORTMIDI portmidi portmidi.h portmidi)
++ENDIF()
++
++IF(WANT_PULSEAUDIO)
+ FIND_HELPER(PULSEAUDIO libpulse pulse/pulseaudio.h pulse)
++ENDIF()
++
++IF(WANT_LASH)
+ FIND_HELPER(LASH lash-1.0 lash/lash.h lash)
++ENDIF()
++
++IF(WANT_LRDF)
+ FIND_HELPER(LRDF lrdf lrdf.h lrdf)
++ENDIF()
+ 
++IF(WANT_RUBBERBAND)
+ FIND_HELPER(RUBBERBAND rubberband rubberband/RubberBandStretcher.h rubberband)
+-FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit)
++ENDIF()
+ 
++IF(WANT_CPPUNIT)
++FIND_HELPER(CPPUNIT cppunit cppunit/TestCase.h cppunit)
++ENDIF()
+ 
+ # Find includes in corresponding build directories
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -360,8 +393,8 @@ ENDIF()
  IF(NOT MINGW AND NOT APPLE)
  	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
  	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
 -	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
-+	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/${PKGMANDIR}/man1)
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_MANDIR}/man1)
  ENDIF()
  
  #
diff --git a/audio/hydrogen/patches/patch-src_core_src_logger.cpp b/audio/hydrogen/patches/patch-src_core_src_logger.cpp
deleted file mode 100644
index e6208a041d7..00000000000
--- a/audio/hydrogen/patches/patch-src_core_src_logger.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_core_src_logger.cpp,v 1.2 2016/11/30 12:43:36 wiz Exp $
-
-usleep(1000000) is illegal.
-https://github.com/hydrogen-music/hydrogen/pull/444
-
---- src/core/src/logger.cpp.orig	2014-09-09 11:39:33.000000000 -0700
-+++ src/core/src/logger.cpp	2016-10-24 14:40:32.000000000 -0700
-@@ -31,7 +31,7 @@
- #define LOGGER_SLEEP Sleep( 100 )
- #else
- #include <unistd.h>
--#define LOGGER_SLEEP usleep( 1000000 )
-+#define LOGGER_SLEEP do { usleep( 500000 ); usleep( 500000 ); } while (0)
- #endif
- 
- namespace H2Core {