diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-03-02 23:26:20 +0100 |
| commit | 7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch) | |
| tree | d93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /package/gstreamer1 | |
| parent | 1021766976319b40e64ca8dee12d21c758197801 (diff) | |
| parent | e6803b9f91357773154daed13d6e83712d49476c (diff) | |
| download | buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/gstreamer1')
| -rw-r--r-- | package/gstreamer1/gst1-libav/Config.in | 1 | ||||
| -rw-r--r-- | package/gstreamer1/gst1-plugins-bad/Config.in | 1 | ||||
| -rw-r--r-- | package/gstreamer1/gstreamer1/gstreamer1.mk | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/package/gstreamer1/gst1-libav/Config.in b/package/gstreamer1/gst1-libav/Config.in index 2ab786ec42..4f9c2b8eb0 100644 --- a/package/gstreamer1/gst1-libav/Config.in +++ b/package/gstreamer1/gst1-libav/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GST1_LIBAV bool "gst1-libav" - depends on !BR2_avr32 # binary too large, relocations don't fit select BR2_PACKAGE_GST1_PLUGINS_BASE help GStreamer plugin (formerly gst-ffmpeg). diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 75a0ca13b5..5cadc42517 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -371,7 +371,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND bool "wayland" - depends on !BR2_avr32 # wayland depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland select BR2_PACKAGE_WAYLAND diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index a8b9fda40a..7840284b52 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -14,7 +14,7 @@ GSTREAMER1_LICENSE = LGPLv2+ LGPLv2.1+ # Checking if unaligned memory access works correctly cannot be done when cross # compiling. For the following architectures there is no information available # in the configure script. -ifeq ($(BR2_arc)$(BR2_avr32)$(BR2_xtensa)$(BR2_microblaze),y) +ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze),y) GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no endif ifeq ($(BR2_aarch64),y) |
