Ubuntu Pastebin

Paste from alberto at Thu, 4 Feb 2016 14:32:42 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From 6dac0f3a70efaa94b94e8239ee07c1abdb36c47f Mon Sep 17 00:00:00 2001
From: Alberto Milone <alberto.milone@canonical.com>
Date: Fri, 22 Jan 2016 11:52:09 +0100
Subject: [PATCH 1/1] debian/rules: add Mesa EGL library path to the Prime
 ld.so.conf

Original author: Michael Marley
---
 debian/rules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/rules b/debian/rules
index 34b7c6a..b20d6df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,9 @@ sysconfdir           := /etc
 PKG_libdir           := $(libdir)/$(PKG_driver)
 PKG_libdir32         := $(libdir32)/$(PKG_driver)
 mesa_libdir          := $(libdir)/$(DEB_HOST_MULTIARCH)/mesa
+mesa_egl_libdir      := $(libdir)/$(DEB_HOST_MULTIARCH)/mesa-egl
 mesa_libdir_other    := $(libdir)/$(OTHER_ARCH)/mesa
+mesa_egl_libdir_other := $(libdir)/$(OTHER_ARCH)/mesa-egl
 xorg_libdir          := $(libdir)/xorg
 xorg_extra_path      := $(libdir)/$(DEB_HOST_MULTIARCH)/xorg
 xorg_extra_modules   := $(xorg_extra_path)/extra-modules
@@ -415,9 +417,11 @@ endif
 	dh_installdirs -p$(PKG_driver) "$(ld_so_conf_dir)"
 	echo "$(PKG_libdir)" >	"$(CURDIR)/debian/$(PKG_driver)$(ld_so_conf_path)"
 	echo "$(mesa_libdir)" >	"$(CURDIR)/debian/$(PKG_driver)$(pm_ld_so_conf_path)"
+	echo "$(mesa_egl_libdir)" >>	"$(CURDIR)/debian/$(PKG_driver)$(pm_ld_so_conf_path)"
 ifeq ($(DEB_BUILD_ARCH),amd64)
 	echo "$(PKG_libdir32)" >>	"$(CURDIR)/debian/$(PKG_driver)$(ld_so_conf_path)"
 	echo "$(mesa_libdir_other)" >>	"$(CURDIR)/debian/$(PKG_driver)$(pm_ld_so_conf_path)"
+	echo "$(mesa_egl_libdir_other)" >>	"$(CURDIR)/debian/$(PKG_driver)$(pm_ld_so_conf_path)"
 endif
 	# empty ld.so.conf for the fake multi-arch alternative
 	$(shell touch "$(CURDIR)/debian/$(PKG_driver)$(alt_ld_so_conf_path)")
-- 
1.9.1
Download as text