diff options
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/gst-plugins-bad/Config.in | 4 | ||||
| -rw-r--r-- | package/multimedia/mplayer/mplayer.mk | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in index a8d01bcad..e772930b2 100644 --- a/package/multimedia/gst-plugins-bad/Config.in +++ b/package/multimedia/gst-plugins-bad/Config.in @@ -55,8 +55,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS bool "debugutils" config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK + depends on BR2_INSTALL_LIBSTDCPP bool "decklink" +comment "decklink requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF bool "dtmf" diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index 776cc68ee..96b4e736e 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -67,8 +67,8 @@ else MPLAYER_CONF_OPTS += --disable-mencoder endif -ifeq ($(BR2_PACKAGE_TREMOR),y) -MPLAYER_DEPENDENCIES += tremor +ifeq ($(BR2_PACKAGE_TREMOR)$(BR2_PACKAGE_LIBOGG),yy) +MPLAYER_DEPENDENCIES += tremor libogg MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor endif @@ -108,6 +108,12 @@ ifeq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),armv7-a) MPLAYER_CONF_OPTS += --enable-neon endif +ifeq ($(BR2_i386),y) +# inline asm breaks with "can't find a register in class 'GENERAL_REGS'" +# inless we free up ebp +MPLAYER_CFLAGS += -fomit-frame-pointer +endif + define MPLAYER_CONFIGURE_CMDS (cd $(@D); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ @@ -122,6 +128,7 @@ define MPLAYER_CONFIGURE_CMDS --charset=UTF-8 \ --extra-cflags="$(MPLAYER_CFLAGS)" \ --extra-ldflags="$(MPLAYER_LDFLAGS)" \ + --yasm='' \ --enable-mad \ --enable-fbdev \ $(MPLAYER_CONF_OPTS) \ |