svn commit: r336760 - in head/multimedia/libav: . files

[Marcus von Appen]

Author: mva
Date: Tue Dec 17 20:14:24 2013
New Revision: 336760
URL: http://svnweb.freebsd.org/changeset/ports/336760

Log:
  - Unbreak the build for most environments after graphics/opencv changed
    its library flags for pkg-config

Added:
  head/multimedia/libav/files/patch-configure   (contents, props changed)
Modified:
  head/multimedia/libav/Makefile

Modified: head/multimedia/libav/Makefile
==============================================================================
--- head/multimedia/libav/Makefile	Tue Dec 17 20:01:48 2013	(r336759)
+++ head/multimedia/libav/Makefile	Tue Dec 17 20:14:24 2013	(r336760)
@@ -205,7 +205,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/libavcodec/libgsm.c
-	${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/library.mak
 
 .include <bsd.port.post.mk>

Added: head/multimedia/libav/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/libav/files/patch-configure	Tue Dec 17 20:14:24 2013	(r336760)
@@ -0,0 +1,13 @@
+--- configure.orig	2013-12-17 19:12:24.000000000 +0100
++++ configure	2013-12-17 19:12:49.000000000 +0100
+@@ -730,8 +730,8 @@
+ 
+ check_ld(){
+     log check_ld "$@"
+-    flags=$(filter_out '-l*' "$@")
+-    libs=$(filter '-l*' "$@")
++    flags=$(filter_out '-l*|*.so' "$@")
++    libs=$(filter '-l*|*.so' "$@")
+     check_cc $($cflags_filter $flags) || return
+     flags=$($ldflags_filter $flags)
+     libs=$($ldflags_filter $libs)