Re: UPDATE: audio/hydrogen-1.0.0-beta1
On Fri Feb 21, 2020 at 04:55:27PM +, Stuart Henderson wrote:
> On 2020/02/21 17:46, Raphael Graf wrote:
> > This version uses Qt5 and adds support for midi output.
> > Here is a list of new features:
> > https://github.com/hydrogen-music/hydrogen/releases
> >
> > (The OSC support is disabled for now as it needs audio/liblo, see
> > https://marc.info/?l=openbsd-ports-cvs=150971570107043)
> >
> > Comments, ok?
> >
> >
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -u -p -r1.27 Makefile
> > --- Makefile12 Jul 2019 20:43:34 - 1.27
> > +++ Makefile21 Feb 2020 16:24:00 -
> > @@ -2,55 +2,59 @@
> >
> > COMMENT= software drum machine
> >
> > -DISTNAME= hydrogen-0.9.7
> > +DISTNAME= hydrogen-1.0.0-beta1
>
> that produces a bad PKGNAME, use e.g.
>
> DISTNAME= hydrogen-1.0.0-beta1
> PKGNAME= ${DISTNAME:S/-beta/beta/}
>
> The rest reads OK but untested
>
I was able to test this a little earlier. With sthen's tewak, ok
rsadowsk@. Thanks for making it happen.
Re: UPDATE: audio/hydrogen-1.0.0-beta1
On 2020/02/21 17:46, Raphael Graf wrote:
> This version uses Qt5 and adds support for midi output.
> Here is a list of new features:
> https://github.com/hydrogen-music/hydrogen/releases
>
> (The OSC support is disabled for now as it needs audio/liblo, see
> https://marc.info/?l=openbsd-ports-cvs=150971570107043)
>
> Comments, ok?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 Makefile
> --- Makefile 12 Jul 2019 20:43:34 - 1.27
> +++ Makefile 21 Feb 2020 16:24:00 -
> @@ -2,55 +2,59 @@
>
> COMMENT= software drum machine
>
> -DISTNAME=hydrogen-0.9.7
> +DISTNAME=hydrogen-1.0.0-beta1
that produces a bad PKGNAME, use e.g.
DISTNAME= hydrogen-1.0.0-beta1
PKGNAME=${DISTNAME:S/-beta/beta/}
The rest reads OK but untested
Re: UPDATE: audio/hydrogen
[...] >> > Yes, I already have a (working but incomplete) diff for 1.0.0-beta1. >> > It will need some more work on the midi part to support the new >> > midi feedback feature. >> >> ack. Ports-wise this update looks good, except for a hidden dep on >> cppunit, used to build src/tests/tests. >> >> --8<-- >> russell /usr/ports/pobj/hydrogen-0.9.7/build-amd64$ src/tests/tests >> QCoreApplication::applicationDirPath: Please instantiate the QApplication >> object first >> assertion "__instance" failed: file >> "/usr/ports/pobj/hydrogen-0.9.7/hydrogen-0.9.7/src/core/include/hydrogen/Preferences.h", >> line 238, function "get_instance" >> Abort trap >> -->8-- >> >> So ok jca@ ports-wise if you add devel/cppunit to BUILD_DEPENDS (not >> TEST_DEPENDS). Good luck if you want to fix tests. :) > > Instead of adding the dependency on cppunit, we can also disable building the > tests by adding -DWANT_CPPUNIT=OFF to CONFIGURE_ARGS (diff below). > (I plan to enable the tests in the next update, they do work in 1.0.0-beta) > > ok? yep, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: audio/hydrogen
On Tue, May 07, 2019 at 02:57:35PM -0400, Jeremie Courreges-Anglas wrote:
> On Mon, May 06 2019, Raphael Graf wrote:
> > On Sun, May 05, 2019 at 01:46:48PM +0200, Jeremie Courreges-Anglas wrote:
> >> On Sun, May 05 2019, Raphael Graf wrote:
> >> > Here is an update to hydrogen-0.9.7.
> >> >
> >> > Notable changes:
> >> > - Uses cmake instead of scons.
> >> > - There is a shared library and three additional command-line binaries.
> >> > - Enabled support for audio/ladspa plugins
> >> >
> >> > New features are listed here:
> >> > http://hydrogen-music.org/
> >> >
> >> > Comments/tests welcome.
> >>
> >> Here's some nitpicking about the Makefile only.
> >>
> >> > Index: Makefile
> >> > ===
> >> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> >> > retrieving revision 1.25
> >> > diff -u -p -u -p -r1.25 Makefile
> >> > --- Makefile 8 Jan 2019 21:24:29 - 1.25
> >> > +++ Makefile 5 May 2019 10:55:31 -
> >> > @@ -1,58 +1,54 @@
> >> > # $OpenBSD: Makefile,v 1.25 2019/01/08 21:24:29 sebastia Exp $
> >> >
> >> > -COMMENT=software drum machine
> >> > +COMMENT = software drum machine
> >>
> >> Please avoid gratuitous whitespace changes like this, it makes cvs blame
> >> less useful for no real gain. If you really care for consistency I'd
> >> suggest to tweak the COMPILER line instead.
> >
> > Ok, I've removed the whitespace changes from the diff.
>
> Thanks.
>
> >>
> >> > -DISTNAME= hydrogen-0.9.5
> >> > -CATEGORIES= audio
> >> > +DISTNAME = hydrogen-0.9.7
> >> > +CATEGORIES =audio
> >> >
> >> > -HOMEPAGE= http://www.hydrogen-music.org/
> >> > +HOMEPAGE = http://www.hydrogen-music.org/
> >> > +
> >> > +SHARED_LIBS = hydrogen-core-0.9.7 0.0
> >>
> >> I'm not saying it's a problem in practice, but this library name looks
> >> suspicious...
> >
> > Yes, it is a strange name, I don't think it is a real problem though.
> > Something like the following could be done to change the name:
> >
> > pre-configure:
> > sed -i 's,hydrogen-core-$${VERSION},hydrogen-core,g' \
> > ${WRKSRC}/src/*/CMakeLists.txt
> >
> > Do you think this is worthwhile?
>
> No, I just found the naming weird.
>
> >>
> >> > # GPLv2
> >> > -PERMIT_PACKAGE_CDROM= Yes
> >> > +PERMIT_PACKAGE_CDROM = Yes
> >> >
> >> > -WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
> >> > -WANTLIB += jack lrdf m ogg sndfile sndio
> >> > +WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml QtXmlPatterns
> >> > archive c
> >> > +WANTLIB += lrdf m sndfile sndio z
> >> >
> >> > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
> >> > +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
> >> >
> >> > COMPILER = base-clang ports-gcc base-gcc
> >> >
> >> > -LIB_DEPENDS=audio/libsndfile \
> >> > -audio/flac \
> >> > -audio/jack \
> >> > +LIB_DEPENDS = audio/libsndfile \
> >> > archivers/libarchive \
> >> > textproc/liblrdf
> >> >
> >> > -RUN_DEPENDS=devel/desktop-file-utils
> >> > +BUILD_DEPENDS = audio/ladspa
> >> > +
> >> > +RUN_DEPENDS = devel/desktop-file-utils
> >> >
> >> > -MODULES=x11/qt4 devel/scons
> >> > +MODULES = devel/cmake x11/qt4
> >>
> >> I would suggest splitting MODULES over multiple lines.
> >
> > done
> >
> >>
> >> Note: looks like hydrogen-1.0.0 will support Qt5.
> >
> > Yes, I already have a (working but incomplete) diff for 1.0.0-beta1.
> > It will need some more work on the midi part to support the new
> > midi feedback feature.
>
> ack. Ports-wise this update looks good, except for a hidden dep on
> cppunit, used to build src/tests/tests.
>
> --8<--
> russell /usr/ports/pobj/hydrogen-0.9.7/build-amd64$ src/tests/tests
> QCoreApplication::applicationDirPath: Please instantiate the QApplication
> object first
> assertion "__instance" failed: file
> "/usr/ports/pobj/hydrogen-0.9.7/hydrogen-0.9.7/src/core/include/hydrogen/Preferences.h",
> line 238, function "get_instance"
> Abort trap
> -->8--
>
> So ok jca@ ports-wise if you add devel/cppunit to BUILD_DEPENDS (not
> TEST_DEPENDS). Good luck if you want to fix tests. :)
Instead of adding the dependency on cppunit, we can also disable building the
tests by adding -DWANT_CPPUNIT=OFF to CONFIGURE_ARGS (diff below).
(I plan to enable the tests in the next update, they do work in 1.0.0-beta)
ok?
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
Index: Makefile
===
RCS file: /cvs/ports/audio/hydrogen/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile8 Jan 2019 21:24:29 -
Re: UPDATE: audio/hydrogen
On Mon, May 06 2019, Raphael Graf wrote:
> On Sun, May 05, 2019 at 01:46:48PM +0200, Jeremie Courreges-Anglas wrote:
>> On Sun, May 05 2019, Raphael Graf wrote:
>> > Here is an update to hydrogen-0.9.7.
>> >
>> > Notable changes:
>> > - Uses cmake instead of scons.
>> > - There is a shared library and three additional command-line binaries.
>> > - Enabled support for audio/ladspa plugins
>> >
>> > New features are listed here:
>> > http://hydrogen-music.org/
>> >
>> > Comments/tests welcome.
>>
>> Here's some nitpicking about the Makefile only.
>>
>> > Index: Makefile
>> > ===
>> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
>> > retrieving revision 1.25
>> > diff -u -p -u -p -r1.25 Makefile
>> > --- Makefile 8 Jan 2019 21:24:29 - 1.25
>> > +++ Makefile 5 May 2019 10:55:31 -
>> > @@ -1,58 +1,54 @@
>> > # $OpenBSD: Makefile,v 1.25 2019/01/08 21:24:29 sebastia Exp $
>> >
>> > -COMMENT= software drum machine
>> > +COMMENT = software drum machine
>>
>> Please avoid gratuitous whitespace changes like this, it makes cvs blame
>> less useful for no real gain. If you really care for consistency I'd
>> suggest to tweak the COMPILER line instead.
>
> Ok, I've removed the whitespace changes from the diff.
Thanks.
>>
>> > -DISTNAME= hydrogen-0.9.5
>> > -CATEGORIES= audio
>> > +DISTNAME =hydrogen-0.9.7
>> > +CATEGORIES = audio
>> >
>> > -HOMEPAGE= http://www.hydrogen-music.org/
>> > +HOMEPAGE =http://www.hydrogen-music.org/
>> > +
>> > +SHARED_LIBS = hydrogen-core-0.9.7 0.0
>>
>> I'm not saying it's a problem in practice, but this library name looks
>> suspicious...
>
> Yes, it is a strange name, I don't think it is a real problem though.
> Something like the following could be done to change the name:
>
> pre-configure:
> sed -i 's,hydrogen-core-$${VERSION},hydrogen-core,g' \
> ${WRKSRC}/src/*/CMakeLists.txt
>
> Do you think this is worthwhile?
No, I just found the naming weird.
>>
>> > # GPLv2
>> > -PERMIT_PACKAGE_CDROM= Yes
>> > +PERMIT_PACKAGE_CDROM =Yes
>> >
>> > -WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
>> > -WANTLIB += jack lrdf m ogg sndfile sndio
>> > +WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml QtXmlPatterns archive
>> > c
>> > +WANTLIB += lrdf m sndfile sndio z
>> >
>> > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
>> > +MASTER_SITES =${MASTER_SITE_SOURCEFORGE:=hydrogen/}
>> >
>> > COMPILER =base-clang ports-gcc base-gcc
>> >
>> > -LIB_DEPENDS= audio/libsndfile \
>> > - audio/flac \
>> > - audio/jack \
>> > +LIB_DEPENDS = audio/libsndfile \
>> >archivers/libarchive \
>> >textproc/liblrdf
>> >
>> > -RUN_DEPENDS= devel/desktop-file-utils
>> > +BUILD_DEPENDS = audio/ladspa
>> > +
>> > +RUN_DEPENDS = devel/desktop-file-utils
>> >
>> > -MODULES= x11/qt4 devel/scons
>> > +MODULES = devel/cmake x11/qt4
>>
>> I would suggest splitting MODULES over multiple lines.
>
> done
>
>>
>> Note: looks like hydrogen-1.0.0 will support Qt5.
>
> Yes, I already have a (working but incomplete) diff for 1.0.0-beta1.
> It will need some more work on the midi part to support the new
> midi feedback feature.
ack. Ports-wise this update looks good, except for a hidden dep on
cppunit, used to build src/tests/tests.
--8<--
russell /usr/ports/pobj/hydrogen-0.9.7/build-amd64$ src/tests/tests
QCoreApplication::applicationDirPath: Please instantiate the QApplication
object first
assertion "__instance" failed: file
"/usr/ports/pobj/hydrogen-0.9.7/hydrogen-0.9.7/src/core/include/hydrogen/Preferences.h",
line 238, function "get_instance"
Abort trap
-->8--
So ok jca@ ports-wise if you add devel/cppunit to BUILD_DEPENDS (not
TEST_DEPENDS). Good luck if you want to fix tests. :)
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: audio/hydrogen
On Sun, May 05, 2019 at 01:46:48PM +0200, Jeremie Courreges-Anglas wrote:
> On Sun, May 05 2019, Raphael Graf wrote:
> > Here is an update to hydrogen-0.9.7.
> >
> > Notable changes:
> > - Uses cmake instead of scons.
> > - There is a shared library and three additional command-line binaries.
> > - Enabled support for audio/ladspa plugins
> >
> > New features are listed here:
> > http://hydrogen-music.org/
> >
> > Comments/tests welcome.
>
> Here's some nitpicking about the Makefile only.
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -u -p -r1.25 Makefile
> > --- Makefile8 Jan 2019 21:24:29 - 1.25
> > +++ Makefile5 May 2019 10:55:31 -
> > @@ -1,58 +1,54 @@
> > # $OpenBSD: Makefile,v 1.25 2019/01/08 21:24:29 sebastia Exp $
> >
> > -COMMENT= software drum machine
> > +COMMENT = software drum machine
>
> Please avoid gratuitous whitespace changes like this, it makes cvs blame
> less useful for no real gain. If you really care for consistency I'd
> suggest to tweak the COMPILER line instead.
Ok, I've removed the whitespace changes from the diff.
>
> > -DISTNAME= hydrogen-0.9.5
> > -CATEGORIES=audio
> > +DISTNAME = hydrogen-0.9.7
> > +CATEGORIES = audio
> >
> > -HOMEPAGE= http://www.hydrogen-music.org/
> > +HOMEPAGE = http://www.hydrogen-music.org/
> > +
> > +SHARED_LIBS = hydrogen-core-0.9.7 0.0
>
> I'm not saying it's a problem in practice, but this library name looks
> suspicious...
Yes, it is a strange name, I don't think it is a real problem though.
Something like the following could be done to change the name:
pre-configure:
sed -i 's,hydrogen-core-$${VERSION},hydrogen-core,g' \
${WRKSRC}/src/*/CMakeLists.txt
Do you think this is worthwhile?
>
> > # GPLv2
> > -PERMIT_PACKAGE_CDROM= Yes
> > +PERMIT_PACKAGE_CDROM = Yes
> >
> > -WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
> > -WANTLIB += jack lrdf m ogg sndfile sndio
> > +WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml QtXmlPatterns archive c
> > +WANTLIB += lrdf m sndfile sndio z
> >
> > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
> > +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
> >
> > COMPILER = base-clang ports-gcc base-gcc
> >
> > -LIB_DEPENDS= audio/libsndfile \
> > - audio/flac \
> > - audio/jack \
> > +LIB_DEPENDS = audio/libsndfile \
> > archivers/libarchive \
> > textproc/liblrdf
> >
> > -RUN_DEPENDS= devel/desktop-file-utils
> > +BUILD_DEPENDS =audio/ladspa
> > +
> > +RUN_DEPENDS = devel/desktop-file-utils
> >
> > -MODULES= x11/qt4 devel/scons
> > +MODULES = devel/cmake x11/qt4
>
> I would suggest splitting MODULES over multiple lines.
done
>
> Note: looks like hydrogen-1.0.0 will support Qt5.
Yes, I already have a (working but incomplete) diff for 1.0.0-beta1.
It will need some more work on the midi part to support the new
midi feedback feature.
>
> > -MAKE_ENV+= QTDIR="${MODQT4_QTDIR}"
> > -MODSCONS_FLAGS=localinc="-I${LOCALBASE}/include
> > -I${X11BASE}/include" \
> > - locallib="-L${LOCALBASE}/lib -L${X11BASE}/lib -logg
> > -lpthread" \
> > - optflags="${CXXFLAGS} " \
> > - libarchive="1" sndio="1" oss="0" alsa="0" portmidi="0" \
> > - portaudio="0" lash="0" lrdf="1"
> > +CONFIGURE_ENV =LADSPA_PATH=${LOCALBASE}/lib/ladspa
> >
> > -NO_TEST= Yes
> > +CONFIGURE_ARGS = -DWANT_ALSA=OFF \
> > + -DWANT_DEBUG=OFF \
> > + -DWANT_JACK=OFF \
> > + -DWANT_JACKSESSION=OFF \
> > + -DWANT_LADSPA=ON \
> > + -DWANT_LRDF=ON \
> > + -DWANT_NSMSESSION=OFF \
> > + -DWANT_PORTAUDIO=OFF \
> > + -DWANT_PORTMIDI=OFF \
> > + -DWANT_PULSEAUDIO=OFF \
> > + -DWANT_SNDIO=ON
> > +
> > +NO_TEST = Yes
> >
> > post-extract:
> > cp ${FILESDIR}/Sndio{Audio,Midi}Driver.h \
> > - ${FILESDIR}/sndio_{audio,midi}_driver.cpp \
> > - ${WRKSRC}/libs/hydrogen/src/IO
> > -
> > -do-install:
> > - ${INSTALL_PROGRAM} ${WRKBUILD}/hydrogen ${PREFIX}/bin
> > - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> > - ${INSTALL_DATA} ${WRKBUILD}/hydrogen.desktop \
> > - ${PREFIX}/share/applications
> > - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> > - ${INSTALL_DATA} ${WRKSRC}/data/img/gray/h2-icon.svg \
> > - ${PREFIX}/share/pixmaps
> > - ${INSTALL_DATA_DIR}
Re: UPDATE: audio/hydrogen
On Sun, May 05 2019, Raphael Graf wrote:
> Here is an update to hydrogen-0.9.7.
>
> Notable changes:
> - Uses cmake instead of scons.
> - There is a shared library and three additional command-line binaries.
> - Enabled support for audio/ladspa plugins
>
> New features are listed here:
> http://hydrogen-music.org/
>
> Comments/tests welcome.
Here's some nitpicking about the Makefile only.
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile 8 Jan 2019 21:24:29 - 1.25
> +++ Makefile 5 May 2019 10:55:31 -
> @@ -1,58 +1,54 @@
> # $OpenBSD: Makefile,v 1.25 2019/01/08 21:24:29 sebastia Exp $
>
> -COMMENT= software drum machine
> +COMMENT =software drum machine
Please avoid gratuitous whitespace changes like this, it makes cvs blame
less useful for no real gain. If you really care for consistency I'd
suggest to tweak the COMPILER line instead.
> -DISTNAME=hydrogen-0.9.5
> -CATEGORIES= audio
> +DISTNAME = hydrogen-0.9.7
> +CATEGORIES = audio
>
> -HOMEPAGE=http://www.hydrogen-music.org/
> +HOMEPAGE = http://www.hydrogen-music.org/
> +
> +SHARED_LIBS =hydrogen-core-0.9.7 0.0
I'm not saying it's a problem in practice, but this library name looks
suspicious...
> # GPLv2
> -PERMIT_PACKAGE_CDROM=Yes
> +PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
> -WANTLIB += jack lrdf m ogg sndfile sndio
> +WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml QtXmlPatterns archive c
> +WANTLIB += lrdf m sndfile sndio z
>
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=hydrogen/}
> +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -LIB_DEPENDS= audio/libsndfile \
> - audio/flac \
> - audio/jack \
> +LIB_DEPENDS =audio/libsndfile \
> archivers/libarchive \
> textproc/liblrdf
>
> -RUN_DEPENDS= devel/desktop-file-utils
> +BUILD_DEPENDS = audio/ladspa
> +
> +RUN_DEPENDS =devel/desktop-file-utils
>
> -MODULES= x11/qt4 devel/scons
> +MODULES =devel/cmake x11/qt4
I would suggest splitting MODULES over multiple lines.
Note: looks like hydrogen-1.0.0 will support Qt5.
> -MAKE_ENV+= QTDIR="${MODQT4_QTDIR}"
> -MODSCONS_FLAGS= localinc="-I${LOCALBASE}/include
> -I${X11BASE}/include" \
> - locallib="-L${LOCALBASE}/lib -L${X11BASE}/lib -logg
> -lpthread" \
> - optflags="${CXXFLAGS} " \
> - libarchive="1" sndio="1" oss="0" alsa="0" portmidi="0" \
> - portaudio="0" lash="0" lrdf="1"
> +CONFIGURE_ENV = LADSPA_PATH=${LOCALBASE}/lib/ladspa
>
> -NO_TEST= Yes
> +CONFIGURE_ARGS = -DWANT_ALSA=OFF \
> + -DWANT_DEBUG=OFF \
> + -DWANT_JACK=OFF \
> + -DWANT_JACKSESSION=OFF \
> + -DWANT_LADSPA=ON \
> + -DWANT_LRDF=ON \
> + -DWANT_NSMSESSION=OFF \
> + -DWANT_PORTAUDIO=OFF \
> + -DWANT_PORTMIDI=OFF \
> + -DWANT_PULSEAUDIO=OFF \
> + -DWANT_SNDIO=ON
> +
> +NO_TEST =Yes
>
> post-extract:
> cp ${FILESDIR}/Sndio{Audio,Midi}Driver.h \
> - ${FILESDIR}/sndio_{audio,midi}_driver.cpp \
> - ${WRKSRC}/libs/hydrogen/src/IO
> -
> -do-install:
> - ${INSTALL_PROGRAM} ${WRKBUILD}/hydrogen ${PREFIX}/bin
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> - ${INSTALL_DATA} ${WRKBUILD}/hydrogen.desktop \
> - ${PREFIX}/share/applications
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> - ${INSTALL_DATA} ${WRKSRC}/data/img/gray/h2-icon.svg \
> - ${PREFIX}/share/pixmaps
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/hydrogen
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/hydrogen/data
> - #mv -f ${WRKSRC}/data/new_tutorial ${WRKDIR}
> - cd ${WRKSRC}/data && umask 022 && \
> - pax -rw . ${PREFIX}/share/hydrogen/data
> + ${WRKSRC}/src/core/include/hydrogen/IO
> + cp ${FILESDIR}/sndio_{audio,midi}_driver.cpp \
> + ${WRKSRC}/src/core/src/IO
>
> .include
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: audio/hydrogen and make it actually usable again
On Tue, Jan 08, 2019 at 07:45:18PM +0100, Sebastian Reitenbach wrote:
> Am Dienstag, Januar 08, 2019 16:44 CET, Alexandre Ratchov
> schrieb:
>
> > On Tue, Jan 08, 2019 at 03:12:05PM +0100, Sebastian Reitenbach wrote:
> > >
> > > @@ -240,15 +240,15 @@
> > > QString name;
> > > int i;
> > >
> > > - /* midithru:* */
> > > + /* midithru/* */
> > > for (i = 0; i < 4; i++) {
> > > - name = "midithru:" + QString::number(i);
> > > + name = "midithru/" + QString::number(i);
> > > portList.push_back(name);
> > > }
> > >
> > > - /* rmidi:* */
> > > + /* rmidi/* */
> > > for (i = 0; i < 8; i++) {
> > > - name = "rmidi:" + QString::number(i);
> > > + name = "rmidi/" + QString::number(i);
> > > QFileInfo di("/dev/rmidi" + QString::number(i));
> > > if (di.exists())
> > > portList.push_back(name);
> >
> > Hi,
> >
> > IMHO, it's not worth trying to build a list of ports. Just returning
> > MIO_PORTANY seems better. In most cases this default value is fine
> > because it is the default for other programs as well, so programs are
> > expected to work together. If the default is not suitable, the user
> > still can use the MIDIDEVICE variable or midicat(1).
>
> In that case here, I only fixed what was already there, so just fixed
> how the names of the midi devices are generated, that list generation
> code was already there. The default, when hydrogen starts up is to
> have "None" device configured, which kind of equals to 'default',
> which triggers that MIO_PORTANY is set, so it works already that
> way out of the box. Since the list generation was already there,
> I found it easier to fix than to remove it ;)
So, let's keep the diff you propose; if necessary, this could be
cleaned up in another diff, later.
FWIW, I'm using sndiod's -q options (to make the midi devices
available to multiple programs). In this case the "rmidi" devices are
not usable any longer because sndiod holds them open.
Re: UPDATE: audio/hydrogen and make it actually usable again
Am Dienstag, Januar 08, 2019 18:14 CET, Stuart Henderson
schrieb:
> On 2019/01/08 15:12, Sebastian Reitenbach wrote:
> > Hi,
> >
> > I was told the patch doesn't apply, and it seems it got mangled when I
> > cut'n pasted it into the mail.
> > another try, and also attached.
>
> The attachment works, inline is mangled.
>
> port-lib-depends-check says -
>
> hydrogen-0.9.5(audio/hydrogen):
> Extra: FLAC++.9 FLAC.10
>
> and changelog says "remove direct dependencies to libflac" so that
> dependency should be removed - better to regenerate WANTLIB I think
> as it's a bit messy:
>
> WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
> WANTLIB += jack lrdf m ogg sndfile sndio
>
> (and remove flac from LIB_DEPENDS).
>
> Otherwise reads OK. I'd have to dig out a laptop to test runtime
> (uaudio on xhci on my main workstation..) but notbroken > broken so
> if it runs then OK as far as I'm concerned with dep's fixed.
>
>
ugh, obviously forgot the port-lib-depends-check to run after updating.
I tested on amd64 with
azalia1 at pci0 dev 27 function 0 "Intel 7 Series HD Audio" rev 0x04: msi
azalia1: codecs: Realtek ALC221
audio0 at azalia1
and a umidi MIDI input.
I'll fix the dependencies before going ahead. Just waiting for Alexandres
comment on the midi selector.
thanks
Sebastian
>
>
>
>
> > Sebastian
> >
> > Am Montag, Januar 07, 2019 23:39 CET, "Sebastian Reitenbach"
> > schrieb:
> >
> > > The version of hydrogen in ports is quite old, and when you startup the
> > > GUI,
> > > it is totally broken and unusable.
> > >
> > > So the patch below updates to 0.9.5 (still quite old), but with
> > > 0.9.6 the build infrastructure was changed from scons to cmake, so
> > > updating to something newer is an excercise left for another day ;)
> > >
> > > I also tested the MIDI input, seems the midi device names changed since
> > > 2010 from
> > > rmidi:X to rmidi/X so updated that, as well as using MIO_PORTANY as
> > > default
> > > when passing the device to mio_open.
> > > So MIDI input kind of works with my umidi keyboard now, either setting
> > > MIDIDEVICE
> > > env var, or configuring it in the preferences.
> > >
> > > any comments, or even OK?
> > >
> > > cheers,
> > > Sebastian
> > >
> >
> > ? hydrogen-0.9.5.diff
> > ? output
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> > retrieving revision 1.24
> > diff -u -r1.24 Makefile
> > --- Makefile24 Oct 2018 14:27:57 - 1.24
> > +++ Makefile8 Jan 2019 14:01:50 -
> > @@ -2,8 +2,7 @@
> >
> > COMMENT= software drum machine
> >
> > -DISTNAME= hydrogen-0.9.4
> > -REVISION= 7
> > +DISTNAME= hydrogen-0.9.5
> > CATEGORIES=audio
> >
> > HOMEPAGE= http://www.hydrogen-music.org/
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/distinfo,v
> > retrieving revision 1.4
> > diff -u -r1.4 distinfo
> > --- distinfo18 Jan 2015 03:12:42 - 1.4
> > +++ distinfo8 Jan 2019 14:01:50 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (hydrogen-0.9.4.tar.gz) =
> > mCt2i0joQCEElJxk+sTXTYBPQbarG5BFdxGEDamWhdc=
> > -SIZE (hydrogen-0.9.4.tar.gz) = 3808532
> > +SHA256 (hydrogen-0.9.5.tar.gz) =
> > ljxz75EeyedYnlAtF987eU3QJ9fpmja1EVoLtROJ2cM=
> > +SIZE (hydrogen-0.9.5.tar.gz) = 5239702
> > Index: files/sndio_midi_driver.cpp
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/files/sndio_midi_driver.cpp,v
> > retrieving revision 1.1
> > diff -u -r1.1 sndio_midi_driver.cpp
> > --- files/sndio_midi_driver.cpp 11 Jan 2010 05:11:32 - 1.1
> > +++ files/sndio_midi_driver.cpp 8 Jan 2019 14:01:50 -
> > @@ -34,7 +34,7 @@
> > MidiMessage msg;
> > struct pollfd pfd;
> > nfds_t nfds;
> > - char buf[1], sysex_data[256], status = 0;
> > + unsigned char buf[1], sysex_data[256], status = 0;
> > int i, msglen, count = 0, sysex_len = 0;
> >
> > _INFOLOG("SndioMidiDriver_thread starting");
> > @@ -181,7 +181,7 @@
> > }
> >
> > SndioMidiDriver::SndioMidiDriver()
> > - : MidiInput("SndioMidiDriver")
> > + : MidiInput("SndioMidiDriver"), Object( "SndioMidiDriver" )
> > , m_bRunning(false)
> > {
> > hdl = NULL;
> > @@ -205,7 +205,7 @@
> > if (strncmp(midiDevice, "", 1) == 0 ||
> > strncmp(midiDevice, "None", 5) == 0 ||
> > strncmp(midiDevice, "default", 8) == 0)
> > - hdl = mio_open(NULL, MIO_IN, 0);
> > + hdl = mio_open(MIO_PORTANY, MIO_IN, 0);
> > else
> > hdl = mio_open(midiDevice, MIO_IN, 0);
> >
> > @@ -240,15 +240,15 @@
> > QString name;
> > int i;
> >
> > - /* midithru:* */
> > + /* midithru/* */
> > for (i = 0; i < 4; i++) {
> > - name = "midithru:" + QString::number(i);
> > + name =
Re: UPDATE: audio/hydrogen and make it actually usable again
Am Dienstag, Januar 08, 2019 16:44 CET, Alexandre Ratchov
schrieb:
> On Tue, Jan 08, 2019 at 03:12:05PM +0100, Sebastian Reitenbach wrote:
> >
> > @@ -240,15 +240,15 @@
> > QString name;
> > int i;
> >
> > - /* midithru:* */
> > + /* midithru/* */
> > for (i = 0; i < 4; i++) {
> > - name = "midithru:" + QString::number(i);
> > + name = "midithru/" + QString::number(i);
> > portList.push_back(name);
> > }
> >
> > - /* rmidi:* */
> > + /* rmidi/* */
> > for (i = 0; i < 8; i++) {
> > - name = "rmidi:" + QString::number(i);
> > + name = "rmidi/" + QString::number(i);
> > QFileInfo di("/dev/rmidi" + QString::number(i));
> > if (di.exists())
> > portList.push_back(name);
>
> Hi,
>
> IMHO, it's not worth trying to build a list of ports. Just returning
> MIO_PORTANY seems better. In most cases this default value is fine
> because it is the default for other programs as well, so programs are
> expected to work together. If the default is not suitable, the user
> still can use the MIDIDEVICE variable or midicat(1).
In that case here, I only fixed what was already there, so just fixed
how the names of the midi devices are generated, that list generation
code was already there. The default, when hydrogen starts up is to
have "None" device configured, which kind of equals to 'default',
which triggers that MIO_PORTANY is set, so it works already that
way out of the box. Since the list generation was already there,
I found it easier to fix than to remove it ;)
But you're right, since hydrogen only supports one MIDI device as
input, there is not much gain here, the only thing would be that
the configuration would slightly more match other OSs, and
would match what the hydrogen help has, which obviously
doesn't mention anything about sndio ;)
If you prefer, I could remove the selection.
cheers,
Sebastian
However, since
Re: UPDATE: audio/hydrogen and make it actually usable again
On 2019/01/08 15:12, Sebastian Reitenbach wrote:
> Hi,
>
> I was told the patch doesn't apply, and it seems it got mangled when I cut'n
> pasted it into the mail.
> another try, and also attached.
The attachment works, inline is mangled.
port-lib-depends-check says -
hydrogen-0.9.5(audio/hydrogen):
Extra: FLAC++.9 FLAC.10
and changelog says "remove direct dependencies to libflac" so that
dependency should be removed - better to regenerate WANTLIB I think
as it's a bit messy:
WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml archive c
WANTLIB += jack lrdf m ogg sndfile sndio
(and remove flac from LIB_DEPENDS).
Otherwise reads OK. I'd have to dig out a laptop to test runtime
(uaudio on xhci on my main workstation..) but notbroken > broken so
if it runs then OK as far as I'm concerned with dep's fixed.
> Sebastian
>
> Am Montag, Januar 07, 2019 23:39 CET, "Sebastian Reitenbach"
> schrieb:
>
> > The version of hydrogen in ports is quite old, and when you startup the GUI,
> > it is totally broken and unusable.
> >
> > So the patch below updates to 0.9.5 (still quite old), but with
> > 0.9.6 the build infrastructure was changed from scons to cmake, so
> > updating to something newer is an excercise left for another day ;)
> >
> > I also tested the MIDI input, seems the midi device names changed since
> > 2010 from
> > rmidi:X to rmidi/X so updated that, as well as using MIO_PORTANY as default
> > when passing the device to mio_open.
> > So MIDI input kind of works with my umidi keyboard now, either setting
> > MIDIDEVICE
> > env var, or configuring it in the preferences.
> >
> > any comments, or even OK?
> >
> > cheers,
> > Sebastian
> >
>
> ? hydrogen-0.9.5.diff
> ? output
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> retrieving revision 1.24
> diff -u -r1.24 Makefile
> --- Makefile 24 Oct 2018 14:27:57 - 1.24
> +++ Makefile 8 Jan 2019 14:01:50 -
> @@ -2,8 +2,7 @@
>
> COMMENT= software drum machine
>
> -DISTNAME=hydrogen-0.9.4
> -REVISION=7
> +DISTNAME=hydrogen-0.9.5
> CATEGORIES= audio
>
> HOMEPAGE=http://www.hydrogen-music.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/hydrogen/distinfo,v
> retrieving revision 1.4
> diff -u -r1.4 distinfo
> --- distinfo 18 Jan 2015 03:12:42 - 1.4
> +++ distinfo 8 Jan 2019 14:01:50 -
> @@ -1,2 +1,2 @@
> -SHA256 (hydrogen-0.9.4.tar.gz) = mCt2i0joQCEElJxk+sTXTYBPQbarG5BFdxGEDamWhdc=
> -SIZE (hydrogen-0.9.4.tar.gz) = 3808532
> +SHA256 (hydrogen-0.9.5.tar.gz) = ljxz75EeyedYnlAtF987eU3QJ9fpmja1EVoLtROJ2cM=
> +SIZE (hydrogen-0.9.5.tar.gz) = 5239702
> Index: files/sndio_midi_driver.cpp
> ===
> RCS file: /cvs/ports/audio/hydrogen/files/sndio_midi_driver.cpp,v
> retrieving revision 1.1
> diff -u -r1.1 sndio_midi_driver.cpp
> --- files/sndio_midi_driver.cpp 11 Jan 2010 05:11:32 - 1.1
> +++ files/sndio_midi_driver.cpp 8 Jan 2019 14:01:50 -
> @@ -34,7 +34,7 @@
> MidiMessage msg;
> struct pollfd pfd;
> nfds_t nfds;
> - char buf[1], sysex_data[256], status = 0;
> + unsigned char buf[1], sysex_data[256], status = 0;
> int i, msglen, count = 0, sysex_len = 0;
>
> _INFOLOG("SndioMidiDriver_thread starting");
> @@ -181,7 +181,7 @@
> }
>
> SndioMidiDriver::SndioMidiDriver()
> - : MidiInput("SndioMidiDriver")
> + : MidiInput("SndioMidiDriver"), Object( "SndioMidiDriver" )
> , m_bRunning(false)
> {
> hdl = NULL;
> @@ -205,7 +205,7 @@
> if (strncmp(midiDevice, "", 1) == 0 ||
> strncmp(midiDevice, "None", 5) == 0 ||
> strncmp(midiDevice, "default", 8) == 0)
> - hdl = mio_open(NULL, MIO_IN, 0);
> + hdl = mio_open(MIO_PORTANY, MIO_IN, 0);
> else
> hdl = mio_open(midiDevice, MIO_IN, 0);
>
> @@ -240,15 +240,15 @@
> QString name;
> int i;
>
> - /* midithru:* */
> + /* midithru/* */
> for (i = 0; i < 4; i++) {
> - name = "midithru:" + QString::number(i);
> + name = "midithru/" + QString::number(i);
> portList.push_back(name);
> }
>
> - /* rmidi:* */
> + /* rmidi/* */
> for (i = 0; i < 8; i++) {
> - name = "rmidi:" + QString::number(i);
> + name = "rmidi/" + QString::number(i);
> QFileInfo di("/dev/rmidi" + QString::number(i));
> if (di.exists())
> portList.push_back(name);
> Index: patches/patch-Sconstruct
> ===
> RCS file: /cvs/ports/audio/hydrogen/patches/patch-Sconstruct,v
> retrieving revision 1.2
> diff -u -r1.2 patch-Sconstruct
> ---
Re: UPDATE: audio/hydrogen and make it actually usable again
On Tue, Jan 08, 2019 at 03:12:05PM +0100, Sebastian Reitenbach wrote:
>
> @@ -240,15 +240,15 @@
> QString name;
> int i;
>
> - /* midithru:* */
> + /* midithru/* */
> for (i = 0; i < 4; i++) {
> - name = "midithru:" + QString::number(i);
> + name = "midithru/" + QString::number(i);
> portList.push_back(name);
> }
>
> - /* rmidi:* */
> + /* rmidi/* */
> for (i = 0; i < 8; i++) {
> - name = "rmidi:" + QString::number(i);
> + name = "rmidi/" + QString::number(i);
> QFileInfo di("/dev/rmidi" + QString::number(i));
> if (di.exists())
> portList.push_back(name);
Hi,
IMHO, it's not worth trying to build a list of ports. Just returning
MIO_PORTANY seems better. In most cases this default value is fine
because it is the default for other programs as well, so programs are
expected to work together. If the default is not suitable, the user
still can use the MIDIDEVICE variable or midicat(1).
Re: UPDATE: audio/hydrogen and make it actually usable again
Hi,
I was told the patch doesn't apply, and it seems it got mangled when I cut'n
pasted it into the mail.
another try, and also attached.
Sebastian
Am Montag, Januar 07, 2019 23:39 CET, "Sebastian Reitenbach"
schrieb:
> The version of hydrogen in ports is quite old, and when you startup the GUI,
> it is totally broken and unusable.
>
> So the patch below updates to 0.9.5 (still quite old), but with
> 0.9.6 the build infrastructure was changed from scons to cmake, so
> updating to something newer is an excercise left for another day ;)
>
> I also tested the MIDI input, seems the midi device names changed since 2010
> from
> rmidi:X to rmidi/X so updated that, as well as using MIO_PORTANY as default
> when passing the device to mio_open.
> So MIDI input kind of works with my umidi keyboard now, either setting
> MIDIDEVICE
> env var, or configuring it in the preferences.
>
> any comments, or even OK?
>
> cheers,
> Sebastian
>
? hydrogen-0.9.5.diff
? output
Index: Makefile
===
RCS file: /cvs/ports/audio/hydrogen/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile24 Oct 2018 14:27:57 - 1.24
+++ Makefile8 Jan 2019 14:01:50 -
@@ -2,8 +2,7 @@
COMMENT= software drum machine
-DISTNAME= hydrogen-0.9.4
-REVISION= 7
+DISTNAME= hydrogen-0.9.5
CATEGORIES=audio
HOMEPAGE= http://www.hydrogen-music.org/
Index: distinfo
===
RCS file: /cvs/ports/audio/hydrogen/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo18 Jan 2015 03:12:42 - 1.4
+++ distinfo8 Jan 2019 14:01:50 -
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.4.tar.gz) = mCt2i0joQCEElJxk+sTXTYBPQbarG5BFdxGEDamWhdc=
-SIZE (hydrogen-0.9.4.tar.gz) = 3808532
+SHA256 (hydrogen-0.9.5.tar.gz) = ljxz75EeyedYnlAtF987eU3QJ9fpmja1EVoLtROJ2cM=
+SIZE (hydrogen-0.9.5.tar.gz) = 5239702
Index: files/sndio_midi_driver.cpp
===
RCS file: /cvs/ports/audio/hydrogen/files/sndio_midi_driver.cpp,v
retrieving revision 1.1
diff -u -r1.1 sndio_midi_driver.cpp
--- files/sndio_midi_driver.cpp 11 Jan 2010 05:11:32 - 1.1
+++ files/sndio_midi_driver.cpp 8 Jan 2019 14:01:50 -
@@ -34,7 +34,7 @@
MidiMessage msg;
struct pollfd pfd;
nfds_t nfds;
- char buf[1], sysex_data[256], status = 0;
+ unsigned char buf[1], sysex_data[256], status = 0;
int i, msglen, count = 0, sysex_len = 0;
_INFOLOG("SndioMidiDriver_thread starting");
@@ -181,7 +181,7 @@
}
SndioMidiDriver::SndioMidiDriver()
- : MidiInput("SndioMidiDriver")
+ : MidiInput("SndioMidiDriver"), Object( "SndioMidiDriver" )
, m_bRunning(false)
{
hdl = NULL;
@@ -205,7 +205,7 @@
if (strncmp(midiDevice, "", 1) == 0 ||
strncmp(midiDevice, "None", 5) == 0 ||
strncmp(midiDevice, "default", 8) == 0)
- hdl = mio_open(NULL, MIO_IN, 0);
+ hdl = mio_open(MIO_PORTANY, MIO_IN, 0);
else
hdl = mio_open(midiDevice, MIO_IN, 0);
@@ -240,15 +240,15 @@
QString name;
int i;
- /* midithru:* */
+ /* midithru/* */
for (i = 0; i < 4; i++) {
- name = "midithru:" + QString::number(i);
+ name = "midithru/" + QString::number(i);
portList.push_back(name);
}
- /* rmidi:* */
+ /* rmidi/* */
for (i = 0; i < 8; i++) {
- name = "rmidi:" + QString::number(i);
+ name = "rmidi/" + QString::number(i);
QFileInfo di("/dev/rmidi" + QString::number(i));
if (di.exists())
portList.push_back(name);
Index: patches/patch-Sconstruct
===
RCS file: /cvs/ports/audio/hydrogen/patches/patch-Sconstruct,v
retrieving revision 1.2
diff -u -r1.2 patch-Sconstruct
--- patches/patch-Sconstruct20 Jul 2011 12:08:24 - 1.2
+++ patches/patch-Sconstruct8 Jan 2019 14:01:50 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Sconstruct,v 1.2 2011/07/20 12:08:24 sthen Exp $
Sconstruct.origMon Sep 7 22:31:13 2009
-+++ Sconstruct Wed Jul 20 12:45:04 2011
-@@ -47,20 +47,21 @@ def get_platform_flags( opts ):
+Index: Sconstruct
+--- Sconstruct.orig
Sconstruct
+@@ -47,19 +47,20 @@ def get_platform_flags( opts ):
env = Environment( options = opts )
@@ -18,16 +19,15 @@
#cppflags += " %s" % get_optimized_flags( target_cpu )
for flag in env["optflags"].split(" "):
cppflags.append(flag)
-
-
+
if str(env['oss']) == "1": cppflags.append('-DOSS_SUPPORT')
+ if str(env['sndio']) == "1":
