[Mesa-dev] [PATCH v5 09/13] meson: build gallium vdpau state tracker
Dylan Baker
dylan at pnwbakers.com
Mon Nov 20 19:09:41 UTC 2017
v2: - set with_gallium_vdpau when -Dgallium-vdpau=true
- Install megadriver hard links and symlinks
- only use cflags from pkg-config, don't add linker flags.
v4: - make use of the install_megadrivers.py changes
v5: - adapt for install_megadrivers changes
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
meson.build | 46 ++++++++++++-
meson_options.txt | 13 ++++
src/gallium/meson.build | 7 +-
src/gallium/state_trackers/vdpau/meson.build | 32 ++++++++++
src/gallium/targets/vdpau/meson.build | 96 ++++++++++++++++++++++++++++
5 files changed, 192 insertions(+), 2 deletions(-)
create mode 100644 src/gallium/state_trackers/vdpau/meson.build
create mode 100644 src/gallium/targets/vdpau/meson.build
diff --git a/meson.build b/meson.build
index ccbdd8cee47..0f8733f7651 100644
--- a/meson.build
+++ b/meson.build
@@ -348,6 +348,49 @@ if with_dri or with_gallium
endif
endif
+dep_vdpau = []
+_vdpau = get_option('gallium-vdpau')
+if _vdpau == 'auto'
+ if not ['linux', 'bsd'].contains(host_machine.system())
+ with_gallium_vdpau = false
+ elif not with_platform_x11
+ with_gallium_vdpau = false
+ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
+ with_gallium_nouveau)
+ with_gallium_vdpau = false
+ else
+ dep_vdpau = dependency('vdpau', version : '>= 1.1', required : false)
+ with_gallium_vdpau = dep_vdpau.found()
+ endif
+elif _vdpau == 'true'
+ if not ['linux', 'bsd'].contains(host_machine.system())
+ error('VDPAU state tracker can only be build on unix-like OSes.')
+ elif not with_platform_x11
+ error('VDPAU state tracker requires X11 support.')
+ with_gallium_vdpau = false
+ elif not (with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi or
+ with_gallium_nouveau)
+ error('VDPAU state tracker requires at least one of the following gallium drivers: r300, r600, radeonsi, nouveau.')
+ endif
+ dep_vdpau = dependency('vdpau', version : '>= 1.1')
+ with_gallium_vdpau = true
+else
+ with_gallium_vdpau = false
+endif
+if with_gallium_vdpau
+ dep_vdpau = declare_dependency(
+ compile_args : dep_vdpau.get_pkgconfig_variable('cflags').split()
+ )
+endif
+
+if with_gallium_vdpau
+ pre_args += '-DHAVE_ST_VDPAU'
+endif
+vdpau_drivers_path = get_option('vdpau-libs-path')
+if vdpau_drivers_path == ''
+ vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau')
+endif
+
gl_pkgconfig_c_flags = []
if with_platform_x11
if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
@@ -854,7 +897,8 @@ if with_platform_x11
dep_xcb_glx = dependency('xcb-glx', version : '>= 1.8.1')
dep_xxf86vm = dependency('xxf86vm', required : false)
endif
- if with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm')
+ if (with_any_vk or (with_glx == 'dri' and with_dri_platform == 'drm') or
+ with_gallium_vdpau)
dep_xcb = dependency('xcb')
dep_x11_xcb = dependency('x11-xcb')
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
diff --git a/meson_options.txt b/meson_options.txt
index 119bec15709..78b78a92dbf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,6 +49,19 @@ option(
value : 'auto',
description : 'comma separated list of gallium drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built'
)
+option(
+ 'gallium-vdpau',
+ type : 'combo',
+ value : 'auto',
+ choices : ['auto', 'true', 'false'],
+ description : 'enable gallium vdpau state tracker.',
+)
+option(
+ 'vdpau-libs-path',
+ type : 'string',
+ value : '',
+ description : 'path to put vdpau libraries. defaults to $libdir/vdpau.'
+)
option(
'vulkan-drivers',
type : 'string',
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 8e8b1466f12..446710e1495 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -99,6 +99,9 @@ if with_glx == 'gallium-xlib'
subdir('winsys/sw/xlib')
subdir('state_trackers/glx/xlib')
endif
+if with_gallium_vdpau
+ subdir('state_trackers/vdpau')
+endif
# TODO: SWR
# TODO: clover
if with_dri and with_gallium
@@ -110,9 +113,11 @@ endif
if with_glx == 'gallium-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..527cb0068ed
--- /dev/null
+++ b/src/gallium/targets/vdpau/meson.build
@@ -0,0 +1,96 @@
+# 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_deps = []
+vdpau_c_args = []
+vdpau_link_args = []
+vdpau_link_with = []
+vdpau_link_depends = []
+vdpau_drivers = []
+
+if with_llvm
+ vdpau_deps += dep_llvm
+endif
+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
+
+if with_gallium_r300
+ vdpau_c_args += '-DGALLIUM_R300'
+ vdpau_link_with += libr300
+ vdpau_drivers += 'libvdpau_r300.so.1.0.0'
+endif
+if with_gallium_r600
+ vdpau_c_args += '-DGALLIUM_R600'
+ vdpau_link_with += libr600
+ vdpau_deps += dep_elf
+ vdpau_drivers += 'libvdpau_r600.so.1.0.0'
+endif
+if with_gallium_radeonsi
+ vdpau_c_args += '-DGALLIUM_RADEONSI'
+ vdpau_link_with += [
+ libradeonsi, libamdgpuwinsys, libradeon, libamd_common, libnir
+ ]
+ vdpau_deps += dep_libdrm_amdgpu
+ vdpau_drivers += 'libvdpau_radeonsi.so.1.0.0'
+endif
+if with_gallium_r300 or with_gallium_r600 or with_gallium_radeonsi
+ vdpau_link_with += libradeonwinsys
+ vdpau_deps += dep_libdrm_radeon
+endif
+if with_gallium_nouveau
+ vdpau_c_args += '-DGALLIUM_NOUVEAU'
+ vdpau_link_with += [libnouveau, libnouveauwinsys]
+ vdpau_deps += dep_libdrm_nouveau
+ vdpau_drivers += 'libvdpau_nouveau.so.1.0.0'
+endif
+
+libvdpau_gallium = shared_library(
+ 'vdpau_gallium',
+ 'target.c',
+ c_args : [c_vis_args, vdpau_c_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, vdpau_link_with,
+ ],
+ dependencies : [dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm, vdpau_deps],
+ link_depends : vdpau_link_depends,
+)
+
+meson.add_install_script(
+ join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
+ libvdpau_gallium.full_path(),
+ vdpau_drivers_path,
+ vdpau_drivers,
+)
--
2.15.0
More information about the mesa-dev
mailing list