Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Jul 2013 19:30:04 +0000 (UTC)
From:      Juergen Lock <nox@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322409 - head/multimedia/avidemux2
Message-ID:  <201307061930.r66JU4sP079442@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nox
Date: Sat Jul  6 19:30:04 2013
New Revision: 322409
URL: http://svnweb.freebsd.org/changeset/ports/322409

Log:
  Fix build of multimedia/avidemux2 and multimedia/avidemux2-plugins
  in a world WITH_CLANG_IS_CC and WITHOUT_GCC.
  
  PR:		ports/180087
  Submitted by:	r4721@tormail.org

Modified:
  head/multimedia/avidemux2/Makefile.common

Modified: head/multimedia/avidemux2/Makefile.common
==============================================================================
--- head/multimedia/avidemux2/Makefile.common	Sat Jul  6 19:29:38 2013	(r322408)
+++ head/multimedia/avidemux2/Makefile.common	Sat Jul  6 19:30:04 2013	(r322409)
@@ -27,6 +27,7 @@ WANT_SDL=	yes
 USES=		cmake:outsource pkgconfig iconv
 CMAKE_USE_PTHREAD=yes
 CMAKE_ARGS+=	-DTHREADS_HAVE_PTHREAD_ARG:STRING="${PTHREAD_LIBS}"
+CFLAGS+=	-Wno-return-type
 MAKE_JOBS_UNSAFE=	yes
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
@@ -223,6 +224,8 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/*/*/Makefile
+	@${REINPLACE_CMD} '/--enable-shared/s,,& --cc=${CC},' ${WRKSRC}/cmake/admFFmpegBuild.cmake
+	@${REINPLACE_CMD} '/sub $$1/s,sub,subl,' ${WRKSRC}/plugins/ADM_videoFilters/FluxSmooth/ADM_vidFlux.cpp
 	@${CP} ${FILESDIR}/execinfo.cpp ${WRKSRC}/cmake_compile_check/
 	@${CP} ${FILESDIR}/*.patch ${WRKSRC}/cmake/patches/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/config



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