Attachment #144956 for bug #192074

Lines 41-47 Link Here

(-)Makefile (-1 / +5 lines)
41	.endif	41	.endif
42		42
43	.if ${PORT_OPTIONS:MFFMPEG}	43	.if ${PORT_OPTIONS:MFFMPEG}
44	LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg	44	LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
45	CONFIGURE_ARGS+= --enable-ffmpeg	45	CONFIGURE_ARGS+= --enable-ffmpeg
46	.endif	46	.endif
47		47
Lines 58-63 Link Here
58	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \	58	${REINPLACE_CMD} -e "s\|%%DATADIR%%\|${DATADIR}\|" \
59	${WRKSRC}/ng/ngappinit.cpp	59	${WRKSRC}/ng/ngappinit.cpp
60		60
		61	post-configure:
		62	${REINPLACE_CMD} -e "s\|%%LOCALBASE%%\|${LOCALBASE}\|" \
		63	${WRKSRC}/configure
		64
61	post-install:	65	post-install:
62	# copy some additional headers for build cad/salome-netgenplugin	66	# copy some additional headers for build cad/salome-netgenplugin
63	${MKDIR} ${STAGEDIR}${DATADIR}/include	67	${MKDIR} ${STAGEDIR}${DATADIR}/include




--- configure-orig	2014-07-24 20:42:11.000000000 -0500
+++ configure	2014-07-24 20:43:21.000000000 -0500
@@ -15361,9 +15361,9 @@
 ffmpegon=false
 # Check whether --enable-ffmpeg was given.
 if test "${enable_ffmpeg+set}" = set; then :
-  enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
+  enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I%%LOCALBASE%%/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS"
 
-        FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"
+        FFMPEG_LIBS="-L%%LOCALBASE%%/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
 
         if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi
 

Return to bug 192074

Line 0 Link Here

(-)files/patch-configure (+14 lines)
	1	--- configure-orig 2014-07-24 20:42:11.000000000 -0500
	2	+++ configure 2014-07-24 20:43:21.000000000 -0500
	3	@@ -15361,9 +15361,9 @@
	4	ffmpegon=false
	5	# Check whether --enable-ffmpeg was given.
	6	if test "${enable_ffmpeg+set}" = set; then :
	7	- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS"
	8	+ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I%%LOCALBASE%%/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS"
	9
	10	- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2"
	11	+ FFMPEG_LIBS="-L%%LOCALBASE%%/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2"
	12
	13	if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi
	14