st/omx/tizonia: Add --enable-omx-tizonia flag and build files

Allow only bellagio or tizonia to be used at the same time.
Detect tizonia package config file
Generate libomx_mesa.so and install it to libtizcore.pc::pluginsdir
Only compile empty source (target.c) for now.

GSoC Project link: https://summerofcode.withgoogle.com/projects/#4737166321123328

Acked-by: Leo Liu <[email protected]>
Reviewed-by: Julien Isorce <[email protected]>

7 files changed, 75 insertions, 3 deletions

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 047fa12bf54..2c66064f79f 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -158,6 +158,10 @@ if HAVE_ST_OMX_BELLAGIO
 SUBDIRS += state_trackers/omx targets/omx
 endif
 
+if HAVE_ST_OMX_TIZONIA
+SUBDIRS += state_trackers/omx targets/omx
+endif
+
 if HAVE_GALLIUM_OSMESA
 SUBDIRS += state_trackers/osmesa targets/osmesa
 endif
diff --git a/src/gallium/state_trackers/omx/Makefile.am b/src/gallium/state_trackers/omx/Makefile.am
index ea72787919c..b25ad5d2755 100644
--- a/src/gallium/state_trackers/omx/Makefile.am
+++ b/src/gallium/state_trackers/omx/Makefile.am
@@ -23,6 +23,7 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
+if HAVE_ST_OMX_BELLAGIO
 SUBDIRS = bellagio
 
 AM_CFLAGS = \
@@ -31,6 +32,18 @@ AM_CFLAGS = \
 	$(VL_CFLAGS) \
 	$(XCB_DRI3_CFLAGS) \
 	$(OMX_BELLAGIO_CFLAGS)
+else
+SUBDIRS = tizonia
+
+AM_CFLAGS = \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS) \
+	$(VL_CFLAGS) \
+	$(XCB_DRI3_CFLAGS) \
+	$(OMX_TIZONIA_CFLAGS) \
+	$(OMX_TIZILHEADERS_CFLAGS) \
+	$(OMX_TIZPLATFORM_CFLAGS)
+endif
 
 noinst_LTLIBRARIES = libomxtracker_common.la
 
diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index d17332553ff..40f7284032a 100644
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -27,6 +27,8 @@ files_omx = files(
   'bellagio/vid_dec_h265.c',
   'bellagio/vid_enc.c'
 )
+elif gallium_omx == 'tizonia'
+files_omx = files()
 endif
 
 libomx_st = static_library(
@@ -34,5 +36,5 @@ libomx_st = static_library(
   files_omx,
   c_args : [c_vis_args],
   include_directories : [inc_common],
-  dependencies : [dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3],
+  dependencies : [dep_omx, dep_omx_other, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3],
 )
diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.am b/src/gallium/state_trackers/omx/tizonia/Makefile.am
new file mode 100644
index 00000000000..0f72e393699
--- /dev/null
+++ b/src/gallium/state_trackers/omx/tizonia/Makefile.am
@@ -0,0 +1,36 @@
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	-I$(top_srcdir)/src/gallium/state_trackers/omx \
+	$(GALLIUM_CFLAGS) \
+	$(VISIBILITY_CFLAGS) \
+	$(VL_CFLAGS) \
+	$(XCB_DRI3_CFLAGS) \
+	$(OMX_TIZONIA_CFLAGS) \
+	$(OMX_TIZILHEADERS_CFLAGS) \
+	$(OMX_TIZPLATFORM_CFLAGS)
+
+noinst_LTLIBRARIES = libomxtiztracker.la
+
+libomxtiztracker_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/state_trackers/omx/tizonia/Makefile.sources b/src/gallium/state_trackers/omx/tizonia/Makefile.sources
new file mode 100644
index 00000000000..9103ca899db
--- /dev/null
+++ b/src/gallium/state_trackers/omx/tizonia/Makefile.sources
@@ -0,0 +1 @@
+C_SOURCES :=
diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am
index 89ebcc045cb..32d61a189b4 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -3,7 +3,12 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CFLAGS = \
 	$(GALLIUM_TARGET_CFLAGS)
 
+if HAVE_ST_OMX_BELLAGIO
 omxdir = $(OMX_BELLAGIO_LIB_INSTALL_DIR)
+else
+omxdir = $(OMX_TIZONIA_LIB_INSTALL_DIR)
+endif
+
 omx_LTLIBRARIES = libomx_mesa.la
 
 nodist_EXTRA_libomx_mesa_la_SOURCES = dummy.cpp
@@ -24,15 +29,25 @@ endif # HAVE_LD_VERSION_SCRIPT
 
 libomx_mesa_la_LIBADD = \
 	$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker_common.la \
-	$(top_builddir)/src/gallium/state_trackers/omx/bellagio/libomxtracker.la \
 	$(top_builddir)/src/gallium/auxiliary/libgalliumvlwinsys.la \
 	$(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/util/libmesautil.la \
-	$(OMX_BELLAGIO_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(GALLIUM_COMMON_LIB_DEPS)
 
+if HAVE_ST_OMX_BELLAGIO
+libomx_mesa_la_LIBADD += \
+	$(top_builddir)/src/gallium/state_trackers/omx/bellagio/libomxtracker.la \
+	$(OMX_BELLAGIO_LIBS)
+else
+libomx_mesa_la_LIBADD += \
+	$(top_builddir)/src/gallium/state_trackers/omx/tizonia/libomxtiztracker.la \
+	$(OMX_TIZONIA_LIBS) \
+	$(OMX_TIZILHEADERS_LIBS) \
+	$(OMX_TIZPLATFORM_LIBS)
+endif
+
 if HAVE_PLATFORM_X11
 libomx_mesa_la_LIBADD += \
 	$(VL_LIBS) \
diff --git a/src/gallium/targets/omx/omx.sym b/src/gallium/targets/omx/omx.sym
index e8a287600a5..07b65e57643 100644
--- a/src/gallium/targets/omx/omx.sym
+++ b/src/gallium/targets/omx/omx.sym
@@ -1,5 +1,6 @@
 {
 	global:
+		OMX_ComponentInit;
 		omx_component_library_Setup;
 
 		# Workaround for an LLVM warning with -simplifycfg-sink-common