From 6fcb2c2329e73bbe603534d6e92d9c63bd63858a Mon Sep 17 00:00:00 2001 From: Vincent Dehors Date: Wed, 30 Dec 2015 16:26:45 +0100 Subject: [PATCH] package/gstreamer1: Allow to build OpenJPEG plugin The OpenJPEG library is packaged in buildroot (version 1) and there is a plugin "openjpeg" using it in gst1-plugins-bad. This commit add the option for building this plugin. It provide a JPEG2000 encoder and decoder. [Peter: use 'select' instead of 'depends on', sort alphabetically] Signed-off-by: Vincent Dehors Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 6 ++++++ package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index a834f139a6..bc9415baa0 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -597,6 +597,12 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 bool "openh264" select BR2_PACKAGE_LIBOPENH264 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG + bool "openjpeg" + select BR2_PACKAGE_OPENJPEG + help + GStreamer OpenJPEG plugin + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS bool "opus" select BR2_PACKAGE_OPUS diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 64760a8c45..5a913a3219 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -58,7 +58,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ --disable-nas \ --disable-ofa \ --disable-openexr \ - --disable-openjpeg \ --disable-openni2 \ --disable-pvr \ --disable-libvisual \ @@ -715,6 +714,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg +GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-openjpeg +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus GST1_PLUGINS_BAD_DEPENDENCIES += opus -- 2.30.2