Skip to contentSkip to conversation

package/gstreamer1: Allow to build OpenJPEG plugin

PATCH New Vincent Dehors 2 participants 2 messages Dec 30, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/gstreamer1/gst1-plugins-bad/Config.in           | 9 +++++++++
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +9 -0
index a834f13..8bc4df1 100644
@@ -593,6 +593,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
 comment "opencv plugin needs OpenCV-2.4"
 	depends on !BR2_PACKAGE_OPENCV
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG
+	bool "openjpeg"
+	depends on BR2_PACKAGE_OPENJPEG
+	help
+	  GStreamer OpenJPEG Plugin
+
+comment "openjpeg plugin needs OpenJPEG library"
+	depends on !BR2_PACKAGE_OPENJPEG
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264
 	bool "openh264"
 	select BR2_PACKAGE_LIBOPENH264
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +7 -1
index 64760a8..5a913a3 100644
@@ -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
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 package/gstreamer1: Allow to build OpenJPEG plugin

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vincent" == Vincent Dehors <[email protected]> writes:

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.

---
 package/gstreamer1/gst1-plugins-bad/Config.in           | 9 +++++++++
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
package/gstreamer1/gst1-plugins-bad/Config.in +0 -0
index a834f13..8bc4df1 100644

package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV · line 598

Quoted 6 lines
package/gstreamer1/gst1-plugins-bad/Config.in +3 -0
@@ -593,6 +593,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
 comment "opencv plugin needs OpenCV-2.4"
 	depends on !BR2_PACKAGE_OPENCV
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG
+	bool "openjpeg"
+	depends on BR2_PACKAGE_OPENJPEG

openjpeg is a library (and doesn't have any special toolchain dependencies), so a select should be used instead of 'depends on'.

package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV · line 603

Quoted 5 lines
package/gstreamer1/gst1-plugins-bad/Config.in +5 -0
+	help
+	  GStreamer OpenJPEG Plugin
+
+comment "openjpeg plugin needs OpenJPEG library"
+	depends on !BR2_PACKAGE_OPENJPEG

And then this comment isn't needed.

package/gstreamer1/gst1-plugins-bad/Config.in config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV · line 605

Quoted 2 lines
package/gstreamer1/gst1-plugins-bad/Config.in +1 -0
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264

'H' comes before 'J', so the openjpeg option should come after openh264.

Committed with these things fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard