From nobody Mon Oct 17 15:59:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MrhXG0nMbz4gGSv; Mon, 17 Oct 2022 15:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MrhXG0DF2z3Sc3; Mon, 17 Oct 2022 15:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666022398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9ihiD/fOp9n9362gJWJ0LagCHjoMUv9G6drbCplmrg=; b=yBQi5WyUBxXtxW3fWTqZpGiTCcfazcim1V5TFYFvsuIxP4N5io8MjMueNVsq5Y5hR6ovRO UAr9HZdPlGvXwAr52gYseoUK5q87XOpzixY8cYuHukd7qjL8w5pBcXk935HUk19DiGRD3h i0SVWuqZeibIw1STwBhL5cW2syN7Pw1RGgLJFq9x/i1h3zivALrWLAjnTnRAO6Qk2o2G6D KdO42Piiw+Y2NGOYpSbb1F8/IQscCFcJ0gR5BoqCx2ucYxg64iwIZrtH8Oz7SdLw3NWq+w ZitBC7xoUTuBej1d2jC7zAbxxuFX924zDbg1yYcYctFHj9ASTReNAmV8JdlhQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MrhXF6Gc7zsvg; Mon, 17 Oct 2022 15:59:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29HFxvjV033400; Mon, 17 Oct 2022 15:59:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HFxvt4033399; Mon, 17 Oct 2022 15:59:57 GMT (envelope-from git) Date: Mon, 17 Oct 2022 15:59:57 GMT Message-Id: <202210171559.29HFxvt4033399@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 19c038c2294b - main - audio/hydrogen: Update to v1.1.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19c038c2294b65213bbe660dbc46c2306a610fcb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666022398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9ihiD/fOp9n9362gJWJ0LagCHjoMUv9G6drbCplmrg=; b=upbh4HbObG96PZEka3RkoaizcDI/xvGVl0RHGYkW6Czb35ogb2cW3Dn6TV/kPHRcA9vd65 UaRCySWHyk4VzZWCdg+XcjoMc/hZs63cFFcUlz9XN8ouLXddRdpJvVQyeR1c9mQVHFu15R H2f6KIk4qDWgU338MqFYIESijc5yOdrj/9+QmvriyLfoOEeUvn/OE+y6p72MsK7CXxq7yG yCK8+2sHshcnkjCNjdwJ5pG/plf9yrYKZjbXXeRPRpkg6VdOaC3ib/2l3hTcSgpdQWAqjV q1u0nwCIX7Yc+vG9OduBKc9mbC/J48IV2NVy61X7Q73vUnTWoZ6dQ3W/sqh67Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666022398; a=rsa-sha256; cv=none; b=W07YbzhmbnDQD/0hDZompHkKdVuyvvEt+oSOKh9aKiFoSLbR/wJb5kmIQnVCiEdPVZeiNw f+QabrM0QAPDD7xCwJ1k6irCDbvcIjsoaDA0O1D1BwXs7nwJ8P4QEDENt0Rmj0v2OIU7wj 2/FzY+xi0YyO5uzYiWyXDbyz8ywFdFJzta1p/Ee58CgX1ZnCkWanVdWrr1hJtFBfoN3SCl XGqKLMTKHHfTMUrzslOZE950UYaFXQZwkAew9tblOvkftptA1TZ6YMx8eBebozIwsZhgNv mPUn4nctA9zXMG4GMdtGK+Gxv43nY1gHBeik6aywA+pbOOnIjxxgPh7//R5fHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=19c038c2294b65213bbe660dbc46c2306a610fcb commit 19c038c2294b65213bbe660dbc46c2306a610fcb Author: Shane AuthorDate: 2022-10-17 05:51:41 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-17 15:55:53 +0000 audio/hydrogen: Update to v1.1.1 ChangeLog: https://github.com/hydrogen-music/hydrogen/blob/master/ChangeLog#L178 * Bugfixes - fix preferences dialog "OK" button behavior - fix rewinding to beginning of pattern in pattern mode with no pattern inserted in SongEditor - fix display of tempo marker while loading a song (introduced in 1.1.0) - fix LADSPA issues, most audible on PulseAudio - fix window placement when screen sizes change * Explicitly set latency target for PortAudio (Windows) audio driver, enabling much lower audio latency on Windows. PR: 267137 Reported by: FreeBSD@ShaneWare.Biz (maintainer) --- audio/hydrogen/Makefile | 7 +- audio/hydrogen/distinfo | 6 +- .../hydrogen/files/patch-data_i18n_CMakeLists.txt | 11 -- audio/hydrogen/files/patch-src_core_Logger.cpp | 10 ++ audio/hydrogen/pkg-plist | 146 +++++++++++---------- 5 files changed, 92 insertions(+), 88 deletions(-) diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index 21d7996e31ed..cc261cbdc3eb 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -1,6 +1,5 @@ PORTNAME= hydrogen -DISTVERSION= 1.0.1 -PORTREVISION= 1 +DISTVERSION= 1.1.1 CATEGORIES= audio MAINTAINER= FreeBSD@ShaneWare.Biz @@ -18,6 +17,7 @@ USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig \ USE_QT= core gui network widgets xml xmlpatterns buildtools:build \ linguisttools:build qmake:build testlib:build USE_LDCONFIG= yes +CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${LOCALBASE}/share/man USE_GITHUB= yes GH_ACCOUNT= hydrogen-music @@ -71,12 +71,11 @@ RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf TEST_CMAKE_BOOL= WANT_CPPUNIT TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit +TEST_LDFLAGS= -lexecinfo post-patch: @${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \ ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' \ - ${WRKSRC}/data/i18n/CMakeLists.txt do-test-TEST-on: cd ${WRKSRC} && ./src/tests/tests diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo index 3d1c9158aaf6..7379010e134e 100644 --- a/audio/hydrogen/distinfo +++ b/audio/hydrogen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608443952 -SHA256 (hydrogen-music-hydrogen-1.0.1_GH0.tar.gz) = de6e8ba259ff340037f24e80f8b34592138603b080b02cfa3214ef9b0d66ac63 -SIZE (hydrogen-music-hydrogen-1.0.1_GH0.tar.gz) = 11501583 +TIMESTAMP = 1665886685 +SHA256 (hydrogen-music-hydrogen-1.1.1_GH0.tar.gz) = aba28a11a3dfb3eaf1a831817990b7dfe49343e09119c83717e2e8878179b5ca +SIZE (hydrogen-music-hydrogen-1.1.1_GH0.tar.gz) = 11417837 diff --git a/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt b/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt deleted file mode 100644 index 71735fafcb3c..000000000000 --- a/audio/hydrogen/files/patch-data_i18n_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- data/i18n/CMakeLists.txt.orig 2020-12-20 08:51:14.629324000 -0800 -+++ data/i18n/CMakeLists.txt 2020-12-20 08:51:25.442169000 -0800 -@@ -7,7 +7,7 @@ - ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES}) - - IF(MINGW) -- INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n") -+ INSTALL(FILES ${QM_FILES} DESTINATION "%%DATADIR%%/data/i18n") - ELSE() - INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n") - ENDIF() diff --git a/audio/hydrogen/files/patch-src_core_Logger.cpp b/audio/hydrogen/files/patch-src_core_Logger.cpp new file mode 100644 index 000000000000..73f4d717cc90 --- /dev/null +++ b/audio/hydrogen/files/patch-src_core_Logger.cpp @@ -0,0 +1,10 @@ +--- 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 14485ac0dcd0..2f4b910b6ece 100644 --- a/audio/hydrogen/pkg-plist +++ b/audio/hydrogen/pkg-plist @@ -1,76 +1,78 @@ bin/h2cli bin/h2player bin/hydrogen -include/hydrogen/IO/AlsaAudioDriver.h -include/hydrogen/IO/AlsaMidiDriver.h -include/hydrogen/IO/AudioOutput.h -include/hydrogen/IO/CoreAudioDriver.h -include/hydrogen/IO/CoreMidiDriver.h -include/hydrogen/IO/DiskWriterDriver.h -include/hydrogen/IO/FakeDriver.h -include/hydrogen/IO/jack_audio_driver.h -include/hydrogen/IO/JackMidiDriver.h -include/hydrogen/IO/MidiCommon.h -include/hydrogen/IO/MidiInput.h -include/hydrogen/IO/MidiOutput.h -include/hydrogen/IO/NullDriver.h -include/hydrogen/IO/OssDriver.h -include/hydrogen/IO/PortAudioDriver.h -include/hydrogen/IO/PortMidiDriver.h -include/hydrogen/IO/PulseAudioDriver.h -include/hydrogen/IO/TransportInfo.h -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 -include/hydrogen/basics/instrument_component.h -include/hydrogen/basics/instrument_layer.h -include/hydrogen/basics/instrument_list.h -include/hydrogen/basics/note.h -include/hydrogen/basics/pattern.h -include/hydrogen/basics/pattern_list.h -include/hydrogen/basics/playlist.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 -include/hydrogen/globals.h -include/hydrogen/h2_exception.h -include/hydrogen/helpers/files.h -include/hydrogen/helpers/filesystem.h -include/hydrogen/helpers/legacy.h -include/hydrogen/helpers/xml.h -include/hydrogen/hydrogen.h -include/hydrogen/lilypond/lilypond.h -include/hydrogen/logger.h -include/hydrogen/midi_action.h -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/rt_clock.h -include/hydrogen/sampler/Sampler.h -include/hydrogen/smf/SMF.h -include/hydrogen/smf/SMFEvent.h -include/hydrogen/synth/Synth.h -include/hydrogen/timehelper.h -include/hydrogen/timeline.h -include/hydrogen/version.h -lib/libhydrogen-core-1.0.1.so +include/hydrogen/core/AudioEngine.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 +include/hydrogen/core/Basics/InstrumentList.h +include/hydrogen/core/Basics/Note.h +include/hydrogen/core/Basics/Pattern.h +include/hydrogen/core/Basics/PatternList.h +include/hydrogen/core/Basics/Playlist.h +include/hydrogen/core/Basics/Sample.h +include/hydrogen/core/Basics/Song.h +include/hydrogen/core/CoreActionController.h +include/hydrogen/core/EventQueue.h +include/hydrogen/core/FX/Effects.h +include/hydrogen/core/FX/LadspaFX.h +include/hydrogen/core/Globals.h +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/Translations.h +include/hydrogen/core/Helpers/Xml.h +include/hydrogen/core/Hydrogen.h +include/hydrogen/core/IO/AlsaAudioDriver.h +include/hydrogen/core/IO/AlsaMidiDriver.h +include/hydrogen/core/IO/AudioOutput.h +include/hydrogen/core/IO/CoreAudioDriver.h +include/hydrogen/core/IO/CoreMidiDriver.h +include/hydrogen/core/IO/DiskWriterDriver.h +include/hydrogen/core/IO/FakeDriver.h +include/hydrogen/core/IO/JackAudioDriver.h +include/hydrogen/core/IO/JackMidiDriver.h +include/hydrogen/core/IO/MidiCommon.h +include/hydrogen/core/IO/MidiInput.h +include/hydrogen/core/IO/MidiOutput.h +include/hydrogen/core/IO/NullDriver.h +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/Lilipond/Lilypond.h +include/hydrogen/core/LocalFileMng.h +include/hydrogen/core/Logger.h +include/hydrogen/core/MidiAction.h +include/hydrogen/core/MidiMap.h +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/Sampler/Interpolation.h +include/hydrogen/core/Sampler/Sampler.h +include/hydrogen/core/Smf/SMF.h +include/hydrogen/core/Smf/SMFEvent.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 share/man/man1/hydrogen.1.gz share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml share/applications/org.hydrogenmusic.Hydrogen.desktop -share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%DATADIR%%/data/DefaultSong.h2song %%DATADIR%%/data/click.wav %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song @@ -190,6 +192,8 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%DATADIR%%/data/i18n/hydrogen_cs.qm %%DATADIR%%/data/i18n/hydrogen_de.qm %%DATADIR%%/data/i18n/hydrogen_el.qm +%%DATADIR%%/data/i18n/hydrogen_en.qm +%%DATADIR%%/data/i18n/hydrogen_en_GB.qm %%DATADIR%%/data/i18n/hydrogen_es.qm %%DATADIR%%/data/i18n/hydrogen_fr.qm %%DATADIR%%/data/i18n/hydrogen_gl.qm @@ -204,6 +208,7 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%DATADIR%%/data/i18n/hydrogen_sr.qm %%DATADIR%%/data/i18n/hydrogen_sv.qm %%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 @@ -230,7 +235,6 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%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_new.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 @@ -298,6 +302,8 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%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 @@ -332,6 +338,8 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%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 @@ -367,9 +375,6 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%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_recdel_off.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_recdel_on.png -%%DATADIR%%/data/img/gray/playerControlPanel/btn_recdel_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 @@ -493,3 +498,4 @@ share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg %%DATADIR%%/data/xsd/drumkit.xsd %%DATADIR%%/data/xsd/drumkit_pattern.xsd %%DATADIR%%/data/xsd/playlist.xsd +share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg