From 82f0fc78747bbac5fb3e297c848838b53bdca622 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Thu, 7 Aug 2014 14:22:40 +0000 Subject: [PATCH] audio/hydrogen-devel: update to 0.9.6r2 PR: 192440 Submitted by: maintainer --- audio/hydrogen-devel/Makefile | 20 +++++----- audio/hydrogen-devel/distinfo | 4 +- .../hydrogen-devel/files/patch-CMakeLists.txt | 38 ++++++++++++++----- audio/hydrogen-devel/pkg-plist | 6 +++ 4 files changed, 45 insertions(+), 23 deletions(-) diff --git a/audio/hydrogen-devel/Makefile b/audio/hydrogen-devel/Makefile index 2342e90f07e3..83eb0a1b8c6d 100644 --- a/audio/hydrogen-devel/Makefile +++ b/audio/hydrogen-devel/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= hydrogen-devel -PORTVERSION= 0.9.6b3 +PORTVERSION= 0.9.6r2 CATEGORIES= audio MASTER_SITES= GH MAINTAINER= FreeBSD@ShaneWare.Biz -COMMENT= An advanced drum machine +COMMENT= Advanced drum machine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -20,8 +20,8 @@ LIB_DEPENDS+= libsndfile.so:${PORTSDIR}/audio/libsndfile \ USE_GITHUB= yes GH_ACCOUNT= hydrogen-music GH_PROJECT= hydrogen -GH_TAGNAME= 0.9.6-beta3 -GH_COMMIT= 97e8352 +GH_TAGNAME= 0.9.6-RC2 +GH_COMMIT= 2ff9010 MAJORVERSION= 0.9.6 USE_QT4= corelib gui qmake_build linguist_build moc_build network \ @@ -29,23 +29,21 @@ USE_QT4= corelib gui qmake_build linguist_build moc_build network \ USES= cmake:outsource desktop-file-utils pkgconfig CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=ON USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes CXXFLAGS+= -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib -OPTIONS_DEFINE= JACK ALSA PORTAUDIO OSS LIBARCHIVE LASH LADSPA \ - RDF RUBBERBAND -OPTIONS_DEFAULT= JACK OSS RDF +OPTIONS_DEFINE= JACK ALSA PORTAUDIO OSS LIBARCHIVE LASH LADSPA RDF RUBBERBAND +OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF LIBARCHIVE_DESC= LibArchive support -RUBBERBAND_DESC= Rubberband for time stretching +RUBBERBAND_DESC= librubberband for time stretching RDF_DESC= RDF File support .include .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins +RUN_DEPENDS+= alsa-plugins>=0:${PORTSDIR}/audio/alsa-plugins CMAKE_ARGS+= -DWANT_ALSA:BOOL=ON .else CMAKE_ARGS+= -DWANT_ALSA:BOOL=OFF @@ -59,7 +57,7 @@ CMAKE_ARGS+= -DWANT_JACK:BOOL=OFF -DWANT_JACKSESSION:BOOL=OFF .endif .if ${PORT_OPTIONS:MLADSPA} -BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa +BUILD_DEPENDS+= ladspa>=0:${PORTSDIR}/audio/ladspa RUN_DEPENDS+= analyseplugin:${PORTSDIR}/audio/ladspa CMAKE_ARGS+= -DWANT_LADSPA:BOOL=ON CMAKE_ARGS+= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa diff --git a/audio/hydrogen-devel/distinfo b/audio/hydrogen-devel/distinfo index cf355464b7b8..aa055e1d74fd 100644 --- a/audio/hydrogen-devel/distinfo +++ b/audio/hydrogen-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (hydrogen-devel-0.9.6b3.tar.gz) = 2a531c9a6506a4b7178ca4394c1477e6db15c47d549819373e7b7de152c974ae -SIZE (hydrogen-devel-0.9.6b3.tar.gz) = 6217965 +SHA256 (hydrogen-devel-0.9.6r2.tar.gz) = a788f6fb168f5f0a1d9041a06e70d85304c6204059d6d3dbabdec74a8d91074a +SIZE (hydrogen-devel-0.9.6r2.tar.gz) = 6625383 diff --git a/audio/hydrogen-devel/files/patch-CMakeLists.txt b/audio/hydrogen-devel/files/patch-CMakeLists.txt index ba712453490e..2d42d2a9079b 100644 --- a/audio/hydrogen-devel/files/patch-CMakeLists.txt +++ b/audio/hydrogen-devel/files/patch-CMakeLists.txt @@ -1,18 +1,36 @@ ---- ./CMakeLists.txt.orig 2013-02-22 05:23:51.000000000 +1030 -+++ ./CMakeLists.txt 2013-05-09 05:46:34.580378528 +0930 -@@ -88,10 +88,7 @@ +--- ./CMakeLists.txt.orig 2014-06-19 06:38:04.000000000 +0930 ++++ ./CMakeLists.txt 2014-06-21 03:49:38.036536435 +0930 +@@ -21,8 +21,12 @@ + SET(VERSION_PATCH "6") + SET(VERSION_SUFFIX "RC2") + +-#SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") ++SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") + ++IF(LOCALBASE) ++LINK_DIRECTORIES("${LOCALBASE}/lib") ++INCLUDE_DIRECTORIES("${LOCALBASE}/include") ++ENDIF(LOCALBASE) + + IF(VERSION_SUFFIX) + SET(DISPLAY_VERSION "${VERSION}-${VERSION_SUFFIX}") +@@ -93,12 +97,12 @@ + IF(APPLE) + SET(CMAKE_CXX_FLAGS "-O2") + ELSE() +- SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines") ++ SET(CMAKE_CXX_FLAGS "-O2 -fno-implement-inlines ${CMAKE_CXX_FLAGS}") 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + -SET(CMAKE_CXX_FLAGS_DEBUG "-g ")#-Winline") -- -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ++SET(CMAKE_CXX_FLAGS_DEBUG "-g ${CMAKE_CXX_FLAGS_DEBUG}")#-Winline") + IF(APPLE) - #Compile for 32bit and 64bit intel macs -@@ -106,9 +103,9 @@ +@@ -114,9 +118,9 @@ MANDATORY_PKG(LIBSNDFILE) # TODO remove data from path @@ -24,7 +42,7 @@ IF(WIN32) SET(WANT_JACK FALSE) SET(Threads_PATH "C:/Program Files/GnuWin32") -@@ -159,7 +156,7 @@ +@@ -167,7 +171,7 @@ FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile) FIND_HELPER(ALSA alsa alsa/asoundlib.h asound ) FIND_LADSPA(LADSPA ladspa.h noise) diff --git a/audio/hydrogen-devel/pkg-plist b/audio/hydrogen-devel/pkg-plist index 78a2b653fce8..d4e032a21088 100644 --- a/audio/hydrogen-devel/pkg-plist +++ b/audio/hydrogen-devel/pkg-plist @@ -202,6 +202,7 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/doc/img/PreferencesAppearance_V2.png %%DATADIR%%/data/doc/img/PreferencesAppearance.png %%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png +%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V3.png %%DATADIR%%/data/doc/img/PreferencesAudioSystem.png %%DATADIR%%/data/doc/img/PreferencesGeneral_V2.png %%DATADIR%%/data/doc/img/PreferencesGeneral_V3.png @@ -262,6 +263,7 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/doc/manual.pot %%DATADIR%%/data/doc/MidiInstrumentMapping.ods %%DATADIR%%/data/doc/README.DOCUMENTATION.txt +%%DATADIR%%/data/doc/TODO %%DATADIR%%/data/doc/tutorial_en.html %%DATADIR%%/data/doc/tutorial_fr.html %%DATADIR%%/data/doc/tutorial_fr.po @@ -318,6 +320,8 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/i18n/hydrogen.es.ts %%DATADIR%%/data/i18n/hydrogen.fr.qm %%DATADIR%%/data/i18n/hydrogen.fr.ts +%%DATADIR%%/data/i18n/hydrogen.gl.qm +%%DATADIR%%/data/i18n/hydrogen.gl.ts %%DATADIR%%/data/i18n/hydrogen.hr.qm %%DATADIR%%/data/i18n/hydrogen.hr.ts %%DATADIR%%/data/i18n/hydrogen.hu_HU.qm @@ -334,6 +338,8 @@ share/applications/hydrogen.desktop %%DATADIR%%/data/i18n/hydrogen.pt_BR.ts %%DATADIR%%/data/i18n/hydrogen.ru.qm %%DATADIR%%/data/i18n/hydrogen.ru.ts +%%DATADIR%%/data/i18n/hydrogen.sr.qm +%%DATADIR%%/data/i18n/hydrogen.sr.ts %%DATADIR%%/data/i18n/hydrogen.sv.qm %%DATADIR%%/data/i18n/hydrogen.sv.ts %%DATADIR%%/data/i18n/stats.py