From owner-svn-ports-head@FreeBSD.ORG Tue Feb 17 03:17:59 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D91432B7; Tue, 17 Feb 2015 03:17:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C322ADEE; Tue, 17 Feb 2015 03:17:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1H3HxvF026100; Tue, 17 Feb 2015 03:17:59 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1H3HwWl026092; Tue, 17 Feb 2015 03:17:58 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <201502170317.t1H3HwWl026092@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Tue, 17 Feb 2015 03:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379140 - in head/audio/csound6: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Feb 2015 03:18:00 -0000 Author: vanilla Date: Tue Feb 17 03:17:57 2015 New Revision: 379140 URL: https://svnweb.freebsd.org/changeset/ports/379140 QAT: https://qat.redports.org/buildarchive/r379140/ Log: Upgrade to 6.04. PR: 197416 Submitted by: Ports Fury. Added: head/audio/csound6/files/patch-H__remote.h (contents, props changed) Modified: head/audio/csound6/Makefile head/audio/csound6/distinfo head/audio/csound6/files/patch-Top-csound.c head/audio/csound6/pkg-plist Modified: head/audio/csound6/Makefile ============================================================================== --- head/audio/csound6/Makefile Tue Feb 17 03:13:42 2015 (r379139) +++ head/audio/csound6/Makefile Tue Feb 17 03:17:57 2015 (r379140) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= csound -PORTVERSION= 6.03.2 -PORTREVISION= 3 +PORTVERSION= 6.04 CATEGORIES= audio lang -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION:R} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION} DIST_SUBDIR= csound @@ -51,9 +50,10 @@ CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR} CURL_CMAKE_OFF= -DUSE_CURL:BOOL=OFF DSSI_DESC= Build DSSI/LADSPA host opcodes DSSI_BUILD_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi -DSSI_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib +DSSI_LIB_DEPENDS= libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat DSSI_RUN_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi DSSI_CMAKE_OFF= -DBUILD_DSSI_OPCODES:BOOL=OFF +DSSI_CFLAGS= -isystem ${LOCALBASE}/include/dssi FLTK_DESC= Build FLTK plugin and GUI FLTK_LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk FLTK_CMAKE_ON= -DBUILD_WINSOUND:BOOL=ON @@ -83,7 +83,7 @@ OSC_DESC= Build OSC opcodes OSC_LIB_DEPENDS= liblo.so:${PORTSDIR}/audio/liblo OSC_CMAKE_OFF= -DBUILD_OSC_OPCODES:BOOL=OFF PNG_DESC= Build Image opcodes -PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png +PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png PNG_CMAKE_OFF= -DBUILD_IMAGE_OPCODES:BOOL=OFF PORTAUDIO_DESC= Build PortAudio I/O module PORTAUDIO_BUILD_DEPENDS=portaudio2>0:${PORTSDIR}/audio/portaudio2 @@ -102,6 +102,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${ CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex" .endif +.if ${PORT_OPTIONS:MALSA} && ${PORT_OPTIONS:MDSSI} +IGNORE= ALSA and DSSI options are mutually exclusive +.endif + post-patch: @${REINPLACE_CMD} -e \ '/-O3/s|^|#| ; \ Modified: head/audio/csound6/distinfo ============================================================================== --- head/audio/csound6/distinfo Tue Feb 17 03:13:42 2015 (r379139) +++ head/audio/csound6/distinfo Tue Feb 17 03:17:57 2015 (r379140) @@ -1,2 +1,2 @@ -SHA256 (csound/Csound6.03.2.tar.gz) = f5f8364e0bc10aba473800e66176c08ac32b43ca69ad02dc9554bad54e91d170 -SIZE (csound/Csound6.03.2.tar.gz) = 24571513 +SHA256 (csound/Csound6.04.tar.gz) = 0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 +SIZE (csound/Csound6.04.tar.gz) = 23959744 Added: head/audio/csound6/files/patch-H__remote.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/csound6/files/patch-H__remote.h Tue Feb 17 03:17:57 2015 (r379140) @@ -0,0 +1,14 @@ +--- H/remote.h.orig ++++ H/remote.h +@@ -37,7 +37,10 @@ + #ifdef MACOSX + #include + #endif +- #ifdef LINUX ++ #ifdef __FreeBSD__ ++ #include ++ #endif ++ #ifdef linux + #include + #endif + #include Modified: head/audio/csound6/files/patch-Top-csound.c ============================================================================== --- head/audio/csound6/files/patch-Top-csound.c Tue Feb 17 03:13:42 2015 (r379139) +++ head/audio/csound6/files/patch-Top-csound.c Tue Feb 17 03:17:57 2015 (r379140) @@ -1,11 +1,11 @@ ---- Top/csound.c.orig 2011-10-16 22:59:03.000000000 +0900 -+++ Top/csound.c 2011-12-07 01:15:33.000000000 +0900 +--- Top/csound.c.orig ++++ Top/csound.c @@ -60,10 +60,13 @@ #include "cs_par_dispatch.h" #include "csound_orc_semantics.h" --#if defined(linux) || defined(__HAIKU__) || defined(EMSCRIPTEN) -+#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(EMSCRIPTEN) +-#if defined(linux) || defined(__HAIKU__) || defined(__EMSCRIPTEN__) ++#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) #define PTHREAD_SPINLOCK_INITIALIZER 0 #endif @@ -15,17 +15,8 @@ #if defined(USE_OPENMP) #include #endif /* USE_OPENMP */ -@@ -919,7 +922,7 @@ - - #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \ - !defined(__HAIKU__) && !defined(__BEOS__) && \ -- !defined(__MACH__)) -+ !defined(__MACH__) && !defined(__FreeBSD__)) - static char *signal_to_string(int sig) - { - switch(sig) { -@@ -3420,7 +3423,7 @@ - /* ------------------------------------ */ +@@ -3469,7 +3473,7 @@ + /* ------------------------------------ */ #if defined(HAVE_RDTSC) -#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__)) @@ -33,7 +24,7 @@ #undef HAVE_RDTSC #endif #endif -@@ -3433,6 +3436,13 @@ +@@ -3482,6 +3486,13 @@ static int getTimeResolution(void) { #if defined(HAVE_RDTSC) @@ -47,7 +38,7 @@ FILE *f; char buf[256]; -@@ -3468,9 +3478,14 @@ +@@ -3517,9 +3528,14 @@ } } fclose(f); Modified: head/audio/csound6/pkg-plist ============================================================================== --- head/audio/csound6/pkg-plist Tue Feb 17 03:13:42 2015 (r379139) +++ head/audio/csound6/pkg-plist Tue Feb 17 03:17:57 2015 (r379140) @@ -23,7 +23,6 @@ bin/pv_import bin/pvanal bin/pvlook bin/scale -bin/scope bin/scot bin/scsort bin/sdif2ad @@ -47,7 +46,6 @@ include/csound/csound_standard_types.h include/csound/csound_type_system.h include/csound/cwindow.h include/csound/filebuilding.h -@comment include/csound/float-version-double.h include/csound/float-version.h include/csound/interlocks.h include/csound/msg_attr.h @@ -61,12 +59,14 @@ include/csound/version.h lib/csound/plugins-6.0/csladspa.so %%LUA%%lib/csound/plugins-6.0/libLuaCsound.so lib/csound/plugins-6.0/libampmidid.so +lib/csound/plugins-6.0/libbuchla.so lib/csound/plugins-6.0/libcellular.so lib/csound/plugins-6.0/libchua.so lib/csound/plugins-6.0/libcontrol.so lib/csound/plugins-6.0/libcs_date.so lib/csound/plugins-6.0/libdoppler.so %%DSSI%%lib/csound/plugins-6.0/libdssi4cs.so +lib/csound/plugins-6.0/libexciter.so lib/csound/plugins-6.0/libfareygen.so %%FLUIDSYNTH%%lib/csound/plugins-6.0/libfluidOpcodes.so lib/csound/plugins-6.0/libfractalnoise.so @@ -106,6 +106,7 @@ lib/libcsound64.so.6.0 %%FLTK%%%%PYTHON_SITELIBDIR%%/_CsoundAC.so %%PYTHON_SITELIBDIR%%/_csnd6.so %%PYTHON_SITELIBDIR%%/csnd6.py +%%PYTHON_SITELIBDIR%%/icsound.py %%NLS%%share/locale/de/LC_MESSAGES/csound6.mo %%NLS%%share/locale/en_US/LC_MESSAGES/csound6.mo %%NLS%%share/locale/es_CO/LC_MESSAGES/csound6.mo