From e2afa154e99071e8d51be88494cd1347ad113035 Mon Sep 17 00:00:00 2001 From: Gurkirpal Singh Date: Sat, 20 Jan 2018 05:37:53 +0530 Subject: 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 Reviewed-by: Julien Isorce --- src/gallium/state_trackers/omx/Makefile.am | 13 ++++++++ src/gallium/state_trackers/omx/meson.build | 4 ++- src/gallium/state_trackers/omx/tizonia/Makefile.am | 36 ++++++++++++++++++++++ .../state_trackers/omx/tizonia/Makefile.sources | 1 + 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/gallium/state_trackers/omx/tizonia/Makefile.am create mode 100644 src/gallium/state_trackers/omx/tizonia/Makefile.sources (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/omx/Makefile.am b/src/gallium/state_trackers/omx/Makefile.am index ea72787919..b25ad5d275 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 d17332553f..40f7284032 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 0000000000..0f72e39369 --- /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 0000000000..9103ca899d --- /dev/null +++ b/src/gallium/state_trackers/omx/tizonia/Makefile.sources @@ -0,0 +1 @@ +C_SOURCES := -- cgit v1.2.3