libdrm: Changes to 'debian-unstable'
debian/changelog | 8 ++++++--
debian/control | 6 +++---
debian/rules | 22 +++++++++++++++++-----
3 files changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 5308e42d1999ca890a0759785320c6b1672391e7
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Oct 26 21:51:31 2015 +0200
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 5f1ffa1..91e445e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdrm (2.4.65-2) UNRELEASED; urgency=medium
+libdrm (2.4.65-2) unstable; urgency=medium
[ Andreas Boll ]
* Update libdrm-freedreno1.symbols and shlibs.
@@ -7,7 +7,7 @@ libdrm (2.4.65-2) UNRELEASED; urgency=medium
[ Fathi Boudra ]
* Enable freedreno build on arm64 architecture.
- -- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 26 Oct 2015 12:41:34 +0100
+ -- Timo Aaltonen <tjaalton@debian.org> Mon, 26 Oct 2015 21:40:43 +0200
libdrm (2.4.65-1) unstable; urgency=medium
commit b5b6e5c7b0887f6dd57d29d7e01b8525b7f0477a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Oct 26 21:40:37 2015 +0200
Enable freedreno build on arm64 architecture.
diff --git a/debian/changelog b/debian/changelog
index fe11ef7..5f1ffa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
libdrm (2.4.65-2) UNRELEASED; urgency=medium
+ [ Andreas Boll ]
* Update libdrm-freedreno1.symbols and shlibs.
* Drop Debian revision from new symbols in libdrm2.symbols.
+ [ Fathi Boudra ]
+ * Enable freedreno build on arm64 architecture.
+
-- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 26 Oct 2015 12:41:34 +0100
libdrm (2.4.65-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0d580f4..7ceca71 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Depends:
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-amdgpu1 (= ${binary:Version}),
libdrm-omap1 (= ${binary:Version}) [any-arm],
- libdrm-freedreno1 (= ${binary:Version}) [any-arm],
+ libdrm-freedreno1 (= ${binary:Version}) [any-arm arm64],
libdrm-exynos1 (= ${binary:Version}) [any-arm],
libdrm-tegra0 (= ${binary:Version}) [any-arm],
${misc:Depends},
@@ -213,7 +213,7 @@ Description: Userspace interface to omap-specific kernel DRM services -- debuggi
This package provides the debugging symbols for the libdrm-omap1 package.
Package: libdrm-freedreno1
-Architecture: any-arm
+Architecture: any-arm arm64
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -229,7 +229,7 @@ Description: Userspace interface to msm/kgsl kernel DRM services -- runtime
Package: libdrm-freedreno1-dbg
Section: debug
Priority: extra
-Architecture: any-arm
+Architecture: any-arm arm64
Depends:
libdrm-freedreno1 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 708bfb8..df9fe67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,22 +42,30 @@ else
confflags += --disable-intel
endif
-# Omap and freedreno are only on arm
+# Exynos/Omap/Tegra are only on arm
ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
ARM = yes
endif
ifeq ($(ARM), yes)
- confflags += --enable-freedreno --enable-freedreno-kgsl
confflags += --enable-exynos-experimental-api
confflags += --enable-omap-experimental-api
confflags += --enable-tegra-experimental-api
else
- confflags += --disable-freedreno
confflags += --disable-exynos-experimental-api
confflags += --disable-omap-experimental-api
confflags += --disable-tegra-experimental-api
endif
+# Freedreno is on arm and arm64
+ifneq (,$(filter arm arm64,$(DEB_HOST_ARCH_CPU)))
+ FREEDRENO = yes
+endif
+ifeq ($(FREEDRENO), yes)
+ confflags += --enable-freedreno --enable-freedreno-kgsl
+else
+ confflags += --disable-freedreno
+endif
+
###
### Actual build
###
@@ -87,10 +95,12 @@ endif
dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg
ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
- dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg
dh_strip -plibdrm-tegra0 --dbg-package=libdrm-tegra0-dbg
endif
+ifeq ($(FREEDRENO), yes)
+ dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
+endif
dh_strip -s --remaining-packages
override_dh_makeshlibs:
@@ -105,10 +115,12 @@ endif
dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
- dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.65)' -- -c4
dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1 (>= 2.4.60)' -- -c4
dh_makeshlibs -plibdrm-tegra0 -V'libdrm-tegra0' -- -c4
endif
+ifeq ($(FREEDRENO), yes)
+ dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1 (>= 2.4.57)' -- -c4
+endif
%:
dh $@ --with quilt,autoreconf --builddirectory=build/
Reply to: