git: e32cf560aecc - main - audio/hydrogen: Fix build with llvm16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Jul 2023 17:20:12 UTC
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=e32cf560aecc2693809241c3ed9411ba5533785e commit e32cf560aecc2693809241c3ed9411ba5533785e Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-07-21 16:42:03 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-07-21 17:20:03 +0000 audio/hydrogen: Fix build with llvm16 - Update version 1.1.1=>1.2.0 - Pet portclippy Changelog: http://hydrogen-music.org/release-120 Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- audio/hydrogen/Makefile | 44 ++- audio/hydrogen/distinfo | 6 +- audio/hydrogen/files/patch-CMakeLists.txt | 19 +- audio/hydrogen/files/patch-src_core_Logger.cpp | 10 - audio/hydrogen/pkg-plist | 387 ++++++------------------- 5 files changed, 120 insertions(+), 346 deletions(-) diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 586c771b9b53..c55dcd61f0af 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -1,6 +1,6 @@ PORTNAME= hydrogen -DISTVERSION= 1.1.1 -PORTREVISION= 1 +DISTVERSION= 1.2.0 +#PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/hydrogen-music/${PORTNAME}/releases/download/${DISTVERSION}/ \ SF/hydrogen/Hydrogen/${DISTVERSION}%20Sources/ @@ -17,67 +17,63 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ USES= cmake compiler:c++17-lang desktop-file-utils pkgconfig \ localbase qt:5 -USE_QT= core gui network widgets xml xmlpatterns buildtools:build \ - linguisttools:build qmake:build testlib:build USE_LDCONFIG= yes +USE_QT= core gui network widgets xml xmlpatterns buildtools:build \ + linguisttools:build qmake:build svg testlib:build CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${LOCALBASE}/man -OPTIONS_SINGLE= EXPORT -OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR OPTIONS_DEFINE= ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \ PULSEAUDIO RDF TEST OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF +OPTIONS_SINGLE= EXPORT +OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR EXPORT_DESC= Export support for drumkit +LIBARCHIVE_DESC= LibArchive support +LIBTAR_DESC= Libtar support +RDF_DESC= RDF File support -ALSA_CMAKE_BOOL= WANT_ALSA ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins +ALSA_CMAKE_BOOL= WANT_ALSA DEBUG_CMAKE_BOOL= WANT_DEBUG -JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION JACK_LIB_DEPENDS= libjack.so:audio/jack +JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION -LADSPA_CMAKE_BOOL= WANT_LADSPA -LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa LADSPA_BUILD_DEPENDS= ladspa>=0:audio/ladspa LADSPA_RUN_DEPENDS= analyseplugin:audio/ladspa +LADSPA_CMAKE_BOOL= WANT_LADSPA +LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa -LASH_CMAKE_BOOL= WANT_LASH LASH_LIB_DEPENDS= liblash.so:audio/lash +LASH_CMAKE_BOOL= WANT_LASH -LIBARCHIVE_DESC= LibArchive support -LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE LIBARCHIVE_USES= libarchive +LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE -LIBTAR_DESC= Libtar support +LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar LIBTAR_CMAKE_BOOL= WANT_LIBTAR LIBTAR_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ -LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar OSS_CMAKE_BOOL= WANT_OSS -PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio +PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO -PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO -RDF_DESC= RDF File support +RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf RDF_CMAKE_BOOL= WANT_LRDF RDF_CMAKE_ON= -DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2 -RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf -TEST_CMAKE_BOOL= WANT_CPPUNIT TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit +TEST_CMAKE_BOOL= WANT_CPPUNIT TEST_LDFLAGS= -lexecinfo -post-patch: - @${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \ - ${WRKSRC}/CMakeLists.txt - do-test-TEST-on: cd ${WRKSRC} && ./src/tests/tests diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo index a882b8d080f8..0a61322015f0 100644 --- a/audio/hydrogen/distinfo +++ b/audio/hydrogen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666087845 -SHA256 (hydrogen-1.1.1.tar.gz) = 692ef6acd94102ec9c576cf28ce8572431f669f0516c7465b6b79fc3e15e0180 -SIZE (hydrogen-1.1.1.tar.gz) = 16438242 +TIMESTAMP = 1689956565 +SHA256 (hydrogen-1.2.0.tar.gz) = 92393b1aabdf5f0aea4398dd66e7d6a27cc9db17ecdcde4dacd5af6b0cf400ee +SIZE (hydrogen-1.2.0.tar.gz) = 12911501 diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt index 7e2682ce70ee..42b168534178 100644 --- a/audio/hydrogen/files/patch-CMakeLists.txt +++ b/audio/hydrogen/files/patch-CMakeLists.txt @@ -1,6 +1,19 @@ ---- CMakeLists.txt.orig 2017-11-21 17:47:16 UTC +--- CMakeLists.txt.orig 2023-03-31 14:32:25 UTC +++ CMakeLists.txt -@@ -206,6 +206,11 @@ ENDIF() +@@ -206,9 +206,9 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) + CHECK_INCLUDE_FILES(libtar.h HAVE_LIBTAR_H) + CHECK_INCLUDE_FILES(execinfo.h HAVE_EXECINFO_H) + FIND_PACKAGE(Backtrace) +-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) ++CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_open "" HAVE_LIBTAR_OPEN) ++CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_close "" HAVE_LIBTAR_CLOSE) ++CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so 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() +@@ -222,6 +222,11 @@ ENDIF() FIND_HELPER(LIBARCHIVE libarchive archive.h archive) IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND) SET(WANT_LIBTAR FALSE) @@ -12,7 +25,7 @@ ENDIF() FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile) FIND_HELPER(ALSA alsa alsa/asoundlib.h asound ) -@@ -215,6 +220,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo) +@@ -231,6 +236,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo) IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") FIND_HELPER(OSS oss sys/soundcard.h ossaudio ) diff --git a/audio/hydrogen/files/patch-src_core_Logger.cpp b/audio/hydrogen/files/patch-src_core_Logger.cpp deleted file mode 100644 index 73f4d717cc90..000000000000 --- a/audio/hydrogen/files/patch-src_core_Logger.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/Logger.cpp.orig 2022-10-17 00:49:12 UTC -+++ src/core/Logger.cpp -@@ -65,6 +65,7 @@ void* loggerThread_func( void* param ) { - Logger::queue_t::iterator it, last; - - while ( logger->__running ) { -+ pthread_mutex_lock( &logger->__mutex ); - pthread_cond_wait( &logger->__messages_available, &logger->__mutex ); - pthread_mutex_unlock( &logger->__mutex ); - if( !queue->empty() ) { diff --git a/audio/hydrogen/pkg-plist b/audio/hydrogen/pkg-plist index 57f55c5c8a9f..0f2da45c3fad 100644 --- a/audio/hydrogen/pkg-plist +++ b/audio/hydrogen/pkg-plist @@ -2,13 +2,14 @@ bin/h2cli bin/h2player bin/hydrogen include/hydrogen/config.h -include/hydrogen/core/AudioEngine.h +include/hydrogen/core/AudioEngine/AudioEngine.h +include/hydrogen/core/AudioEngine/AudioEngineTests.h +include/hydrogen/core/AudioEngine/TransportPosition.h include/hydrogen/core/AutomationPathSerializer.h include/hydrogen/core/Basics/Adsr.h include/hydrogen/core/Basics/AutomationPath.h include/hydrogen/core/Basics/Drumkit.h include/hydrogen/core/Basics/DrumkitComponent.h -include/hydrogen/core/Basics/ExponentialTables.h include/hydrogen/core/Basics/Instrument.h include/hydrogen/core/Basics/InstrumentComponent.h include/hydrogen/core/Basics/InstrumentLayer.h @@ -28,6 +29,7 @@ include/hydrogen/core/H2Exception.h include/hydrogen/core/Helpers/Files.h include/hydrogen/core/Helpers/Filesystem.h include/hydrogen/core/Helpers/Legacy.h +include/hydrogen/core/Helpers/Random.h include/hydrogen/core/Helpers/Translations.h include/hydrogen/core/Helpers/Xml.h include/hydrogen/core/Hydrogen.h @@ -48,10 +50,9 @@ include/hydrogen/core/IO/OssDriver.h include/hydrogen/core/IO/PortAudioDriver.h include/hydrogen/core/IO/PortMidiDriver.h include/hydrogen/core/IO/PulseAudioDriver.h -include/hydrogen/core/IO/TransportInfo.h include/hydrogen/core/Lash/LashClient.h +include/hydrogen/core/License.h include/hydrogen/core/Lilipond/Lilypond.h -include/hydrogen/core/LocalFileMng.h include/hydrogen/core/Logger.h include/hydrogen/core/MidiAction.h include/hydrogen/core/MidiMap.h @@ -59,21 +60,23 @@ include/hydrogen/core/Nsm.h include/hydrogen/core/NsmClient.h include/hydrogen/core/Object.h include/hydrogen/core/OscServer.h -include/hydrogen/core/Preferences.h +include/hydrogen/core/Preferences/Preferences.h +include/hydrogen/core/Preferences/Theme.h include/hydrogen/core/Sampler/Interpolation.h include/hydrogen/core/Sampler/Sampler.h include/hydrogen/core/Smf/SMF.h include/hydrogen/core/Smf/SMFEvent.h +include/hydrogen/core/SoundLibrary/SoundLibraryDatabase.h +include/hydrogen/core/SoundLibrary/SoundLibraryInfo.h include/hydrogen/core/Synth/Synth.h include/hydrogen/core/Timehelper.h include/hydrogen/core/Timeline.h include/hydrogen/core/Version.h include/hydrogen/core/rt_clock.h -lib/libhydrogen-core-1.1.1.so +lib/libhydrogen-core-1.2.0.so man/man1/hydrogen.1.gz share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml share/applications/org.hydrogenmusic.Hydrogen.desktop -%%DATADIR%%/data/DefaultSong.h2song %%DATADIR%%/data/click.wav %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song %%DATADIR%%/data/demo_songs/GM_kit_Jazzy.h2song @@ -82,70 +85,6 @@ share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/demo_songs/GM_kit_demo3.h2song %%DATADIR%%/data/demo_songs/TR808kit-demo.h2song %%DATADIR%%/data/demo_songs/tutorial_georgyporgy.h2song -%%DATADIR%%/data/doc/img/AutomationPath.png -%%DATADIR%%/data/doc/img/Downloading_SoundLibrary.png -%%DATADIR%%/data/doc/img/InstrumentEditorLayersComponents.png -%%DATADIR%%/data/doc/img/InstrumentEditorLayersControls.png -%%DATADIR%%/data/doc/img/InstrumentEditorLayersLayers.png -%%DATADIR%%/data/doc/img/InstrumentEditorLayersSampleSelection.png -%%DATADIR%%/data/doc/img/LADSPA_FX_Properties.png -%%DATADIR%%/data/doc/img/MainMenu.png -%%DATADIR%%/data/doc/img/MixerComponentStrip.png -%%DATADIR%%/data/doc/img/MixerFXSelect.png -%%DATADIR%%/data/doc/img/MixerFXStrip.png -%%DATADIR%%/data/doc/img/MixerInstrumentStrip.png -%%DATADIR%%/data/doc/img/MixerMasterStrip.png -%%DATADIR%%/data/doc/img/NotePropertiesRuler.png -%%DATADIR%%/data/doc/img/PatternSizeDialog.png -%%DATADIR%%/data/doc/img/PlaylistEditor.png -%%DATADIR%%/data/doc/img/PlaylistEditorControls.png -%%DATADIR%%/data/doc/img/Rec_button.png -%%DATADIR%%/data/doc/img/SongRuler.png -%%DATADIR%%/data/doc/img/admonitions/caution.svg -%%DATADIR%%/data/doc/img/admonitions/important.svg -%%DATADIR%%/data/doc/img/admonitions/note.svg -%%DATADIR%%/data/doc/img/admonitions/tip.svg -%%DATADIR%%/data/doc/img/admonitions/warning.svg -%%DATADIR%%/data/doc/img/btn_dropdown_off.png -%%DATADIR%%/data/doc/img/btn_jack_master_off.png -%%DATADIR%%/data/doc/img/btn_jack_transport_off.png -%%DATADIR%%/data/doc/img/btn_metronome_off.png -%%DATADIR%%/data/doc/img/btn_play_off.png -%%DATADIR%%/data/doc/img/btn_set_play_off.png -%%DATADIR%%/data/doc/img/btn_set_play_on.png -%%DATADIR%%/data/doc/img/btn_viewTL_off.png -%%DATADIR%%/data/doc/img/bypass_over.png -%%DATADIR%%/data/doc/img/edit_off.png -%%DATADIR%%/data/doc/img/master_mute_off.png -%%DATADIR%%/data/doc/img/matrioskaPanH2.png -%%DATADIR%%/data/doc/img/rec.png -%%DATADIR%%/data/doc/img/rubber_off.png -%%DATADIR%%/data/doc/img/showFX_on.png -%%DATADIR%%/data/doc/img/showPeaks_on.png -%%DATADIR%%/data/doc/img/tag_bar.png -%%DATADIR%%/data/doc/img/tastiera.png -%%DATADIR%%/data/doc/img_tutorial/Bridge1_4th.png -%%DATADIR%%/data/doc/img_tutorial/Bridge3_3a_hh.png -%%DATADIR%%/data/doc/img_tutorial/C3_6+7.png -%%DATADIR%%/data/doc/img_tutorial/Intro4th.png -%%DATADIR%%/data/doc/img_tutorial/PatternBase1.png -%%DATADIR%%/data/doc/img_tutorial/PatternBase2.png -%%DATADIR%%/data/doc/img_tutorial/Riff1b.png -%%DATADIR%%/data/doc/img_tutorial/Riff1c.png -%%DATADIR%%/data/doc/img_tutorial/Riff1d.png -%%DATADIR%%/data/doc/img_tutorial/Verse8th.png -%%DATADIR%%/data/doc/img_tutorial/VerseAll.png -%%DATADIR%%/data/doc/img_tutorial/VerseBridge.png -%%DATADIR%%/data/doc/img_tutorial/VerseBridge_hh.png -%%DATADIR%%/data/doc/manual_ca.html -%%DATADIR%%/data/doc/manual_en.html -%%DATADIR%%/data/doc/manual_es.html -%%DATADIR%%/data/doc/manual_fr.html -%%DATADIR%%/data/doc/manual_it.html -%%DATADIR%%/data/doc/manual_nl.html -%%DATADIR%%/data/doc/tutorial_en.html -%%DATADIR%%/data/doc/tutorial_fr.html -%%DATADIR%%/data/doc/tutorial_it.html %%DATADIR%%/data/drumkits/GMRockKit/24Ride-1.wav %%DATADIR%%/data/drumkits/GMRockKit/24Ride-2.wav %%DATADIR%%/data/drumkits/GMRockKit/24Ride-3.wav @@ -274,10 +213,6 @@ share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/i18n/hydrogen_uk.qm %%DATADIR%%/data/i18n/hydrogen_zh_CN.qm %%DATADIR%%/data/img/gray/about/aboutLogo.png -%%DATADIR%%/data/img/gray/audiFileBrowser/go-home.png -%%DATADIR%%/data/img/gray/audiFileBrowser/go-up.png -%%DATADIR%%/data/img/gray/audiFileBrowser/player_play.png -%%DATADIR%%/data/img/gray/audiFileBrowser/player_stop.png %%DATADIR%%/data/img/gray/h2-icon.svg %%DATADIR%%/data/img/gray/icon.icns %%DATADIR%%/data/img/gray/icon.svg @@ -286,254 +221,26 @@ share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/img/gray/icon32.png %%DATADIR%%/data/img/gray/icon48.png %%DATADIR%%/data/img/gray/icon64.png -%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/btn_dropdown_over.png -%%DATADIR%%/data/img/gray/instrumentEditor/bypass_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/bypass_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/bypass_over.png -%%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_over.png -%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_over.png %%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab.png %%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab_top.png -%%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/layerTab.png -%%DATADIR%%/data/img/gray/instrumentEditor/layerTabnew.png %%DATADIR%%/data/img/gray/instrumentEditor/layerTabsupernew.png -%%DATADIR%%/data/img/gray/instrumentEditor/library_show_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/library_show_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/loadLayer_off.png -%%DATADIR%%/data/img/gray/instrumentEditor/loadLayer_on.png -%%DATADIR%%/data/img/gray/instrumentEditor/loadLayer_over.png -%%DATADIR%%/data/img/gray/instrumentEditor/speaker.png -%%DATADIR%%/data/img/gray/lcd/LCDLargeFontSet.png -%%DATADIR%%/data/img/gray/lcd/LCDLargeGrayFontSet.png -%%DATADIR%%/data/img/gray/lcd/LCDSmallBlueFontSet.png -%%DATADIR%%/data/img/gray/lcd/LCDSmallFontSetRed.xcf -%%DATADIR%%/data/img/gray/lcd/LCDSmallGrayFontSet.png -%%DATADIR%%/data/img/gray/lcd/LCDSmallRedFontSet.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_down_off.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_down_on.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_down_over.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_off.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_on.png -%%DATADIR%%/data/img/gray/lcd/LCDSpinBox_up_over.png %%DATADIR%%/data/img/gray/mixerPanel/background_FX.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_edit_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_edit_on.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_edit_over.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_load_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_load_over.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_mute_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_mute_on.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_mute_over.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_on_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_on_on.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_on_over.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_play_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_play_on.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_play_over.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_solo_off.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_solo_on.png -%%DATADIR%%/data/img/gray/mixerPanel/btn_solo_over.png -%%DATADIR%%/data/img/gray/mixerPanel/bypass_off.png -%%DATADIR%%/data/img/gray/mixerPanel/bypass_on.png -%%DATADIR%%/data/img/gray/mixerPanel/bypass_over.png %%DATADIR%%/data/img/gray/mixerPanel/componentmixerline_background.png -%%DATADIR%%/data/img/gray/mixerPanel/edit_off.png -%%DATADIR%%/data/img/gray/mixerPanel/edit_on.png -%%DATADIR%%/data/img/gray/mixerPanel/edit_over.png -%%DATADIR%%/data/img/gray/mixerPanel/fader_background.png -%%DATADIR%%/data/img/gray/mixerPanel/fader_knob.png -%%DATADIR%%/data/img/gray/mixerPanel/fader_leds.png %%DATADIR%%/data/img/gray/mixerPanel/fxline_background.png -%%DATADIR%%/data/img/gray/mixerPanel/knob_images.png -%%DATADIR%%/data/img/gray/mixerPanel/led_trigger_off.png -%%DATADIR%%/data/img/gray/mixerPanel/led_trigger_on.png -%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_background.png -%%DATADIR%%/data/img/gray/mixerPanel/masterMixer_leds.png %%DATADIR%%/data/img/gray/mixerPanel/masterMixerline_background.png -%%DATADIR%%/data/img/gray/mixerPanel/master_mute_off.png -%%DATADIR%%/data/img/gray/mixerPanel/master_mute_on.png -%%DATADIR%%/data/img/gray/mixerPanel/master_mute_over.png %%DATADIR%%/data/img/gray/mixerPanel/mixer_background.png %%DATADIR%%/data/img/gray/mixerPanel/mixerline_background.png -%%DATADIR%%/data/img/gray/mixerPanel/mixerline_background_on.png %%DATADIR%%/data/img/gray/mixerPanel/mixerline_label_background.png %%DATADIR%%/data/img/gray/mixerPanel/mixerline_text_background.png -%%DATADIR%%/data/img/gray/mixerPanel/openMixerSettings_off.png -%%DATADIR%%/data/img/gray/mixerPanel/openMixerSettings_over.png -%%DATADIR%%/data/img/gray/mixerPanel/panFader_background.png -%%DATADIR%%/data/img/gray/mixerPanel/rotary_center_images.png -%%DATADIR%%/data/img/gray/mixerPanel/rotary_images.png -%%DATADIR%%/data/img/gray/mixerPanel/showFX_off.png -%%DATADIR%%/data/img/gray/mixerPanel/showFX_on.png -%%DATADIR%%/data/img/gray/mixerPanel/showFX_over.png -%%DATADIR%%/data/img/gray/mixerPanel/showMixer_off.png -%%DATADIR%%/data/img/gray/mixerPanel/showMixer_on.png -%%DATADIR%%/data/img/gray/mixerPanel/showMixer_over.png -%%DATADIR%%/data/img/gray/mixerPanel/showPeaks_off.png -%%DATADIR%%/data/img/gray/mixerPanel/showPeaks_on.png -%%DATADIR%%/data/img/gray/mixerPanel/showPeaks_over.png -%%DATADIR%%/data/img/gray/patternEditor/background_channel.png -%%DATADIR%%/data/img/gray/patternEditor/background_rec-new.png -%%DATADIR%%/data/img/gray/patternEditor/background_res-new.png -%%DATADIR%%/data/img/gray/patternEditor/background_zoom-new.png -%%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_dropdown_over.png -%%DATADIR%%/data/img/gray/patternEditor/btn_drum_piano_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_drum_piano_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_hear_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_hear_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_mute_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_mute_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_quant_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_quant_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_quant_over.png -%%DATADIR%%/data/img/gray/patternEditor/btn_record_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_record_on.png -%%DATADIR%%/data/img/gray/patternEditor/btn_record_over.png -%%DATADIR%%/data/img/gray/patternEditor/btn_solo_off.png -%%DATADIR%%/data/img/gray/patternEditor/btn_solo_on.png -%%DATADIR%%/data/img/gray/patternEditor/editor_top.png -%%DATADIR%%/data/img/gray/patternEditor/icn_warning.png -%%DATADIR%%/data/img/gray/patternEditor/icn_warning.svg -%%DATADIR%%/data/img/gray/patternEditor/instrument_line.png -%%DATADIR%%/data/img/gray/patternEditor/instrument_line_selected.png -%%DATADIR%%/data/img/gray/patternEditor/tickPosition.png %%DATADIR%%/data/img/gray/playerControlPanel/background.png %%DATADIR%%/data/img/gray/playerControlPanel/background_BPM.png %%DATADIR%%/data/img/gray/playerControlPanel/background_Control.png %%DATADIR%%/data/img/gray/playerControlPanel/background_Jack.png -%%DATADIR%%/data/img/gray/playerControlPanel/background_Mode.png -%%DATADIR%%/data/img/gray/playerControlPanel/bbt_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/bbt_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/bc_off.old.png -%%DATADIR%%/data/img/gray/playerControlPanel/bc_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/bc_on.old.png -%%DATADIR%%/data/img/gray/playerControlPanel/bc_on.png %%DATADIR%%/data/img/gray/playerControlPanel/beatConter_BG.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_ffwd_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_ffwd_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_ffwd_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_loop_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_loop_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_loop_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_metronome_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_metronome_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_metronome_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_mmc_space_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_mmc_space_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_mode_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_mode_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_mode_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_play_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_play_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_play_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_set_play_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_set_play_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showDrumkitManager_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showDrumkitManager_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showDrumkitManager_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showInstrumentEditor_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showInstrumentEditor_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showInstrumentEditor_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showMixer_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showMixer_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showMixer_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showPatternEditor_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showPatternEditor_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showPatternEditor_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showSongEditor_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showSongEditor_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_showSongEditor_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_stop_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_stop_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_stop_over.png %%DATADIR%%/data/img/gray/playerControlPanel/cpuLoad_back.png %%DATADIR%%/data/img/gray/playerControlPanel/cpuLoad_leds.png -%%DATADIR%%/data/img/gray/playerControlPanel/icn_metronome_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/icn_metronome_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/icn_pause.png -%%DATADIR%%/data/img/gray/playerControlPanel/icn_play.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackMasterBtn_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackMasterBtn_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackMasterBtn_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackTransportBtn_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackTransportBtn_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/jackTransportBtn_over.png -%%DATADIR%%/data/img/gray/playerControlPanel/lcd_background.png -%%DATADIR%%/data/img/gray/playerControlPanel/metronome_down.png -%%DATADIR%%/data/img/gray/playerControlPanel/metronome_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/metronome_up.png -%%DATADIR%%/data/img/gray/playerControlPanel/midiActivity_back.png -%%DATADIR%%/data/img/gray/playerControlPanel/midiActivity_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/onoff.png -%%DATADIR%%/data/img/gray/playerControlPanel/pattern_mode.png %%DATADIR%%/data/img/gray/playerControlPanel/playlist_background_Control.png -%%DATADIR%%/data/img/gray/playerControlPanel/rubber_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/rubber_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/song_mode.png -%%DATADIR%%/data/img/gray/playerControlPanel/statusLED_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/statusLED_on.png -%%DATADIR%%/data/img/gray/preferencesDialog/rec.png -%%DATADIR%%/data/img/gray/skin_btn_off.png -%%DATADIR%%/data/img/gray/skin_btn_on.png -%%DATADIR%%/data/img/gray/skin_btn_over.png %%DATADIR%%/data/img/gray/songEditor/bg_topPanel.png -%%DATADIR%%/data/img/gray/songEditor/btn_bpm_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_bpm_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_bpm_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_clear_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_clear_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_clear_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_down_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_down_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_down_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_draw_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_draw_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_draw_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_followPH_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_followPH_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_followPH_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_minus_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_minus_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_minus_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_mode_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_mode_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_mode_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_new_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_new_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_new_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_select_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_select_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_select_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_up_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_up_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_up_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewPL_over.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_off.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_on.png -%%DATADIR%%/data/img/gray/songEditor/btn_viewTL_over.png -%%DATADIR%%/data/img/gray/songEditor/playingPattern_off.png -%%DATADIR%%/data/img/gray/songEditor/playingPattern_on.png -%%DATADIR%%/data/img/gray/songEditor/songEditorLabelABG.png -%%DATADIR%%/data/img/gray/songEditor/songEditorLabelBG.png -%%DATADIR%%/data/img/gray/songEditor/songEditorLabelSBG.png %%DATADIR%%/data/img/gray/splash/splash.png %%DATADIR%%/data/img/gray/warning.png %%DATADIR%%/data/img/gray/warning.svg @@ -544,6 +251,68 @@ share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/img/gray/waveDisplay/targetsamplewavedisplay.png %%DATADIR%%/data/img/h2-icon.bmp %%DATADIR%%/data/img/h2-icon.ico +%%DATADIR%%/data/img/scalable/fader.svg +%%DATADIR%%/data/img/scalable/fader_knob.svg +%%DATADIR%%/data/img/scalable/fader_knob_vertical.svg +%%DATADIR%%/data/img/scalable/fader_master.svg +%%DATADIR%%/data/img/scalable/fader_vertical.svg +%%DATADIR%%/data/img/scalable/icons/black/cog.svg +%%DATADIR%%/data/img/scalable/icons/black/down.svg +%%DATADIR%%/data/img/scalable/icons/black/draw.svg +%%DATADIR%%/data/img/scalable/icons/black/dropdown.svg +%%DATADIR%%/data/img/scalable/icons/black/drum.svg +%%DATADIR%%/data/img/scalable/icons/black/fast_forward.svg +%%DATADIR%%/data/img/scalable/icons/black/go-up.svg +%%DATADIR%%/data/img/scalable/icons/black/home.svg +%%DATADIR%%/data/img/scalable/icons/black/lock_closed.svg +%%DATADIR%%/data/img/scalable/icons/black/lock_open.svg +%%DATADIR%%/data/img/scalable/icons/black/loop.svg +%%DATADIR%%/data/img/scalable/icons/black/metronome.svg +%%DATADIR%%/data/img/scalable/icons/black/minus.svg +%%DATADIR%%/data/img/scalable/icons/black/multiple_layers.svg +%%DATADIR%%/data/img/scalable/icons/black/piano.svg +%%DATADIR%%/data/img/scalable/icons/black/play.svg +%%DATADIR%%/data/img/scalable/icons/black/play_pause.svg +%%DATADIR%%/data/img/scalable/icons/black/plus.svg +%%DATADIR%%/data/img/scalable/icons/black/quantization.svg +%%DATADIR%%/data/img/scalable/icons/black/rewind.svg +%%DATADIR%%/data/img/scalable/icons/black/select.svg +%%DATADIR%%/data/img/scalable/icons/black/single_layer.svg +%%DATADIR%%/data/img/scalable/icons/black/speaker.svg +%%DATADIR%%/data/img/scalable/icons/black/stop.svg +%%DATADIR%%/data/img/scalable/icons/black/up.svg +%%DATADIR%%/data/img/scalable/icons/record.svg +%%DATADIR%%/data/img/scalable/icons/warning.svg +%%DATADIR%%/data/img/scalable/icons/white/cog.svg +%%DATADIR%%/data/img/scalable/icons/white/down.svg +%%DATADIR%%/data/img/scalable/icons/white/draw.svg +%%DATADIR%%/data/img/scalable/icons/white/dropdown.svg +%%DATADIR%%/data/img/scalable/icons/white/drum.svg +%%DATADIR%%/data/img/scalable/icons/white/fast_forward.svg +%%DATADIR%%/data/img/scalable/icons/white/go-up.svg +%%DATADIR%%/data/img/scalable/icons/white/home.svg +%%DATADIR%%/data/img/scalable/icons/white/lock_closed.svg +%%DATADIR%%/data/img/scalable/icons/white/lock_open.svg +%%DATADIR%%/data/img/scalable/icons/white/loop.svg +%%DATADIR%%/data/img/scalable/icons/white/metronome.svg +%%DATADIR%%/data/img/scalable/icons/white/minus.svg +%%DATADIR%%/data/img/scalable/icons/white/multiple_layers.svg +%%DATADIR%%/data/img/scalable/icons/white/piano.svg +%%DATADIR%%/data/img/scalable/icons/white/play.svg +%%DATADIR%%/data/img/scalable/icons/white/play_pause.svg +%%DATADIR%%/data/img/scalable/icons/white/plus.svg +%%DATADIR%%/data/img/scalable/icons/white/quantization.svg +%%DATADIR%%/data/img/scalable/icons/white/rewind.svg +%%DATADIR%%/data/img/scalable/icons/white/select.svg +%%DATADIR%%/data/img/scalable/icons/white/single_layer.svg +%%DATADIR%%/data/img/scalable/icons/white/speaker.svg +%%DATADIR%%/data/img/scalable/icons/white/stop.svg +%%DATADIR%%/data/img/scalable/icons/white/up.svg +%%DATADIR%%/data/img/scalable/led_11_9.svg +%%DATADIR%%/data/img/scalable/led_22_7.svg +%%DATADIR%%/data/img/scalable/led_5_13.svg +%%DATADIR%%/data/img/scalable/rotary.svg +%%DATADIR%%/data/img/scalable/rotary_background.svg %%DATADIR%%/data/new_tutorial/img_tutorial/Bridge1_4th.png %%DATADIR%%/data/new_tutorial/img_tutorial/Bridge3_3a_hh.png %%DATADIR%%/data/new_tutorial/img_tutorial/C3_6+7.png @@ -559,10 +328,16 @@ share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/new_tutorial/img_tutorial/VerseBridge_hh.png %%DATADIR%%/data/new_tutorial/img_tutorial/warn.png %%DATADIR%%/data/new_tutorial/tutorial_en.html +%%DATADIR%%/data/themes/default.h2theme %%DATADIR%%/data/xsd/drumkit.xsd %%DATADIR%%/data/xsd/drumkit_pattern.xsd +%%DATADIR%%/data/xsd/legacy/v0_9_6/drumkit.xsd +%%DATADIR%%/data/xsd/legacy/v0_9_6/drumkit_pattern.xsd +%%DATADIR%%/data/xsd/legacy/v0_9_7/drumkit.xsd +%%DATADIR%%/data/xsd/legacy/v1_0_0/drumkit.xsd +%%DATADIR%%/data/xsd/legacy/v1_0_0/drumkit_pattern.xsd +%%DATADIR%%/data/xsd/legacy/v1_0_0/playlist.xsd +%%DATADIR%%/data/xsd/legacy/v1_1_0/drumkit.xsd +%%DATADIR%%/data/xsd/legacy/v1_1_0/drumkit_pattern.xsd %%DATADIR%%/data/xsd/playlist.xsd share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg -@dir %%DATADIR%%/data/doc/generate_images -@dir %%DATADIR%%/data/doc/generated_en -@dir %%DATADIR%%/data/doc/res