Bug 171294

Summary: [PATCH] multimedia/mlt: Fix hardcoded gcc in configure.
Product: Ports & Packages Reporter: christian.mangin
Component: Individual Port(s)Assignee: Alberto Villa <avilla>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
mlt.diff none

Description christian.mangin 2012-09-03 22:00:22 UTC 
gcc is hardcoded in this port's configure script. If gcc is not present 
in the base system, it will not find sys/param.h resulting in a build 
failure. (Observed in 9.1-RC1)

Fix: Patch attached.
How-To-Repeat: Build this port with a base system compiled with WITHOUT_GCC=yes
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-09-03 22:00:33 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->avilla

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2012-09-04 00:16:21 UTC 
Author: avilla
Date: Mon Sep  3 23:16:06 2012
New Revision: 303629
URL: http://svn.freebsd.org/changeset/ports/303629

Log:
  - Fix build when FreeBSD was build with WITHOUT_GCC=yes.
  
  PR:		171294
  Submitted by:	Christian Mangin <christian.mangin@gmail.com>
  
  - Stop installing standard license files.
  - Cleanup Makefile.
  
  Suggested by:	danfe

Added:
  head/multimedia/mlt/files/patch-src__framework__configure   (contents, props changed)
  head/multimedia/mlt/files/patch-src__modules__avformat__configure   (contents, props changed)
  head/multimedia/mlt/files/patch-src__modules__frei0r__configure   (contents, props changed)
Modified:
  head/multimedia/mlt/Makefile

Modified: head/multimedia/mlt/Makefile
==============================================================================
--- head/multimedia/mlt/Makefile	Mon Sep  3 22:57:42 2012	(r303628)
+++ head/multimedia/mlt/Makefile	Mon Sep  3 23:16:06 2012	(r303629)
@@ -10,11 +10,8 @@ COMMENT=	Multimedia framework for TV bro
 
 LICENSE=	GPLv2 GPLv3 LGPL21
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
-LICENSE_FILE_GPLv3=	${WRKSRC}/GPLv3
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 # They both install bin/melt.
 CONFLICTS_INSTALL=	freeze-[0-9]*
@@ -68,8 +65,7 @@ PLIST_SUB+=	DV="@comment "
 
 .if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MVDPAU}
 LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--enable-avformat \
-			--avformat-swscale
+CONFIGURE_ARGS+=	--enable-avformat --avformat-swscale
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=	--disable-avformat
@@ -171,18 +167,18 @@ PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
+	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
 		${WRKSRC}/src/modules/avformat/vdpau.c \
 		${WRKSRC}/src/modules/frei0r/factory.c \
 		${WRKSRC}/src/modules/jackrack/plugin_mgr.c \
 		${WRKSRC}/src/modules/linsys/Makefile
-	${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
+	${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},' \
 		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \
+	${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \
 		${WRKSRC}/src/framework/Makefile \
 		${WRKSRC}/src/melt/Makefile \
 		${WRKSRC}/src/modules/*/Makefile
-	${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,g' \
+	${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \
 		${WRKSRC}/Makefile
 
 post-install:

Added: head/multimedia/mlt/files/patch-src__framework__configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mlt/files/patch-src__framework__configure	Mon Sep  3 23:16:06 2012	(r303629)
@@ -0,0 +1,11 @@
+--- ./src/framework/configure.orig	2012-09-04 00:19:55.916055280 +0200
++++ ./src/framework/configure	2012-09-04 00:42:27.466054331 +0200
+@@ -4,7 +4,7 @@
+ echo > config.mak
+ if [ "$(uname -s)" = "FreeBSD" ]
+ then
+-	printf "#include <sys/param.h>\n int main(){ return 0;}" | gcc -c -x c - >/dev/null 2>&1
++	printf "#include <sys/param.h>\n int main(){ return 0;}" | $CC -c -x c - >/dev/null 2>&1
+ 	[ "$?" -eq 0 ] && echo "HAVE_SYS_PARAM_H=1" >> config.mak
+ fi
+ exit 0

Added: head/multimedia/mlt/files/patch-src__modules__avformat__configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mlt/files/patch-src__modules__avformat__configure	Mon Sep  3 23:16:06 2012	(r303629)
@@ -0,0 +1,20 @@
+--- ./src/modules/avformat/configure.orig	2012-09-04 00:55:19.926196170 +0200
++++ ./src/modules/avformat/configure	2012-09-04 00:43:04.696053595 +0200
+@@ -105,7 +105,7 @@
+ 			
+ 			if [ "$vdpau" = "true" ]
+ 			then
+-				printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
++				printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
+ 				[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
+ 			fi
+ 		else
+@@ -141,7 +141,7 @@
+ 		
+ 		if [ "$vdpau" = "true" ]
+ 		then
+-			printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$(pkg-config --cflags libavformat)" -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
++			printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC -I"$(pkg-config --cflags libavformat)" -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
+ 			[ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
+ 		fi
+ 	else

Added: head/multimedia/mlt/files/patch-src__modules__frei0r__configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mlt/files/patch-src__modules__frei0r__configure	Mon Sep  3 23:16:06 2012	(r303629)
@@ -0,0 +1,11 @@
+--- ./src/modules/frei0r/configure.orig	2012-09-04 00:21:50.609711766 +0200
++++ ./src/modules/frei0r/configure	2012-09-04 00:47:23.666167132 +0200
+@@ -3,7 +3,7 @@
+ if [ "$help" != "1" ]
+ then
+ 
+-	echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| gcc $CFLAGS -c -x c -  >/dev/null 2>&1
++	echo "#include <frei0r.h> int main(){ f0r_plugin_info_t test; test.name;return 0;}"| $CC $CFLAGS -c -x c -  >/dev/null 2>&1
+ 
+ 	if [ "$?" = "1" ]
+ 	then
_______________________________________________
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"
Comment 3 Alberto Villa freebsd_committer freebsd_triage 2012-09-04 00:18:27 UTC 
State Changed
From-To: open->closed

Committed, with minor changes (the same fix was applied to other files). 
Thanks!