Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2014 02:54:13 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/185499: audio/calf: Fix build with clang
Message-ID:  <20140106025413.1641c7224f85b63f7eff5fd6@yahoo.com>
Resent-Message-ID: <201401051810.s05IA0m3084873@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185499
>Category:       ports
>Synopsis:       audio/calf: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 05 18:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/calf/Makefile audio/calf/Makefile
--- /usr/ports/audio/calf/Makefile	2013-11-25 18:57:52.000000000 +0900
+++ audio/calf/Makefile	2014-01-06 00:00:00.000000000 +0900
@@ -20,33 +20,51 @@
 
 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>
diff -urN /usr/ports/audio/calf/pkg-plist audio/calf/pkg-plist
--- /usr/ports/audio/calf/pkg-plist	2013-12-13 20:22:56.000000000 +0900
+++ audio/calf/pkg-plist	2014-01-06 00:00:00.000000000 +0900
@@ -34,6 +34,11 @@
 %%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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140106025413.1641c7224f85b63f7eff5fd6>