From: Vincent Dehors <vincent.dehors@openwide.fr>
Date: Fri, 8 Jan 2016 14:32:19 +0000 (+0100)
Subject: gst1-plugins-ugly: Add option for building x264 plugin
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a4ff495c8ee4db6847273ef18bd0d7e3088b56be;p=buildroot.git

gst1-plugins-ugly: Add option for building x264 plugin

As x264 is packaged, we can also build the gstreamer plugin using it.
This commit adds the option in menuconfig and make sure it is built if
selected.

[Peter: split fix, add GPL tag, update help text and commit description]
Signed-off-by: Vincent Dehors <vincent.dehors@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in
index f33e2588d9..fbcb128c22 100644
--- a/package/gstreamer1/gst1-plugins-ugly/Config.in
+++ b/package/gstreamer1/gst1-plugins-ugly/Config.in
@@ -67,6 +67,12 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC
 	help
 	  LibMpeg2 decoder
 
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264
+	bool "x264"
+	select BR2_PACKAGE_X264
+	help
+	  x264 encoder
+
 # Note: to get descriptions use the following.
 # # find . -name 'plugin-*.xml' | xargs grep -m 1 description
 endif
diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 08315397b7..64e7e92343 100644
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -19,8 +19,7 @@ GST1_PLUGINS_UGLY_CONF_OPTS += \
 	--disable-amrwb \
 	--disable-cdio \
 	--disable-sidplay \
-	--disable-twolame \
-	--disable-x264
+	--disable-twolame
 
 GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base
 
@@ -90,6 +89,14 @@ else
 GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y)
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264
+GST1_PLUGINS_UGLY_DEPENDENCIES += x264
+GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
+else
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264
+endif
+
 # Add GPL license if GPL plugins enabled.
 ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y)
 GST1_PLUGINS_UGLY_LICENSE += GPLv2