diff options
| -rw-r--r-- | meson.build | 60 | ||||
| -rw-r--r-- | meson_options.txt | 13 | ||||
| -rw-r--r-- | src/gallium/meson.build | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/omx_bellagio/meson.build | 30 | ||||
| -rw-r--r-- | src/gallium/targets/omx-bellagio/meson.build | 53 |
5 files changed, 161 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 4cf7e224e95..8f0ec75d80b 100644 --- a/meson.build +++ b/meson.build @@ -442,6 +442,64 @@ if xvmc_drivers_path == '' xvmc_drivers_path = get_option('libdir') endif +dep_omx = [] +_omx = get_option('gallium-omx') +if _omx == 'auto' + if not ['linux', 'bsd'].contains(host_machine.system()) + with_gallium_omx = false + elif not with_platform_x11 + with_gallium_omx = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + with_gallium_omx = false + else + dep_omx = dependency('libomxil-bellagio', required : false) + with_gallium_omx = dep_omx.found() + endif +elif _omx == 'true' + if not ['linux', 'bsd'].contains(host_machine.system()) + error('OMX state tracker can only be built on unix-like OSes.') + elif not (with_platform_x11 or with_platform_drm) + error('OMX state tracker requires X11 or drm platform support.') + with_gallium_omx = false + elif not (with_gallium_r600 or with_gallium_radeonsi or with_gallium_nouveau) + error('OMX state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau.') + endif + dep_omx = dependency('libomxil-bellagio') + with_gallium_omx = true +else + with_gallium_omx = false +endif + +omx_drivers_path = get_option('omx-libs-path') +if with_gallium_omx + # Figure out where to put the omx driver. + # FIXME: this could all be vastly simplified by adding a 'defined_variable' + # argument to meson's get_pkgconfig_variable method. + if omx_drivers_path == '' + _omx_libdir = dep_omx.get_pkgconfig_variable('libdir') + _omx_drivers_dir = dep_omx.get_pkgconfig_variable('pluginsdir') + if _omx_libdir == get_option('libdir') + omx_drivers_path = _omx_drivers_dir + else + _omx_base_dir = [] + # This will fail on windows. Does OMX run on windows? + _omx_libdir = _omx_libdir.split('/') + _omx_drivers_dir = _omx_drivers_dir.split('/') + foreach o : _omx_drivers_dir + if not _omx_libdir.contains(o) + _omx_base_dir += o + endif + endforeach + omx_drivers_path = join_paths(get_option('libdir'), _omx_base_dir) + endif + endif +endif +if with_gallium_omx + dep_omx = declare_dependency( + compile_args : dep_omx.get_pkgconfig_variable('cflags').split() + ) +endif + gl_pkgconfig_c_flags = [] if with_platform_x11 if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') @@ -972,7 +1030,7 @@ if with_platform_x11 dep_xxf86vm = dependency('xxf86vm', required : false) endif if with_any_vk or with_glx == 'dri' or - (with_gallium_vdpau or with_gallium_xvmc) + (with_gallium_vdpau or with_gallium_xvmc or with_gallium_omx) dep_xcb = dependency('xcb') dep_x11_xcb = dependency('x11-xcb') endif diff --git a/meson_options.txt b/meson_options.txt index 63fa9232ea1..51cf4ed6a5e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -82,6 +82,19 @@ option( description : 'path to put xvmc libraries. defaults to $libdir.' ) option( + 'gallium-omx', + type : 'combo', + value : 'auto', + choices : ['auto', 'true', 'false'], + description : 'enable gallium omx bellagio state tracker.', +) +option( + 'omx-libs-path', + type : 'string', + value : '', + description : 'path to put omx libraries. defaults to omx-bellagio pkg-config pluginsdir.' +) +option( 'vulkan-drivers', type : 'string', value : 'auto', diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 584e6729966..990663f6de3 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -125,6 +125,9 @@ endif if with_gallium_xvmc subdir('state_trackers/xvmc') endif +if with_gallium_omx + subdir('state_trackers/omx_bellagio') +endif # TODO: SWR # TODO: clover if with_dri @@ -146,7 +149,9 @@ endif if with_gallium_xvmc subdir('targets/xvmc') endif -# TODO: OMX +if with_gallium_omx + subdir('targets/omx-bellagio') +endif # TODO: VA # TODO: xa # TODO: nine diff --git a/src/gallium/state_trackers/omx_bellagio/meson.build b/src/gallium/state_trackers/omx_bellagio/meson.build new file mode 100644 index 00000000000..a62a31149e2 --- /dev/null +++ b/src/gallium/state_trackers/omx_bellagio/meson.build @@ -0,0 +1,30 @@ +# Copyright © 2017 Intel Corporation + +# 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 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. + +libomx_st = static_library( + 'omx_st', + files( + 'entrypoint.c', 'vid_dec.c', 'vid_dec_mpeg12.c', 'vid_dec_h264.c', + 'vid_dec_h265.c', 'vid_enc.c', + ), + c_args : [c_vis_args], + include_directories : [inc_common], + dependencies : [dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], +) diff --git a/src/gallium/targets/omx-bellagio/meson.build b/src/gallium/targets/omx-bellagio/meson.build new file mode 100644 index 00000000000..a3fba3f2e43 --- /dev/null +++ b/src/gallium/targets/omx-bellagio/meson.build @@ -0,0 +1,53 @@ +# Copyright © 2017 Intel Corporation + +# 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 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. + +# TODO: support non-static targets +# Static targets are always enabled in autotools (unless you modify +# configure.ac) + +omx_link_args = [] +omx_link_depends = [] + +if with_ld_version_script + omx_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'omx.sym')] + omx_link_depends += files('omx.sym') +endif + +libomx_gallium = shared_library( + 'omx_mesa', + 'target.c', + c_args : c_vis_args, + cpp_args : cpp_vis_args, + link_args : [omx_link_args, ld_args_gc_sections], + include_directories : [ + inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers, + ], + link_with : [ + libomx_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util, + libpipe_loader_static, libws_null, libwsw, + ], + link_depends : omx_link_depends, + dependencies : [ + dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread, + driver_r600, driver_radeonsi, driver_nouveau, + ], + install : true, + install_dir : omx_drivers_path, +) |