svn commit: r341017 - branches/2014Q1/audio/calf

[Martin Wilke]

Author: miwi
Date: Sat Jan 25 12:56:56 2014
New Revision: 341017
URL: http://svnweb.freebsd.org/changeset/ports/341017
QAT: https://qat.redports.org/buildarchive/r341017/

Log:
  MFH: r340242
  
  - Fix build with clang
  
  PR:		185500
  Submitted by:	Ports Fury

Modified:
  branches/2014Q1/audio/calf/Makefile
  branches/2014Q1/audio/calf/pkg-plist
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/audio/calf/Makefile
==============================================================================
--- branches/2014Q1/audio/calf/Makefile	Sat Jan 25 12:55:49 2014	(r341016)
+++ branches/2014Q1/audio/calf/Makefile	Sat Jan 25 12:56:56 2014	(r341017)
@@ -20,33 +20,51 @@ LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR
 
 OPTIONS_DEFINE=	LASH LV2
 OPTIONS_DEFAULT=LASH LV2
+OPTIONS_SUB=	yes
 LV2_DESC=	LV2 audio plugin
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20
-USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_SUB=	yes
 LASH_LIB_DEPENDS=	liblash.so:${PORTSDIR}/audio/lash
 LASH_CONFIGURE_WITH=	lash
-LV2_BUILD_DEPENDS+=	lv2core>0:${PORTSDIR}/audio/lv2core
-LV2_RUN_DEPENDS+=	lv2core>0:${PORTSDIR}/audio/lv2core
+LV2_BUILD_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
+LV2_RUN_DEPENDS=	lv2core>0:${PORTSDIR}/audio/lv2core
 LV2_CONFIGURE_WITH=	lv2
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|'
 	@${REINPLACE_CMD} -e '/CXXFLAGS/s|-O3||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^install-data-am:/s|install-data-local||' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/calf.so/s|$$(pkglibdir)|../../calf|' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|src\.size();|src->size();|' \
+		${WRKSRC}/src/calf/buffer.h
+	@${REINPLACE_CMD} -e 's|data\[(1<<IntBits)+1\]|data[]|' \
+		${WRKSRC}/src/calf/fixed_point.h
+
+pre-build:
+.if ${PORT_OPTIONS:MLV2}
+	@${MKDIR} ${WRKDIR}/calfmakerdf
+	@(cd ${WRKSRC} && ${PAX} -rw . ${WRKDIR}/calfmakerdf)
+	@${REINPLACE_CMD} -e 's|\(PKGLIBDIR\).*|\1 "${STAGEDIR}${DATADIR}"|' \
+		${WRKDIR}/calfmakerdf/config.h
+	@(cd ${WRKDIR}/calfmakerdf/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} \
+		calfmakerdf)
+.endif
 
 post-install:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-data-local)
+.if ${PORT_OPTIONS:MLV2}
+	@(cd ${WRKDIR}/calfmakerdf/src && ./calfmakerdf -m ttl \
+		-p ${STAGEDIR}${PREFIX}/lib/lv2/calf.lv2)
+.endif
 
 .include <bsd.port.mk>

Modified: branches/2014Q1/audio/calf/pkg-plist
==============================================================================
--- branches/2014Q1/audio/calf/pkg-plist	Sat Jan 25 12:55:49 2014	(r341016)
+++ branches/2014Q1/audio/calf/pkg-plist	Sat Jan 25 12:56:56 2014	(r341017)
@@ -34,6 +34,11 @@ lib/calf/calf.so
 %%LV2%%lib/lv2/calf.lv2/calf.so
 %%LV2%%lib/lv2/calf.lv2/calflv2gui.so
 %%LV2%%lib/lv2/calf.lv2/manifest.ttl
+%%LV2%%lib/lv2/calf.lv2/presets-Filter.ttl
+%%LV2%%lib/lv2/calf.lv2/presets-Flanger.ttl
+%%LV2%%lib/lv2/calf.lv2/presets-Monosynth.ttl
+%%LV2%%lib/lv2/calf.lv2/presets-Organ.ttl
+%%LV2%%lib/lv2/calf.lv2/presets-Reverb.ttl
 man/man1/calfjackhost.1.gz
 man/man7/calf.7.gz
 share/applications/calf.desktop