Andreas Boll pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits: b0ba44cf by Sergii Romantsov at 2019-02-28T10:40:43Z dri: meson: do not prefix user provided dri-drivers-path The user can select the location where there dri drivers are installed by the dri-drivers-path meson option. By default path will be $prefix/$libdir/dri. Currently we add $prefix to the user provided path. Resulting in an incorrect or even missing path. v2: fixed dri_search_path by default, rebased to master v3: new commit-message (Emil Velikov), cc mesa-stable Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698 CC: Rafael Antognolli <rafael.antogno...@intel.com> CC: Dylan Baker <dy...@pnwbakers.com> Cc: 18.3 19.0 <mesa-sta...@lists.freedesktop.org> Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.) Signed-off-by: Sergii Romantsov <sergii.romant...@globallogic.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> (cherry picked from commit f6556ec7d126b31da37c08d7cb657250505e01a0) - - - - - 9df431b6 by Andreas Boll at 2019-02-28T10:46:08Z Document the cherry-pick in debian/changelog - - - - - 3 changed files: - debian/changelog - meson.build - src/mesa/drivers/dri/meson.build Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +mesa (18.3.4-2) UNRELEASED; urgency=medium + + * Cherry-pick f6556ec7d12 (dri: meson: do not prefix user provided dri- + drivers-path) from upstream master branch. Fixes a regression since + switching to meson (Closes: #922807). + + -- Andreas Boll <ab...@debian.org> Thu, 28 Feb 2019 11:45:35 +0100 + mesa (18.3.4-1) unstable; urgency=medium * New upstream release. ===================================== meson.build ===================================== @@ -64,11 +64,11 @@ endif dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' - dri_search_path = join_paths(get_option('prefix'), dri_drivers_path) + dri_search_path = dri_drivers_path endif with_gles1 = get_option('gles1') ===================================== src/mesa/drivers/dri/meson.build ===================================== @@ -78,7 +78,7 @@ if with_dri filebase : 'dri', description : 'Direct Rendering Infrastructure', version : meson.project_version(), - variables : ['dridriverdir=${prefix}/' + dri_drivers_path], + variables : ['dridriverdir=' + dri_drivers_path], requires_private : dri_req_private, ) endif View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/00b54f84c7dfcc08c99a19325a3de00cdbea65a4...9df431b63cdce2eeecd3674a126f0ba395906d90 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/00b54f84c7dfcc08c99a19325a3de00cdbea65a4...9df431b63cdce2eeecd3674a126f0ba395906d90 You're receiving this email because of your account on salsa.debian.org.
