Index: Makefile =================================================================== --- Makefile (revision 313650) +++ Makefile (working copy) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= hydrogen -PORTVERSION= 0.9.5 +DISTVERSION= 0.9.6-beta3 CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources MAINTAINER= devel@stasyan.com COMMENT= An advanced drum machine @@ -13,70 +12,81 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile \ - tar:${PORTSDIR}/devel/libtar \ - lrdf:${PORTSDIR}/textproc/liblrdf + tar:${PORTSDIR}/devel/libtar -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-03-05 -BROKEN= does not install +USE_GITHUB= yes +GH_ACCOUNT= hydrogen-music +GH_TAGNAME= ${DISTVERSION} +GH_COMMIT= 97e8352 -MAJORVERSION= 0.9.5 -USE_QT4= corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml -USE_SCONS= yes +USE_LDCONFIG= yes +USE_PKGCONFIG= build +USE_QT4= corelib gui linguist_build moc_build network qt3support \ + rcc_build sql uic_build xml +USE_CMAKE= yes +CMAKE_OUTSOURCE=yes +CXXFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib -OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH -OPTIONS_DEFAULT= JACK +MAJORVERSION= 0.9.6 +PLIST_SUB+= MAJORVERSION="${MAJORVERSION}" -LIBARCHIVE_DESC= LibArchive support +OPTIONS_DEFINE= JACK ALSA PORTAUDIO LIBARCHIVE LASH OSS RDF +OPTIONS_DEFAULT=JACK -post-patch: - ${REINPLACE_CMD} -e "s|includes = \[\]|includes = \['-I${QT_INCDIR}/QtCore', '-I${QT_INCDIR}/QtXml', '-I${QT_INCDIR}/QtGui', '-I${QT_INCDIR}', '-I${QT_INCDIR}/Qt', '-I${LOCALBASE}/include'\]|g; s|ldflags = \[\]|ldflags = \['-L${QT_LIBDIR}','-L${LOCALBASE}/lib'\,'-lQtCore', '-lQtGui', '-lQtXml', '-lQtNetwork', '${PTHREAD_LIBS}']|g" ${WRKSRC}/Sconstruct +LIBARCHIVE_DESC=LibArchive support +RDF_DESC= RDF support .include -SCONS_ENV+= oss=1 - .if ${PORT_OPTIONS:MJACK} LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -SCONS_ENV+= jack=1 +CMAKE_ARGS+= -DWANT_JACK:BOOL=ON .else -SCONS_ENV+= jack=0 +CMAKE_ARGS+= -DWANT_JACK:BOOL=OFF .endif .if ${PORT_OPTIONS:MPORTAUDIO} -LIB_DEPENDS+= portaudio:${PORTSDIR}/audio/portaudio -SCONS_ENV+= portaudio=1 +BUILD_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +RUN_DEPENDS+= ${LOCALBASE}/lib/portaudio2/libportaudio.so.2:${PORTSDIR}/audio/portaudio2 +CMAKE_ARGS+= -DWANT_PORTAUDIO:BOOL=ON .else -SCONS_ENV+= portaudio=0 +CMAKE_ARGS+= -DWANT_PORTAUDIO:BOOL=OFF .endif .if ${PORT_OPTIONS:MLIBARCHIVE} LIB_DEPENDS+= archive:${PORTSDIR}/archivers/libarchive -SCONS_ENV+= libarchive=1 +CMAKE_ARGS+= -DWANT_LIBARCHIVE:BOOL=ON .else -SCONS_ENV+= libarchive=0 +CMAKE_ARGS+= -DWANT_LIBARCHIVE:BOOL=OFF .endif .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins -SCONS_ENV+= alsa=1 +CMAKE_ARGS+= -DWANT_ALSA:BOOL=ON .else -SCONS_ENV+= alsa=0 +CMAKE_ARGS+= -DWANT_ALSA:BOOL=OFF .endif .if ${PORT_OPTIONS:MLASH} LIB_DEPENDS+= lash:${PORTSDIR}/audio/lash -SCONS_ENV+= lash=1 +CMAKE_ARGS+= -DWANT_LASH:BOOL=ON .else -SCONS_ENV+= lash=0 +CMAKE_ARGS+= -DWANT_LASH:BOOL=OFF .endif -SCONS_ENV+= cppflags="${CXXFLAGS}" linkflags="${LINKFLAGS}" prefix="${PREFIX}" CC="${CC}" CXX="${CXX}" +.if ${PORT_OPTIONS:MOSS} +CMAKE_ARGS+= -DWANT_OSS:BOOL=ON +.else +CMAKE_ARGS+= -DWANT_OSS:BOOL=OFF +.endif -pre-install: - -@${RM} -rf ${WRKSRC}/data/doc/man +.if ${PORT_OPTIONS:MRDF} +LIB_DEPENDS+= lrdf:${PORTSDIR}/textproc/liblrdf +CMAKE_ARGS+= -DWANT_LRDF:BOOL=ON +.else +CMAKE_ARGS+= -DWANT_LRDF:BOOL=OFF +.endif .include Property changes on: Makefile ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: distinfo =================================================================== --- distinfo (revision 313650) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (hydrogen-0.9.5.tar.gz) = 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 -SIZE (hydrogen-0.9.5.tar.gz) = 5239702 +SHA256 (hydrogen-0.9.6-beta3.tar.gz) = 2a531c9a6506a4b7178ca4394c1477e6db15c47d549819373e7b7de152c974ae +SIZE (hydrogen-0.9.6-beta3.tar.gz) = 6217965 Property changes on: distinfo ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: files/patch-CMakeLists.txt =================================================================== --- files/patch-CMakeLists.txt (revision 0) +++ files/patch-CMakeLists.txt (working copy) @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2012-05-25 14:19:45.000000000 +0200 ++++ CMakeLists.txt 2013-03-01 16:01:40.000000000 +0100 +@@ -81,9 +81,7 @@ + ENDIF() + + #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining") +-SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines") +-SET(CMAKE_CXX_FLAGS_RELEASE "") +-SET(CMAKE_CXX_FLAGS_DEBUG "-g ")#-Winline") ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") + + + IF(APPLE) +@@ -153,7 +151,7 @@ + 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 ) ++FIND_HELPER(OSS oss sys/soundcard.h c ) + FIND_HELPER(JACK jack jack/jack.h jack) + FIND_HELPER(JACKSESSION jack jack/session.h jack) + IF(APPLE) Property changes on: files/patch-CMakeLists.txt ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-Sconstruct =================================================================== --- files/patch-Sconstruct (revision 313650) +++ files/patch-Sconstruct (working copy) @@ -1,26 +0,0 @@ ---- Sconstruct.orig 2011-03-15 18:22:35.000000000 +0600 -+++ Sconstruct 2011-03-22 16:06:25.000000000 +0600 -@@ -47,7 +47,7 @@ - - env = Environment( options = opts ) - -- if sys.platform == "linux2" or sys.platform == "darwin": -+ if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform > "freebsd": - if str(env['debug']) == "1": - cppflags += ['-Wall', '-g2', '-ggdb', '-O0'] - for flag in env["optflags"].split(" "): -@@ -91,11 +91,12 @@ - includes.append( '/opt/local/include' ) - includes.append( '/usr/local/include/jack' ) - -- elif sys.platform == 'linux2': -+ elif str(env['alsa']) == "1" and sys.platform > 'freebsd' : - ldflags.append('-lpthread') - ldflags.append('-lasound') - # ldflags.append('-lrubberband') -- -+ elif sys.platform > 'freebsd' : -+ print "Alsa disabled; nothing to do" - elif sys.platform == "win32": - includes.append( '3rdparty\libsndfile-1_0_17' ) - includes.append( 'build\pthreads\include' ) Index: pkg-plist =================================================================== --- pkg-plist (revision 313650) +++ pkg-plist (working copy) @@ -1,4 +1,8 @@ bin/hydrogen +bin/h2cli +bin/h2player +bin/h2synth +lib/libhydrogen-core-%%MAJORVERSION%%.so share/applications/hydrogen.desktop %%DATADIR%%/data/DefaultSong.h2song %%DATADIR%%/data/click.wav @@ -10,6 +14,7 @@ %%DATADIR%%/data/demo_songs/TR808kit-demo.h2song %%DATADIR%%/data/demo_songs/tutorial_georgyporgy.h2song %%DATADIR%%/data/doc/Makefile +%%DATADIR%%/data/doc/MidiInstrumentMapping.ods %%DATADIR%%/data/doc/README.DOCUMENTATION.txt %%DATADIR%%/data/doc/img/AudioEngineInfoDialog.png %%DATADIR%%/data/doc/img/CreateNewPattern.png @@ -19,9 +24,10 @@ %%DATADIR%%/data/doc/img/DrumkitImport.png %%DATADIR%%/data/doc/img/DrumkitLoad.png %%DATADIR%%/data/doc/img/DrumkitSave.png +%%DATADIR%%/data/doc/img/Export_song.png %%DATADIR%%/data/doc/img/FX_send_knobs.png -%%DATADIR%%/data/doc/img/GUI_Sections.svg %%DATADIR%%/data/doc/img/GUI_Sections_0.9.5.png +%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5_v2.png %%DATADIR%%/data/doc/img/HearNewNotes.png %%DATADIR%%/data/doc/img/Hydrogen_0.9.5_gui.png %%DATADIR%%/data/doc/img/InstrumentMapping.png @@ -37,6 +43,7 @@ %%DATADIR%%/data/doc/img/MainStop.png %%DATADIR%%/data/doc/img/MainToolbar.png %%DATADIR%%/data/doc/img/MainToolbar_V2.png +%%DATADIR%%/data/doc/img/MainUI_tabbed.png %%DATADIR%%/data/doc/img/MeasureSettings.png %%DATADIR%%/data/doc/img/MidiIN_CPU.png %%DATADIR%%/data/doc/img/Midi_Actions.png @@ -70,10 +77,12 @@ %%DATADIR%%/data/doc/img/PatternEditor_DrumMode.png %%DATADIR%%/data/doc/img/PatternEditor_PianoMode.png %%DATADIR%%/data/doc/img/PreferencesAppearance.png +%%DATADIR%%/data/doc/img/PreferencesAppearance_V2.png %%DATADIR%%/data/doc/img/PreferencesAudioSystem.png %%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png %%DATADIR%%/data/doc/img/PreferencesGeneral.png %%DATADIR%%/data/doc/img/PreferencesGeneral_V2.png +%%DATADIR%%/data/doc/img/PreferencesGeneral_V3.png %%DATADIR%%/data/doc/img/PreferencesMidiSystem.png %%DATADIR%%/data/doc/img/PreferencesMidiSystem_V2.png %%DATADIR%%/data/doc/img/Rec_button.png @@ -92,7 +101,6 @@ %%DATADIR%%/data/doc/img/SongOperations.png %%DATADIR%%/data/doc/img/SoundLibrary.png %%DATADIR%%/data/doc/img/Sound_Library_import.png -%%DATADIR%%/data/doc/img/SoundlibraryHierarchy.svg %%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V3.png %%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V4.png %%DATADIR%%/data/doc/img/Tutorial2.h2song @@ -174,6 +182,7 @@ %%DATADIR%%/data/doc/img/showFX_on.png %%DATADIR%%/data/doc/img/showPeaks_on.png %%DATADIR%%/data/doc/img/songFuncBtn_on.png +%%DATADIR%%/data/doc/img/stacked_mode_V3.png %%DATADIR%%/data/doc/img/tag_bar.png %%DATADIR%%/data/doc/img/tastiera.png %%DATADIR%%/data/doc/img/tempo_bar.png @@ -258,6 +267,8 @@ %%DATADIR%%/data/i18n/hydrogen.cs.ts %%DATADIR%%/data/i18n/hydrogen.de.qm %%DATADIR%%/data/i18n/hydrogen.de.ts +%%DATADIR%%/data/i18n/hydrogen.el.qm +%%DATADIR%%/data/i18n/hydrogen.el.ts %%DATADIR%%/data/i18n/hydrogen.es.qm %%DATADIR%%/data/i18n/hydrogen.es.ts %%DATADIR%%/data/i18n/hydrogen.fr.qm @@ -280,6 +291,8 @@ %%DATADIR%%/data/i18n/hydrogen.ru.ts %%DATADIR%%/data/i18n/hydrogen.sv.qm %%DATADIR%%/data/i18n/hydrogen.sv.ts +%%DATADIR%%/data/i18n/stats.py +%%DATADIR%%/data/i18n/updateTranslations.sh %%DATADIR%%/data/img/gray/about/aboutLogo.png %%DATADIR%%/data/img/gray/audiFileBrowser/go-home.png %%DATADIR%%/data/img/gray/audiFileBrowser/go-up.png @@ -298,6 +311,9 @@ %%DATADIR%%/data/img/gray/drumkitManager/btn_save_off.png %%DATADIR%%/data/img/gray/drumkitManager/btn_save_on.png %%DATADIR%%/data/img/gray/drumkitManager/btn_save_over.png +%%DATADIR%%/data/img/gray/h2-icon.svg +%%DATADIR%%/data/img/gray/icon.icns +%%DATADIR%%/data/img/gray/icon.svg %%DATADIR%%/data/img/gray/icon16.png %%DATADIR%%/data/img/gray/icon24.png %%DATADIR%%/data/img/gray/icon32.png @@ -327,6 +343,7 @@ %%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 @@ -400,6 +417,8 @@ %%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 @@ -493,9 +512,11 @@ %%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 @@ -544,7 +565,71 @@ %%DATADIR%%/data/img/gray/waveDisplay/detailsamplewavedisplay.png %%DATADIR%%/data/img/gray/waveDisplay/mainsamplewavedisplay.png %%DATADIR%%/data/img/gray/waveDisplay/targetsamplewavedisplay.png -share/pixmaps/h2-icon.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 +%%DATADIR%%/data/new_tutorial/img_tutorial/Intro4th.png +%%DATADIR%%/data/new_tutorial/img_tutorial/PatternBase1.png +%%DATADIR%%/data/new_tutorial/img_tutorial/PatternBase2.png +%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1b.png +%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1c.png +%%DATADIR%%/data/new_tutorial/img_tutorial/Riff1d.png +%%DATADIR%%/data/new_tutorial/img_tutorial/Verse8th.png +%%DATADIR%%/data/new_tutorial/img_tutorial/VerseAll.png +%%DATADIR%%/data/new_tutorial/img_tutorial/VerseBridge.png +%%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/xsd/drumkit.xsd +%%DATADIR%%/data/xsd/drumkit_pattern.xsd +include/hydrogen/IO/AudioOutput.h +include/hydrogen/IO/CoreMidiDriver.h +include/hydrogen/IO/JackOutput.h +include/hydrogen/IO/MidiCommon.h +include/hydrogen/IO/MidiInput.h +include/hydrogen/IO/MidiOutput.h +include/hydrogen/IO/NullDriver.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/basics/adsr.h +include/hydrogen/basics/drumkit.h +include/hydrogen/basics/instrument.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/sample.h +include/hydrogen/basics/song.h +include/hydrogen/config.h +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/filesystem.h +include/hydrogen/helpers/legacy.h +include/hydrogen/helpers/xml.h +include/hydrogen/hydrogen.h +include/hydrogen/logger.h +include/hydrogen/midi_action.h +include/hydrogen/midi_map.h +include/hydrogen/object.h +include/hydrogen/playlist.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/version.h +@dirrm %%DATADIR%%/data/xsd +@dirrm %%DATADIR%%/data/new_tutorial/img_tutorial +@dirrm %%DATADIR%%/data/new_tutorial @dirrm %%DATADIR%%/data/img/gray/waveDisplay @dirrm %%DATADIR%%/data/img/gray/splash @dirrm %%DATADIR%%/data/img/gray/songEditor @@ -571,4 +656,12 @@ @dirrm %%DATADIR%%/data/demo_songs @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% +@dirrm include/hydrogen/synth +@dirrm include/hydrogen/smf +@dirrm include/hydrogen/sampler +@dirrm include/hydrogen/helpers +@dirrm include/hydrogen/fx +@dirrm include/hydrogen/basics +@dirrm include/hydrogen/IO +@dirrm include/hydrogen @dirrmtry share/applications Property changes on: pkg-plist ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property