svn commit: r336787 - in branches/2014Q1/multimedia/libav: . files

[Bernhard Froehlich]

Author: decke
Date: Tue Dec 17 22:24:59 2013
New Revision: 336787
URL: http://svnweb.freebsd.org/changeset/ports/336787

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

Added:
  branches/2014Q1/multimedia/libav/files/patch-configure
     - copied unchanged from r336760, head/multimedia/libav/files/patch-configure
Modified:
  branches/2014Q1/multimedia/libav/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/multimedia/libav/Makefile
==============================================================================
--- branches/2014Q1/multimedia/libav/Makefile	Tue Dec 17 22:23:15 2013	(r336786)
+++ branches/2014Q1/multimedia/libav/Makefile	Tue Dec 17 22:24:59 2013	(r336787)
@@ -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>

Copied: branches/2014Q1/multimedia/libav/files/patch-configure (from r336760, head/multimedia/libav/files/patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/multimedia/libav/files/patch-configure	Tue Dec 17 22:24:59 2013	(r336787, copy of r336760, head/multimedia/libav/files/patch-configure)
@@ -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)