From 901777195b8538683097e7ea9ae4419a6f0fe02d Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Sat, 2 Dec 2017 17:52:50 -0500 Subject: [PATCH] gst1-libav: Fix Makefile syntax error. gstreamer1: Fix failures on buildbot mips platforms (accidently finds libunwind) Signed-off-by: Ted Hess --- multimedia/gst1-libav/Makefile | 1 + multimedia/gstreamer1/Makefile | 1 + .../gstreamer1/patches/004-no-unwind.patch | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 multimedia/gstreamer1/patches/004-no-unwind.patch diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 3cdc8d331..3fc109ade 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -146,6 +146,7 @@ LIBAV_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(LIBAV_PROTOC CONFIGURE_ARGS += \ --without-system-libav \ + --with-libav-extra-configure=" \ --disable-bsfs \ --disable-programs \ --disable-devices \ diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 7d34f9448..433139b1a 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -121,6 +121,7 @@ CONFIGURE_ARGS += \ --disable-examples \ --disable-tests \ --disable-valgrind \ + --disable-gst-tracer-hooks \ --without-libiconv-prefix \ --without-libintl-prefix \ --without-x \ diff --git a/multimedia/gstreamer1/patches/004-no-unwind.patch b/multimedia/gstreamer1/patches/004-no-unwind.patch new file mode 100644 index 000000000..a9729f701 --- /dev/null +++ b/multimedia/gstreamer1/patches/004-no-unwind.patch @@ -0,0 +1,23 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -826,20 +826,6 @@ if test "x$BUILD_EXAMPLES" = "xyes"; the + fi + AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") + +-dnl libunwind is optionally used by the leaks tracer +-PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no) +- +-dnl Check for backtrace() from libc +-AC_CHECK_FUNC(backtrace, [ +- AC_CHECK_HEADERS([execinfo.h], [ +- AC_DEFINE(HAVE_BACKTRACE,1,[Have backtrace]) +- ], [], []) +-]) +- +-if test "x$HAVE_UNWIND" = "xyes"; then +- AC_DEFINE(HAVE_UNWIND, 1, [libunwind available]) +-fi +- + dnl building of unit test libraries + AC_ARG_ENABLE(check, + AS_HELP_STRING([--disable-check],[disable building unit test libraries]),