Import of pkgsrc-2015Q1

This commit is contained in:
2016-01-21 23:40:00 +01:00
committed by sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
+16 -5
View File
@@ -1,10 +1,14 @@
# $NetBSD: Makefile,v 1.43 2014/03/09 10:48:48 wiedi Exp $
# $NetBSD: Makefile,v 1.46 2014/09/10 20:08:42 mrg Exp $
DISTNAME= hydrogen-0.9.6-beta3
PKGNAME= hydrogen-0.9.6.beta3
DISTNAME= 0.9.6.1
PKGNAME= hydrogen-0.9.6.1
CATEGORIES= audio
MASTER_SITES= https://github.com/hydrogen-music/hydrogen/archive/
# Hydrogen publishes files like ".../archive/0.9.6.1.tar.gz"
DIST_SUBDIR= ${PKGNAME_NOREV}
WRKSRC= ${WRKDIR}/${PKGNAME}
MAINTAINER= mrg@eterna.com.au
HOMEPAGE= http://www.hydrogen-music.org/
COMMENT= Real time drum machine/sequencer
@@ -14,12 +18,17 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
MAKE_ENV+= QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
#CONFIGURE_ENV+= LADSPA_PATH=${BUILDLINK_PREFIX.ladspa}/lib/ladspa
USE_CMAKE= yes
CMAKE_ARGS+= -DWANT_OSS=ON
CMAKE_ARGS+= -DWANT_LIBARCHIVE=ON
CMAKE_ARGS+= -DWANT_JACK=OFF
CMAKE_ARGS+= -DWANT_LRDF=OFF
# options.mk this, and ladspa.
CMAKE_ARGS+= -DWANT_PULSEAUDIO=OFF
# NetBSD libarchive is old?
CMAKE_ARGS+= -DWANT_LIBARCHIVE=OFF
CMAKE_ARGS+= -DWANT_LIBTAR=ON
.include "../../mk/bsd.prefs.mk"
@@ -31,11 +40,13 @@ CMAKE_ARGS+= -DWANT_ALSA=OFF
LDFLAGS.SunOS+= -lsocket -lnsl
.include "../../archivers/libarchive/buildlink3.mk"
.include "../../devel/libtar/buildlink3.mk"
.if ${OPSYS} == "Linux"
. include "../../audio/alsa-lib/buildlink3.mk"
.endif
.include "../../audio/libsndfile/buildlink3.mk"
#.include "../../audio/ladspa/buildlink3.mk"
.include "../../devel/cppunit/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
+8 -2
View File
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.6 2014/03/06 10:16:15 mrg Exp $
@comment $NetBSD: PLIST,v 1.8 2014/09/10 20:08:42 mrg Exp $
bin/h2cli
bin/h2player
bin/h2synth
@@ -48,7 +48,7 @@ include/hydrogen/smf/SMFEvent.h
include/hydrogen/synth/Synth.h
include/hydrogen/timehelper.h
include/hydrogen/version.h
lib/libhydrogen-core-0.9.6.so
lib/libhydrogen-core-0.9.6.1.so
share/applications/hydrogen.desktop
share/hydrogen/data/DefaultSong.h2song
share/hydrogen/data/click.wav
@@ -62,6 +62,7 @@ share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
share/hydrogen/data/doc/Makefile
share/hydrogen/data/doc/MidiInstrumentMapping.ods
share/hydrogen/data/doc/README.DOCUMENTATION.txt
share/hydrogen/data/doc/TODO
share/hydrogen/data/doc/img/AudioEngineInfoDialog.png
share/hydrogen/data/doc/img/CreateNewPattern.png
share/hydrogen/data/doc/img/Director.png
@@ -126,6 +127,7 @@ share/hydrogen/data/doc/img/PreferencesAppearance.png
share/hydrogen/data/doc/img/PreferencesAppearance_V2.png
share/hydrogen/data/doc/img/PreferencesAudioSystem.png
share/hydrogen/data/doc/img/PreferencesAudioSystem_V2.png
share/hydrogen/data/doc/img/PreferencesAudioSystem_V3.png
share/hydrogen/data/doc/img/PreferencesGeneral.png
share/hydrogen/data/doc/img/PreferencesGeneral_V2.png
share/hydrogen/data/doc/img/PreferencesGeneral_V3.png
@@ -319,6 +321,8 @@ 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
@@ -335,6 +339,8 @@ 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/stats.py
+4 -6
View File
@@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.8 2014/03/06 10:16:15 mrg Exp $
$NetBSD: distinfo,v 1.11 2014/09/10 20:08:42 mrg Exp $
SHA1 (hydrogen-0.9.6-beta3.tar.gz) = 9d1f0b58e62ad5e14ca9ee9d2f38d68d2c1a2585
RMD160 (hydrogen-0.9.6-beta3.tar.gz) = ecfd94480a5a1e70e587e242dea8e159f4bb0bbd
Size (hydrogen-0.9.6-beta3.tar.gz) = 6217398 bytes
SHA1 (patch-CMakeLists.txt) = 4557bc8c3fab79f1fc472b368655cecdda4bf12c
SHA1 (patch-src_gui_src_PlayerControl.cpp) = 803dc5ee27f5e3f0124ab876116bbc1d0388d902
SHA1 (hydrogen-0.9.6.1/0.9.6.1.tar.gz) = 3a288fbb06f65fd257e7f7648e07891276dbf56a
RMD160 (hydrogen-0.9.6.1/0.9.6.1.tar.gz) = a5b3c969c51fdbd18d0fe7eadae3199e44b192aa
Size (hydrogen-0.9.6.1/0.9.6.1.tar.gz) = 6626629 bytes
@@ -1,32 +0,0 @@
$NetBSD: patch-CMakeLists.txt,v 1.1 2014/03/06 10:16:15 mrg Exp $
look for -lossaudio on NetBSD.
--- CMakeLists.txt.orig 2013-02-21 10:53:51.000000000 -0800
+++ CMakeLists.txt 2014-03-05 23:19:14.000000000 -0800
@@ -53,7 +53,11 @@
OPTION(WANT_JACKSESSION "Enable use of Jack-Session-Handler" ON)
ENDIF()
-OPTION(WANT_OSS "Include OSS (Open Sound System) support" OFF)
+IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
+ OPTION(WANT_OSS "Include OSS (Open Sound System) support" ON)
+ELSE()
+ OPTION(WANT_OSS "Include OSS (Open Sound System) support" OFF)
+ENDIF()
OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" ON)
OPTION(WANT_JACK "Include JACK (Jack Audio Connection Kit) support" ON)
OPTION(WANT_PORTAUDIO "Include PortAudio support" OFF)
@@ -159,7 +163,11 @@
FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
FIND_LADSPA(LADSPA ladspa.h noise)
-FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
+IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
+ FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
+ELSE()
+ FIND_HELPER(OSS oss sys/soundcard.h OSSlib )
+ENDIF()
FIND_HELPER(JACK jack jack/jack.h jack)
FIND_HELPER(JACKSESSION jack jack/session.h jack)
IF(APPLE)
@@ -1,14 +0,0 @@
$NetBSD: patch-src_gui_src_PlayerControl.cpp,v 1.1 2014/03/06 10:16:15 mrg Exp $
--- src/gui/src/PlayerControl.cpp.orig 2013-02-21 10:53:51.000000000 -0800
+++ src/gui/src/PlayerControl.cpp 2014-03-06 00:47:13.000000000 -0800
@@ -624,7 +624,8 @@
// time
float fFrames = m_pEngine->getAudioOutput()->m_transport.m_nFrames;
- if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT )
+ if ( Preferences::get_instance()->m_bJackTransportMode == Preferences::USE_JACK_TRANSPORT &&
+ Preferences::get_instance()->m_bJackMasterMode != Preferences::NO_JACK_TIME_MASTER )
fFrames = m_pEngine->getHumantimeFrames();
float fSampleRate = m_pEngine->getAudioOutput()->getSampleRate();
if ( fSampleRate != 0 ) {