libdrm: Changes to 'debian-unstable'
debian/changelog | 4 ++++
debian/control | 6 +++---
debian/rules | 14 +++++++++++++-
3 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit a3371f72cd819251c9f3acee77c032b9e2931024
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 24 11:17:10 2016 +0200
Build libdrm-tegra on arm64 (closes: #828023).
Thanks, Martin Michlmayr!
diff --git a/debian/changelog b/debian/changelog
index 329abdc..5af53f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
libdrm (2.4.68-2) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Update debian/upstream/signing-key.asc.
* Bump Standards-Version to 3.9.8, no changes needed.
* Update watch url to use https instead of http.
+ [ Julien Cristau ]
+ * Build libdrm-tegra on arm64 (closes: #828023). Thanks, Martin Michlmayr!
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 10 May 2016 14:45:31 +0200
libdrm (2.4.68-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index e81dff2..82f78e3 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Depends:
libdrm-omap1 (= ${binary:Version}) [any-arm],
libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64],
libdrm-exynos1 (= ${binary:Version}) [any-arm],
- libdrm-tegra0 (= ${binary:Version}) [any-arm],
+ libdrm-tegra0 (= ${binary:Version}) [any-arm arm64],
${misc:Depends},
Multi-Arch: same
Description: Userspace interface to kernel DRM services -- development files
@@ -274,7 +274,7 @@ Description: Userspace interface to exynos-specific kernel DRM services -- debug
This package provides the debugging symbols for the libdrm-exynos1 package.
Package: libdrm-tegra0
-Architecture: any-arm
+Architecture: any-arm arm64
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -290,7 +290,7 @@ Description: Userspace interface to tegra-specific kernel DRM services -- runtim
Package: libdrm-tegra0-dbg
Section: debug
Priority: extra
-Architecture: any-arm
+Architecture: any-arm arm64
Depends:
libdrm-tegra0 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 2dd69bc..169f648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,10 +49,18 @@ endif
ifeq ($(ARM), yes)
confflags += --enable-exynos-experimental-api
confflags += --enable-omap-experimental-api
- confflags += --enable-tegra-experimental-api
else
confflags += --disable-exynos-experimental-api
confflags += --disable-omap-experimental-api
+endif
+
+# Tegra is on arm and arm64
+ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
+ TEGRA = yes
+endif
+ifeq ($(TEGRA), yes)
+ confflags += --enable-tegra-experimental-api
+else
confflags += --disable-tegra-experimental-api
endif
@@ -96,6 +104,8 @@ endif
ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg
+endif
+ifeq ($(TEGRA), yes)
dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg
endif
ifeq ($(FREEDRENO), yes)
@@ -116,6 +126,8 @@ endif
ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.66)' -- -c4
+endif
+ifeq ($(TEGRA), yes)
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
endif
ifeq ($(FREEDRENO), yes)
Reply to: