CVS commit: pkgsrc/audio/hydrogen

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/hydrogen
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 18 Jun 2020 12:57:49 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jun 18 12:57:49 UTC 2020

Modified Files:
        pkgsrc/audio/hydrogen: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/audio/hydrogen/patches: patch-cmake_FindHelper.cmake
Removed Files:
        pkgsrc/audio/hydrogen/patches: patch-CMakeLists.txt

Log Message:
hydrogen: Update to 1.0.0.rc1

This should fix the build.

Hydrogen 1.0.0-rc1 brings the following changes (compared to Hydrogen 1.0.0-beta2):

    several fixes to the Jack transport (missed/double beats at the begin of a pattern)
    fixed audio artifaces when using the ALSA driver
    fixed tempo problems/distorting when exporting a song
    playback track now scales correctly


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/audio/hydrogen/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/hydrogen/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/audio/hydrogen/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/hydrogen/options.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/hydrogen/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/hydrogen/patches/patch-cmake_FindHelper.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/hydrogen/Makefile
diff -u pkgsrc/audio/hydrogen/Makefile:1.61 pkgsrc/audio/hydrogen/Makefile:1.62
--- pkgsrc/audio/hydrogen/Makefile:1.61 Tue Jun  2 08:23:12 2020
+++ pkgsrc/audio/hydrogen/Makefile      Thu Jun 18 12:57:48 2020
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.61 2020/06/02 08:23:12 adam Exp $
+# $NetBSD: Makefile,v 1.62 2020/06/18 12:57:48 nia Exp $
 
-DISTNAME=      Hydrogen-1.0.0-beta1
-PKGNAME=       ${DISTNAME:tl:C/-beta/.beta/}
-PKGREVISION=   5
+DISTNAME=      hydrogen-1.0.0.rc1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=hydrogen-music/}
 GITHUB_PROJECT=        Hydrogen
-GITHUB_TAG=    ${PKGVERSION_NOREV:C/.beta/-beta/}
+GITHUB_TAG=    1.0.0-rc1
 
 MAINTAINER=    mrg%eterna.com.au@localhost
 HOMEPAGE=      http://hydrogen-music.org/
 COMMENT=       Real time drum machine/sequencer
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV:C/.beta/-beta/}
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV:C/.rc/-rc/}
 
-USE_LANGUAGES= c gnu++11
+USE_LANGUAGES= c c++
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 
-# C++11
-GCC_REQD+=     4.7
+# C++14
+GCC_REQD+=     5
 
 .include "../../mk/oss.buildlink3.mk"
 .if ${OSS_TYPE} != "none"
@@ -31,17 +29,17 @@ CMAKE_ARGS+=        -DWANT_OSS=OFF
 
 CMAKE_ARGS+=   -DWANT_CPPUNIT=OFF
 
-# NetBSD libarchive is old?
-CMAKE_ARGS+=   -DWANT_LIBARCHIVE=OFF
-CMAKE_ARGS+=   -DWANT_LIBTAR=ON
-
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
+# It rejectes the genreated .pc file for NetBSD libarchive.
+PREFER.libarchive=     pkgsrc
+
 .include "options.mk"
-.include "../../devel/libtar/buildlink3.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/liblo/buildlink3.mk"
 .include "../../audio/ladspa/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"

Index: pkgsrc/audio/hydrogen/PLIST
diff -u pkgsrc/audio/hydrogen/PLIST:1.10 pkgsrc/audio/hydrogen/PLIST:1.11
--- pkgsrc/audio/hydrogen/PLIST:1.10    Sat Oct 26 21:24:34 2019
+++ pkgsrc/audio/hydrogen/PLIST Thu Jun 18 12:57:48 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2019/10/26 21:24:34 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/06/18 12:57:48 nia Exp $
 bin/h2cli
 bin/h2player
 bin/hydrogen
@@ -9,7 +9,6 @@ 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/MidiCommon.h
 include/hydrogen/IO/MidiInput.h
@@ -20,6 +19,7 @@ include/hydrogen/IO/PortAudioDriver.h
 include/hydrogen/IO/PortMidiDriver.h
 include/hydrogen/IO/PulseAudioDriver.h
 include/hydrogen/IO/TransportInfo.h
+include/hydrogen/IO/jack_audio_driver.h
 include/hydrogen/LashClient.h
 include/hydrogen/LocalFileMng.h
 include/hydrogen/Preferences.h
@@ -36,6 +36,7 @@ include/hydrogen/basics/instrument_list.
 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
@@ -43,9 +44,9 @@ include/hydrogen/core_action_controller.
 include/hydrogen/event_queue.h
 include/hydrogen/fx/Effects.h
 include/hydrogen/fx/LadspaFX.h
-include/hydrogen/fx/ladspa.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
@@ -58,7 +59,6 @@ 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
 include/hydrogen/smf/SMF.h
@@ -69,8 +69,8 @@ include/hydrogen/timeline.h
 include/hydrogen/version.h
 lib/libhydrogen-core-1.0.0.so
 man/man1/hydrogen.1
-share/appdata/hydrogen.appdata.xml
-share/applications/hydrogen.desktop
+share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml
+share/applications/org.hydrogenmusic.Hydrogen.desktop
 share/hydrogen/data/DefaultSong.h2song
 share/hydrogen/data/click.wav
 share/hydrogen/data/demo_songs/GM_kit_Diddley.h2song
@@ -85,6 +85,11 @@ share/hydrogen/data/drumkits/GMRockKit/2
 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/Bell-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/Bell-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/Bell-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/Bell-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/Bell-Softest.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
@@ -111,6 +116,11 @@ share/hydrogen/data/drumkits/GMRockKit/H
 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/HatSemiOpen-Hard.wav
+share/hydrogen/data/drumkits/GMRockKit/HatSemiOpen-Hardest.wav
+share/hydrogen/data/drumkits/GMRockKit/HatSemiOpen-Med.wav
+share/hydrogen/data/drumkits/GMRockKit/HatSemiOpen-Soft.wav
+share/hydrogen/data/drumkits/GMRockKit/HatSemiOpen-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
@@ -176,44 +186,24 @@ share/hydrogen/data/drumkits/TR808Emulat
 share/hydrogen/data/drumkits/TR808EmulationKit/drumkit.xml
 share/hydrogen/data/emptySample.wav
 share/hydrogen/data/hydrogen.default.conf
-share/hydrogen/data/i18n/hydrogen.ca.qm
-share/hydrogen/data/i18n/hydrogen.ca.ts
-share/hydrogen/data/i18n/hydrogen.cs.qm
-share/hydrogen/data/i18n/hydrogen.cs.ts
-share/hydrogen/data/i18n/hydrogen.de.qm
-share/hydrogen/data/i18n/hydrogen.de.ts
-share/hydrogen/data/i18n/hydrogen.el.qm
-share/hydrogen/data/i18n/hydrogen.el.ts
-share/hydrogen/data/i18n/hydrogen.es.qm
-share/hydrogen/data/i18n/hydrogen.es.ts
-share/hydrogen/data/i18n/hydrogen.fr.qm
-share/hydrogen/data/i18n/hydrogen.fr.ts
-share/hydrogen/data/i18n/hydrogen.gl.qm
-share/hydrogen/data/i18n/hydrogen.gl.ts
-share/hydrogen/data/i18n/hydrogen.hr.qm
-share/hydrogen/data/i18n/hydrogen.hr.ts
-share/hydrogen/data/i18n/hydrogen.hu_HU.qm
-share/hydrogen/data/i18n/hydrogen.hu_HU.ts
-share/hydrogen/data/i18n/hydrogen.it.qm
-share/hydrogen/data/i18n/hydrogen.it.ts
-share/hydrogen/data/i18n/hydrogen.ja.qm
-share/hydrogen/data/i18n/hydrogen.ja.ts
-share/hydrogen/data/i18n/hydrogen.nl.qm
-share/hydrogen/data/i18n/hydrogen.nl.ts
-share/hydrogen/data/i18n/hydrogen.pl.qm
-share/hydrogen/data/i18n/hydrogen.pl.ts
-share/hydrogen/data/i18n/hydrogen.pt_BR.qm
-share/hydrogen/data/i18n/hydrogen.pt_BR.ts
-share/hydrogen/data/i18n/hydrogen.ru.qm
-share/hydrogen/data/i18n/hydrogen.ru.ts
-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/i18n/hydrogen_ca.qm
+share/hydrogen/data/i18n/hydrogen_cs.qm
+share/hydrogen/data/i18n/hydrogen_de.qm
+share/hydrogen/data/i18n/hydrogen_el.qm
+share/hydrogen/data/i18n/hydrogen_es.qm
+share/hydrogen/data/i18n/hydrogen_fr.qm
+share/hydrogen/data/i18n/hydrogen_gl.qm
+share/hydrogen/data/i18n/hydrogen_hr.qm
+share/hydrogen/data/i18n/hydrogen_hu_HU.qm
+share/hydrogen/data/i18n/hydrogen_it.qm
+share/hydrogen/data/i18n/hydrogen_ja.qm
+share/hydrogen/data/i18n/hydrogen_nl.qm
+share/hydrogen/data/i18n/hydrogen_pl.qm
+share/hydrogen/data/i18n/hydrogen_pt_BR.qm
+share/hydrogen/data/i18n/hydrogen_ru.qm
+share/hydrogen/data/i18n/hydrogen_sr.qm
+share/hydrogen/data/i18n/hydrogen_sv.qm
+share/hydrogen/data/i18n/hydrogen_uk.qm
 share/hydrogen/data/img/gray/about/aboutLogo.png
 share/hydrogen/data/img/gray/audiFileBrowser/go-home.png
 share/hydrogen/data/img/gray/audiFileBrowser/go-up.png
@@ -502,5 +492,5 @@ share/hydrogen/data/new_tutorial/img_tut
 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
+share/hydrogen/data/xsd/playlist.xsd
+share/icons/hicolor/scalable/apps/org.hydrogenmusic.Hydrogen.svg

Index: pkgsrc/audio/hydrogen/distinfo
diff -u pkgsrc/audio/hydrogen/distinfo:1.18 pkgsrc/audio/hydrogen/distinfo:1.19
--- pkgsrc/audio/hydrogen/distinfo:1.18 Sat Oct 26 21:24:34 2019
+++ pkgsrc/audio/hydrogen/distinfo      Thu Jun 18 12:57:48 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2019/10/26 21:24:34 nia Exp $
+$NetBSD: distinfo,v 1.19 2020/06/18 12:57:48 nia Exp $
 
-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
+SHA1 (hydrogen-1.0.0.rc1.tar.gz) = 05b9a55661d688c89bc03da8b8d108928321c747
+RMD160 (hydrogen-1.0.0.rc1.tar.gz) = 3f767bd22afbeb0b85991757f703a06741405cb5
+SHA512 (hydrogen-1.0.0.rc1.tar.gz) = 1615956ed02cfc0553ff09b651f76cb56dd35ec314a535fcb97f9658eebb6eee3eba884779b097767b404c82d6e074e2df342bdaabce77a47ad8278bd18be1be
+Size (hydrogen-1.0.0.rc1.tar.gz) = 11502829 bytes
+SHA1 (patch-cmake_FindHelper.cmake) = 2675d0c3819b2239f5e3285c31b80cb4d31dd3ca

Index: pkgsrc/audio/hydrogen/options.mk
diff -u pkgsrc/audio/hydrogen/options.mk:1.1 pkgsrc/audio/hydrogen/options.mk:1.2
--- pkgsrc/audio/hydrogen/options.mk:1.1        Sat Oct 26 21:24:34 2019
+++ pkgsrc/audio/hydrogen/options.mk    Thu Jun 18 12:57:48 2020
@@ -1,16 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2019/10/26 21:24:34 nia Exp $
+# $NetBSD: options.mk,v 1.2 2020/06/18 12:57:48 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
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+PKG_SUGGESTED_OPTIONS.*=       portaudio
 
 .include "../../mk/bsd.options.mk"
 
@@ -23,9 +17,11 @@ CMAKE_ARGS+= -DWANT_ALSA=OFF
 
 .if !empty(PKG_OPTIONS:Mjack)
 CMAKE_ARGS+=   -DWANT_JACK=ON
+CMAKE_ARGS+=   -DWANT_JACKSESSION=ON
 .include "../../audio/jack/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DWANT_JACK=OFF
+CMAKE_ARGS+=   -DWANT_JACKSESSION=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mportaudio)

Added files:

Index: pkgsrc/audio/hydrogen/patches/patch-cmake_FindHelper.cmake
diff -u /dev/null pkgsrc/audio/hydrogen/patches/patch-cmake_FindHelper.cmake:1.1
--- /dev/null   Thu Jun 18 12:57:49 2020
+++ pkgsrc/audio/hydrogen/patches/patch-cmake_FindHelper.cmake  Thu Jun 18 12:57:49 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-cmake_FindHelper.cmake,v 1.1 2020/06/18 12:57:49 nia Exp $
+
+No peeking outside of buildlink.
+
+--- cmake/FindHelper.cmake.orig        2020-06-07 18:13:40.000000000 +0000
++++ cmake/FindHelper.cmake
+@@ -31,13 +31,15 @@ macro(FIND_HELPER prefix pkg_name header
+         # find_path
+         find_path(${prefix}_INCLUDE_DIRS
+             NAMES ${header}
+-            HINTS ${PC_${prefix}_INCLUDEDIR} ${PC_${prefix}_INCLUDE_DIRS}
++            HINTS ${PC_${prefix}_INCLUDEDIR} ${PC_${prefix}_INCLUDE_DIRS} /usr/include
++            NO_DEFAULT_PATH
+             ENV ${prefix}_INCLUDE
+             )
+         # find_library
+         find_library(${prefix}_LIBRARIES
+             NAMES ${lib}
+-            HINTS ${PC_${prefix}_LIBDIR} ${PC_${prefix}_LIBRARY_DIRS}
++            HINTS ${PC_${prefix}_LIBDIR} ${PC_${prefix}_LIBRARY_DIRS} /usr/lib
++            NO_DEFAULT_PATH
+             ENV ${prefix}_PATH
+             )
+         include(FindPackageHandleStandardArgs)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index