[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 8/9] control, rules, libgl1-mesa-dri.install.in: Enable shared dricore for dri build.



---
 debian/changelog                  |    1 +
 debian/control                    |    1 +
 debian/libgl1-mesa-dri.install.in |    2 ++
 debian/rules                      |    1 +
 4 filer ändrade, 5 tillägg(+)

diff --git a/debian/changelog b/debian/changelog
index a6ae9d6..242ba60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (8.0.4-3) UNRELEASED; urgency=low
   * Cherry-pick commit 7d87c71a7 (configure: Add --with-llvm-shared-libs)
     from upstream.
   * control, patches/13-llvm-config-pick-a-version.diff: Update to llvm-3.0.
+  * control, rules, libgl1-mesa-dri.install.in: Enable shared dricore for dri build.
 
   [ Timo Aaltonen ]
   * rules: Build llvm shared libs on platforms that support llvm.
diff --git a/debian/control b/debian/control
index e32481d..576e7da 100644
--- a/debian/control
+++ b/debian/control
@@ -600,6 +600,7 @@ Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 72aa08a..01e8e24 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1 +1,3 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/libdricore.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/libglsl.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index f69251b..c95c94e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,6 +118,7 @@ confflags-dri = \
 	--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
 	--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
 	--enable-glx-tls \
+	--enable-shared-dricore \
 	--enable-shared-glapi \
 	--enable-texture-float \
 	--enable-xa \
-- 
1.7.10.4


Reply to: