3 files changed, 109 insertions, 1 deletions
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 7ef1ffcdf06..904bf859876 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -119,6 +119,9 @@ if with_gallium_virgl
 else
   driver_virgl = declare_dependency()
 endif
+if with_gallium_vdpau
+  subdir('state_trackers/vdpau')
+endif
 # TODO: SWR
 # TODO: clover
 if with_dri
@@ -134,9 +137,11 @@ if with_glx == 'gallium-xlib'
   subdir('state_trackers/glx/xlib')
   subdir('targets/libgl-xlib')
 endif
+if with_gallium_vdpau
+  subdir('targets/vdpau')
+endif
 # TODO: OMX
 # TODO: VA
-# TODO: vdpau
 # TODO: xa
 # TODO: xvmc
 # TODO: nine
diff --git a/src/gallium/state_trackers/vdpau/meson.build b/src/gallium/state_trackers/vdpau/meson.build
new file mode 100644
index 00000000000..9678b79ef6c
--- /dev/null
+++ b/src/gallium/state_trackers/vdpau/meson.build
@@ -0,0 +1,32 @@
+# Copyright © 2017 Intel Corproration
+
+# 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.
+
+libvdpau_st = static_library(
+  'vdpau_st',
+  files(
+    'bitmap.c', 'decode.c', 'device.c', 'ftab.c', 'htab.c', 'mixer.c',
+    'output.c', 'preemption.c', 'presentation.c', 'query.c', 'surface.c',
+  ),
+  c_args : [c_vis_args, '-DVER_MAJOR=1', '-DVER_MINOR=0'],
+  include_directories : [
+    inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux,
+  ],
+  dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_xcb_dri2],
+)
diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
new file mode 100644
index 00000000000..67f1469fb0f
--- /dev/null
+++ b/src/gallium/targets/vdpau/meson.build
@@ -0,0 +1,71 @@
+# 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)
+
+vdpau_link_args = []
+vdpau_link_depends = []
+vdpau_drivers = []
+
+if with_ld_version_script
+  vdpau_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'vdpau.sym')]
+  vdpau_link_depends += files('vdpau.sym')
+endif
+if with_ld_dynamic_list
+  vdpau_link_args += ['-Wl,--dynamic-list', join_paths(meson.current_source_dir(), '../dri-vdpau.dyn')]
+  vdpau_link_depends += files('../dri-vdpau.dyn')
+endif
+
+libvdpau_gallium = shared_library(
+  'vdpau_gallium',
+  'target.c',
+  c_args : c_vis_args,
+  cpp_args : cpp_vis_args,
+  link_args : [vdpau_link_args, ld_args_gc_sections],
+  include_directories : [
+    inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
+  ],
+  link_with : [
+    libvdpau_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+    libpipe_loader_static, libws_null, libwsw,
+  ],
+  dependencies : [
+    dep_thread, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm,
+    driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
+  ],
+  link_depends : vdpau_link_depends,
+)
+foreach d : [[with_gallium_r300, 'r300'],
+             [with_gallium_r600, 'r600'],
+             [with_gallium_radeonsi, 'radeonsi'],
+             [with_gallium_nouveau, 'nouveau']]
+  if d[0]
+    vdpau_drivers += 'libvdpau_@[email protected]'.format(d[1])
+  endif
+endforeach
+
+meson.add_install_script(
+  join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
+  libvdpau_gallium.full_path(),
+  vdpau_drivers_path,
+  vdpau_drivers,
+)