From nobody@FreeBSD.org  Sat Jun 29 12:26:17 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 7753AC61
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 Jun 2013 12:26:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A13713B3
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 Jun 2013 12:26:17 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r5TCQGrk083207
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 29 Jun 2013 12:26:16 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r5TCQGfo083206;
	Sat, 29 Jun 2013 12:26:16 GMT
	(envelope-from nobody)
Message-Id: <201306291226.r5TCQGfo083206@oldred.freebsd.org>
Date: Sat, 29 Jun 2013 12:26:16 GMT
From: "r4721@tormail.org" <r4721@tormail.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] fix multimedia/avidemux2 build with the clang compiler
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         180087
>Category:       ports
>Synopsis:       [patch] fix multimedia/avidemux2 build with the clang compiler
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 12:30:00 UTC 2013
>Closed-Date:    Sat Jul 06 19:32:08 UTC 2013
>Last-Modified:  Sat Jul  6 19:40:01 UTC 2013
>Originator:     r4721@tormail.org
>Release:        
>Organization:
>Environment:
>Description:
patch fixes build of multimedia/avidemux2 and multimedia/avidemux2-plugins in a world WITH_CLANG_IS_CC and WITHOUT_GCC.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: multimedia/avidemux2/Makefile.common
===================================================================
--- multimedia/avidemux2/Makefile.common	(revision 321959)
+++ multimedia/avidemux2/Makefile.common	(working copy)
@@ -27,6 +24,7 @@
 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 +221,8 @@
 
 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


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 29 12:30:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180087 
State-Changed-From-To: open->closed 
State-Changed-By: nox 
State-Changed-When: Sat Jul 6 19:32:08 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180087 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180087: commit references a PR
Date: Sat,  6 Jul 2013 19:30:24 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
