aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormva <mva@FreeBSD.org>2013-12-18 04:14:24 +0800
committermva <mva@FreeBSD.org>2013-12-18 04:14:24 +0800
commit2497b233f24af2958819b76aecb8fd89d0754ef5 (patch)
tree4eb2af320f1e792a0ad22f1c612f02e7a5b9cfbe
parent70d2e1fb0d958eee61a6df55e8df94f601f81f03 (diff)
downloadfreebsd-ports-gnome-2497b233f24af2958819b76aecb8fd89d0754ef5.tar.gz
freebsd-ports-gnome-2497b233f24af2958819b76aecb8fd89d0754ef5.tar.zst
freebsd-ports-gnome-2497b233f24af2958819b76aecb8fd89d0754ef5.zip
- Unbreak the build for most environments after graphics/opencv changed
its library flags for pkg-config
-rw-r--r--multimedia/libav/Makefile2
-rw-r--r--multimedia/libav/files/patch-configure13
2 files changed, 14 insertions, 1 deletions
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 935dc237dd1f..466aff7591a9 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -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>
diff --git a/multimedia/libav/files/patch-configure b/multimedia/libav/files/patch-configure
new file mode 100644
index 000000000000..c82d551e4060
--- /dev/null
+++ b/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)