aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-10-30 15:23:06 -0700
committerDylan Baker <[email protected]>2017-12-04 14:36:51 -0800
commit1d36dc674d528b93bec3ff9637adde4ae6492452 (patch)
tree191ffb28a49ee957d34fc4a232264c08c285e8f7 /src
parent22a817af8a89eb3c762fc3e07b443a3ce37d7416 (diff)
meson: build gallium omx state tracker
Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/meson.build7
-rw-r--r--src/gallium/state_trackers/omx_bellagio/meson.build30
-rw-r--r--src/gallium/targets/omx-bellagio/meson.build53
3 files changed, 89 insertions, 1 deletions
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,
+)