compositor: add to build after move from -bad

This replaces videomixer.

Fixes #138

7 files changed, 37 insertions, 3 deletions

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 8fe1122151..76718eed9c 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -100,6 +100,12 @@ else
 check_audiomixer =
 endif
 
+if USE_PLUGIN_COMPOSITOR
+check_compositor = elements/compositor
+else
+check_compositor =
+endif
+
 if USE_PLUGIN_PLAYBACK
 check_playback = elements/decodebin elements/playbin \
     elements/playbin-complex elements/streamsynchronizer \
@@ -182,7 +188,7 @@ check_adder =
 endif
 
 if HAVE_ORC
-check_orc = orc/video orc/audio orc/audiomixer orc/adder orc/volume orc/videotestsrc
+check_orc = orc/video orc/audio orc/audiomixer orc/adder orc/compositor orc/volume orc/videotestsrc
 else
 check_orc =
 endif
@@ -274,6 +280,7 @@ check_PROGRAMS = \
 	$(check_audiorate) \
 	$(check_audioresample) \
 	$(check_audiotestsrc) \
+	$(check_compositor) \
 	$(check_encodebin) \
 	$(check_gio) \
 	$(check_gl) \
@@ -704,6 +711,13 @@ elements_audiotestsrc_CFLAGS = \
 	$(GST_BASE_CFLAGS) \
 	$(AM_CFLAGS)
 
+elements_compositor_LDADD = \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
+	$(GST_BASE_LIBS) $(LDADD)
+elements_compositor_CFLAGS = \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) $(CFLAGS) $(AM_CFLAGS)
+
 elements_libvisual_LDADD =  $(LDADD)
 elements_libvisual_CFLAGS = $(CFLAGS) $(AM_CFLAGS)
 
@@ -939,6 +953,9 @@ nodist_orc_adder_SOURCES = orc/adder.c
 orc_audiomixer_CFLAGS = $(ORC_CFLAGS)
 orc_audiomixer_LDADD = $(ORC_LIBS) -lorc-test-0.4
 nodist_orc_audiomixer_SOURCES = orc/audiomixer.c
+orc_compositor_CFLAGS = $(ORC_CFLAGS)
+orc_compositor_LDADD = $(ORC_LIBS) -lorc-test-0.4
+nodist_orc_compositor_SOURCES = orc/compositor.c
 orc_volume_CFLAGS = $(ORC_CFLAGS)
 orc_volume_LDADD = $(ORC_LIBS) -lorc-test-0.4
 nodist_orc_volume_SOURCES = orc/volume.c
@@ -962,6 +979,10 @@ orc/adder.c: $(top_srcdir)/gst/adder/gstadderorc.orc
 	$(MKDIR_P) orc/
 	$(ORCC) --test -o $@ $<
 
+orc/compositor.c: $(top_srcdir)/gst/compositor/compositororc.orc
+	$(MKDIR_P) orc/
+	$(ORCC) --test -o $@ $<
+
 orc/volume.c: $(top_srcdir)/gst/volume/gstvolumeorc.orc
 	$(MKDIR_P) orc/
 	$(ORCC) --test -o $@ $<
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 3537acd134..4fa55bbfb3 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -9,6 +9,7 @@ audiomixer
 audiorate
 audioresample
 audiotestsrc
+compositor
 decodebin
 encodebin
 glbin
diff --git a/tests/check/meson.build b/tests/check/meson.build
index fdd4853c4c..e988dbf125 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -62,6 +62,7 @@ if host_machine.system() != 'windows'
     [ 'libs/rtp.c' ],
     [ 'libs/rtspconnection.c' ],
     [ 'libs/video.c' ],
+    [ 'elements/compositor.c', not core_conf.has('HAVE_UNISTD_H') ],
     [ 'elements/libvisual.c', not is_variable('libvisual_dep') or not libvisual_dep.found() ],
     [ 'elements/encodebin.c', not theoraenc_dep.found() or not vorbisenc_dep.found() ],
     [ 'elements/multifdsink.c', not core_conf.has('HAVE_SYS_SOCKET_H') or not core_conf.has('HAVE_UNISTD_H') ],
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 059a154355..0eed5739f8 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -8,8 +8,8 @@ else
 GL_DIR=
 endif
 
-SUBDIRS = app audio decodebin_next dynamic fft gio $(GL_DIR) $(GTK_SUBDIRS) overlay overlaycomposition playrec encoding
-DIST_SUBDIRS = app audio dynamic decodebin_next fft gio gl playback overlay overlaycomposition seek snapshot playrec encoding
+SUBDIRS = app audio compositor decodebin_next dynamic fft gio $(GL_DIR) $(GTK_SUBDIRS) overlay overlaycomposition playrec encoding
+DIST_SUBDIRS = app audio compositor decodebin_next dynamic fft gio gl playback overlay overlaycomposition seek snapshot playrec encoding
 
 include $(top_srcdir)/common/parallel-subdirs.mak
 
diff --git a/tests/examples/compositor/Makefile.am b/tests/examples/compositor/Makefile.am
new file mode 100644
index 0000000000..a3bb99aefc
--- /dev/null
+++ b/tests/examples/compositor/Makefile.am
@@ -0,0 +1,5 @@
+noinst_PROGRAMS = crossfade
+
+crossfade_SOURCES = crossfade.c
+crossfade_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+crossfade_LDADD = $(GST_CONTROLLER_LIBS) $(GST_LIBS)
diff --git a/tests/examples/compositor/meson.build b/tests/examples/compositor/meson.build
new file mode 100644
index 0000000000..0ad55b41ab
--- /dev/null
+++ b/tests/examples/compositor/meson.build
@@ -0,0 +1,5 @@
+executable('crossfade', 'crossfade.c',
+  include_directories: [configinc],
+  c_args: ['-DHAVE_CONFIG_H'],
+  dependencies: [gst_controller_dep, gst_dep],
+  install: false)
diff --git a/tests/examples/meson.build b/tests/examples/meson.build
index 011b811b4a..44d28e298d 100644
--- a/tests/examples/meson.build
+++ b/tests/examples/meson.build
@@ -1,5 +1,6 @@
 subdir('app')
 subdir('audio')
+subdir('compositor')
 subdir('dynamic')
 subdir('decodebin_next')
 subdir('encoding')