diff options
| author | lioux <lioux@FreeBSD.org> | 2005-05-19 10:57:30 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2005-05-19 10:57:30 +0800 |
| commit | f2d238acbfeb42b17434e7a313de0c41f30abcad (patch) | |
| tree | 092aaba475a8defe01a6ec3e4b009f2cca64159f /multimedia/ffmpeg-devel | |
| parent | d10aa01e3af785278be2df82831e5ee2d45747e9 (diff) | |
| download | freebsd-ports-gnome-f2d238acbfeb42b17434e7a313de0c41f30abcad.tar.gz freebsd-ports-gnome-f2d238acbfeb42b17434e7a313de0c41f30abcad.tar.zst freebsd-ports-gnome-f2d238acbfeb42b17434e7a313de0c41f30abcad.zip | |
Make sure that the configure additionally look for ALL codec libraries
in -L${LOCALBASE}/lib instead of adding this check for each codec
alone
Submitted by: mezz
Reviewed by: ahze
Diffstat (limited to 'multimedia/ffmpeg-devel')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 9f55fac7aa00..ef7cedfe2314 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -430,11 +430,14 @@ post-patch: ${XARGS} -0 -n 5 -x \ ${REINPLACE_CMD} -E \ -e 's@^(CFLAGS.+)$$@\1 ${FFMPEG_CFLAGS}@' \ - -e 's@^(FFLIBS|LDFLAGS)(.+)$$@\1\2 ${FFMPEG_LDFLAGS}@' \ + -e 's@^(FFLIBS|LDFLAGS)(.+)$$@\1\2 ${FFMPEG_LDFLAGS}@' # fix x264 math, use correct log base 2 from math(3) @${REINPLACE_CMD} -E \ -e 's| log2| log|' \ ${WRKSRC}/libavcodec/x264.c + @${REINPLACE_CMD} -E \ + -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g" \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} # force detection of texi2html .ifndef(NOPORTDOCS) @${REINPLACE_CMD} -E \ @@ -532,12 +535,6 @@ post-configure: ${WRKSRC}/config.mak \ ${WRKSRC}/libavcodec/Makefile .endif -.ifdef(WITH_X264) - @${REINPLACE_CMD} -E \ - -e 's|(-lx264)|-L${LOCALBASE}/lib \1|' \ - ${WRKSRC}/config.mak \ - ${WRKSRC}/libavcodec/Makefile -.endif .ifndef(WITH_THEORA) @${REINPLACE_CMD} -E \ -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \ |