diff options
Diffstat (limited to 'package/multimedia')
5 files changed, 67 insertions, 3 deletions
diff --git a/package/multimedia/bellagio/Config.in b/package/multimedia/bellagio/Config.in index d918f80ce..3292ef5fd 100644 --- a/package/multimedia/bellagio/Config.in +++ b/package/multimedia/bellagio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_BELLAGIO bool "bellagio" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HAS_OPENMAX help Bellagio is an opensource implementation of the @@ -15,5 +16,5 @@ config BR2_PACKAGE_BELLAGIO http://omxil.sourceforge.net/ -comment "bellagio requires a toolchain with C++ support enabled" - depends on !BR2_INSTALL_LIBSTDCPP +comment "bellagio requires a toolchain with C++ and threads support enabled" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/multimedia/bellagio/bellagio.mk b/package/multimedia/bellagio/bellagio.mk index 6aadbbf64..c612b95ee 100644 --- a/package/multimedia/bellagio/bellagio.mk +++ b/package/multimedia/bellagio/bellagio.mk @@ -8,5 +8,7 @@ BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION) BELLAGIO_AUTORECONF = YES BELLAGIO_INSTALL_STAGING = YES +BELLAGIO_LICENSE = LGPLv2.1+ +BELLAGIO_LICENSE_FILES = COPYING $(eval $(autotools-package)) diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch b/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch new file mode 100644 index 000000000..b2057484c --- /dev/null +++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad-0002-fix-dfb-example.patch @@ -0,0 +1,22 @@ +Fix dfb-example + +Order of inclusion gives a strange effect on the definition of +gst_debug_log. Swapping the include statements solve it. + +Not upstreamed since there will be no more updates to this version +of gst-plugins-bad. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> +--- +diff -rup gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c +--- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c 2011-12-11 19:49:11.000000000 +0100 ++++ gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c 2013-05-13 00:32:00.507469138 +0200 +@@ -1,7 +1,7 @@ + +-#include <directfb.h> + #include <stdio.h> + #include <gst/gst.h> ++#include <directfb.h> + + static IDirectFB *dfb = NULL; + static IDirectFBSurface *primary = NULL; diff --git a/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch new file mode 100644 index 000000000..86efdfdb3 --- /dev/null +++ b/package/multimedia/pulseaudio/pulseaudio-compat-with-json-c-0.11.patch @@ -0,0 +1,26 @@ +From 759c0bc6f990240287a14fa6dec029ecea581463 Mon Sep 17 00:00:00 2001 +From: Arun Raghavan <arun.raghavan@collabora.co.uk> +Date: Sat, 27 Apr 2013 03:27:05 +0000 +Subject: build-sys: json-c changed everything :( + +json-c 0.11 ships a pkg-config file with a different name, and changes +the name of its library as well. +--- +(limited to 'configure.ac') + +diff --git a/configure.ac b/configure.ac +index c8161a4..b1bd21a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -624,7 +624,8 @@ AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1]) + + #### json parsing #### + +-PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ]) ++PKG_CHECK_MODULES(LIBJSON, [ json-c >= 0.11 ], [], ++ [PKG_CHECK_MODULES(LIBJSON, [ json >= 0.9 ])]) + AC_SUBST(LIBJSON_CFLAGS) + AC_SUBST(LIBJSON_LIBS) + +-- +cgit v0.9.0.2-2-gbebe diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index f171fb986..529f5dd27 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -27,10 +27,23 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_UDEV),udev) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ $(if $(BR2_PACKAGE_FFTW),fftw) \ - $(if $(BR2_PACKAGE_ORC),orc) \ $(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) +# One patch touches configure.ac. We unconditionnally need libglib2 +# because configure.ac uses AM_GLIB_GNU_GETTEXT. This unconditionnal +# dependency can be removed once the patch is removed. +PULSEAUDIO_AUTORECONF = YES +PULSEAUDIO_DEPENDENCIES += libglib2 + +ifeq ($(BR2_PACKAGE_ORC),y) +PULSEAUDIO_DEPENDENCIES += orc +PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc +PULSEAUDIO_CONF_OPT += --enable-orc +else +PULSEAUDIO_CONF_OPT += --disable-orc +endif + ifneq ($(BR2_INSTALL_LIBSTDCPP),y) # The optional webrtc echo canceller is written in C++, causing auto* to want # to link module-echo-cancel.so with CXX even if webrtc ISN'T used. |