mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

- Link with multimedia/ffmpeg0 instead of multimedia/ffmpeg (only applies when

Browse Source 
the option FFMPEG is set).
- Bump portrevision.

PR:		192074
Submitted by:	Ivan Klymenko <fidaj@ukr.net>
This commit is contained in:
Stephen Montgomery-Smith 2014-07-25 04:51:29 +00:00
parent 6951df0ee4
commit c530818f3f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362869
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cad/netgen/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= netgen
PORTVERSION= 5.0.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= cad
MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/
@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-occ
.endif
.if ${PORT_OPTIONS:MFFMPEG}
LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0
CONFIGURE_ARGS+= --enable-ffmpeg
.endif
@ -58,6 +58,10 @@ pre-configure:
${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \
${WRKSRC}/ng/ngappinit.cpp
post-configure:
${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/configure
post-install:
# copy some additional headers for build cad/salome-netgenplugin
${MKDIR} ${STAGEDIR}${DATADIR}/include

14
cad/netgen/files/patch-configure Normal file
View File

@ -0,0 +1,14 @@
--- 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