AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/decode: move dependencies up a level

Browse Source 
This is mainly for the benefit of automated syncing of changes from mesa
back to envytools, where the same subdir meson.build's are used, but the
toplevel meson.build is different.  In the envytools case, we want these
depenendencies to be required.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6154>
This commit is contained in:
Rob Clark
2020-08-02 12:17:28 -07:00
committed by Marge Bot
parent 9c33c53898
commit caa107cb8d
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedreno/decode/meson.build
View File

@@ -18,16 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
dep_lua = dependency('lua53', required: false)
if not dep_lua.found()
dep_lua = dependency('lua52', required: false)
endif
if not dep_lua.found()
dep_lua = dependency('lua', required: false)
endif
dep_libarchive = dependency('libarchive', required: false)
# Shared cmdstream decoding:
libfreedreno_cffdec = static_library(
'freedreno_cffdec',

9
src/freedreno/meson.build
View File

@@ -25,6 +25,15 @@ rnn_src_path = meson.source_root() + '/src/freedreno/registers'
rnn_install_path = get_option('datadir') + '/freedreno/registers'
rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path
dep_lua = dependency('lua53', required: false)
if not dep_lua.found()
dep_lua = dependency('lua52', required: false)
endif
if not dep_lua.found()
dep_lua = dependency('lua', required: false)
endif
dep_libarchive = dependency('libarchive', required: false)
dep_libxml2 = dependency('libxml-2.0', required: false)
prog_gzip = find_program('gzip', required: false)