[Git][xorg-team/lib/mesa][debian-unstable] 2 commits: dri: meson: do not prefix user provided dri-drivers-path

[Andreas Boll <aboll@debian.org>]

Title: GitLab

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.antognolli@intel.com>
  CC: Dylan Baker <dylan@pnwbakers.com>
  Cc: 18.3 19.0 <mesa-stable@lists.freedesktop.org>
  Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.)
  Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
  Reviewed-by: Emil Velikov <emil.velikov@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	+mesa (18.3.4-2) UNRELEASED; urgency=medium
	2	+
	3	+ * Cherry-pick f6556ec7d12 (dri: meson: do not prefix user provided dri-
	4	+ drivers-path) from upstream master branch. Fixes a regression since
	5	+ switching to meson (Closes: #922807).
	6	+
	7	+ -- Andreas Boll <aboll@debian.org> Thu, 28 Feb 2019 11:45:35 +0100
	8	+
1	9	mesa (18.3.4-1) unstable; urgency=medium
2	10
3	11	* New upstream release.

meson.build

---

...	...	@@ -64,11 +64,11 @@ endif
64	64
65	65	dri_drivers_path = get_option('dri-drivers-path')
66	66	if dri_drivers_path == ''
67		- dri_drivers_path = join_paths(get_option('libdir'), 'dri')
	67	+ dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri')
68	68	endif
69	69	dri_search_path = get_option('dri-search-path')
70	70	if dri_search_path == ''
71		- dri_search_path = join_paths(get_option('prefix'), dri_drivers_path)
	71	+ dri_search_path = dri_drivers_path
72	72	endif
73	73
74	74	with_gles1 = get_option('gles1')

src/mesa/drivers/dri/meson.build

---

...	...	@@ -78,7 +78,7 @@ if with_dri
78	78	filebase : 'dri',
79	79	description : 'Direct Rendering Infrastructure',
80	80	version : meson.project_version(),
81		- variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
	81	+ variables : ['dridriverdir=' + dri_drivers_path],
82	82	requires_private : dri_req_private,
83	83	)
84	84	endif

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.