summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2017-01-18 16:25:52 +1100
committerMatthew Waters <matthew@centricular.com>2017-01-18 16:25:52 +1100
commit45d7f5f3373979f8938339f18e555f78b62c8904 (patch)
tree6d4a7415afd72c8e68fab11537584459fe5c6888
parent14de71cd963c6bd7a5264a2ce7950724040834fa (diff)
downloadgstreamer-45d7f5f3373979f8938339f18e555f78b62c8904.tar.gz
add gst-omx as a possible subproject
-rw-r--r--.gitignore2
-rw-r--r--meson.build4
-rw-r--r--meson_options.txt1
-rw-r--r--subprojects/gst-omx.wrap4
4 files changed, 11 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1494291337..9818e66713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
gst-devtools
gst-editing-services
gst-libav
+gst-omx
gst-plugins-bad
gst-plugins-base
gst-plugins-good
@@ -14,6 +15,7 @@ meson/
subprojects/gst-devtools/
subprojects/gst-editing-services/
subprojects/gst-libav/
+subprojects/gst-omx/
subprojects/gst-plugins-bad/
subprojects/gst-plugins-base/
subprojects/gst-plugins-good/
diff --git a/meson.build b/meson.build
index a7742b90c8..b5283ea845 100644
--- a/meson.build
+++ b/meson.build
@@ -55,6 +55,10 @@ if not get_option('disable_gst_libav')
subprojects += gst_libav
endif
+if not get_option('disable_gst_omx')
+ subprojects += ['gst-omx']
+endif
+
if not get_option('disable_gst_devtools')
if dependency('json-glib-1.0', required : false).found()
subprojects += ['gst-devtools']
diff --git a/meson_options.txt b/meson_options.txt
index 049ec4e352..2a73695a27 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,3 +5,4 @@ option('disable_gst_plugins_bad', type : 'boolean', value : false)
option('disable_gst_devtools', type : 'boolean', value : false)
option('disable_gst_editing_services', type : 'boolean', value : false)
option('disable_rtsp_server', type : 'boolean', value : false)
+option('disable_gst_omx', type : 'boolean', value : true)
diff --git a/subprojects/gst-omx.wrap b/subprojects/gst-omx.wrap
new file mode 100644
index 0000000000..4a6151b946
--- /dev/null
+++ b/subprojects/gst-omx.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=gst-omx
+url=https://anongit.freedesktop.org/git/gstreamer/gst-omx.git
+revision=master