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

libdrm: Changes to 'debian-unstable'



 debian/changelog |    6 ++++++
 debian/control   |    6 +++---
 debian/rules     |    7 +++----
 3 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 18ec34c9a4868f9472a0bfc9471655e20aecb144
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date:   Mon Aug 31 17:45:25 2015 +0200

    Enable libdrm-amdgpu1 on kfreebsd-*.

diff --git a/debian/changelog b/debian/changelog
index 0d7031c..a149f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.64-2) UNRELEASED; urgency=medium
+
+  * Enable libdrm-amdgpu1 on kfreebsd-*.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com>  Mon, 31 Aug 2015 17:41:21 +0200
+
 libdrm (2.4.64-1) unstable; urgency=medium
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index 981523a..0568f82 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Depends:
  libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32],
  libdrm-radeon1 (= ${binary:Version}),
  libdrm-nouveau2 (= ${binary:Version}) [linux-any],
- libdrm-amdgpu1 (= ${binary:Version}) [linux-any],
+ libdrm-amdgpu1 (= ${binary:Version}),
  libdrm-omap1 (= ${binary:Version}) [any-arm],
  libdrm-freedreno1 (= ${binary:Version}) [any-arm],
  libdrm-exynos1 (= ${binary:Version}) [any-arm],
@@ -305,7 +305,7 @@ Description: Userspace interface to tegra-specific kernel DRM services -- debugg
  This package provides the debugging symbols for the libdrm-tegra0 package.
 
 Package: libdrm-amdgpu1
-Architecture: linux-any
+Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
@@ -321,7 +321,7 @@ Description: Userspace interface to amdgpu-specific kernel DRM services -- runti
 Package: libdrm-amdgpu1-dbg
 Section: debug
 Priority: extra
-Architecture: linux-any
+Architecture: any
 Depends:
  libdrm-amdgpu1 (= ${binary:Version}),
  ${misc:Depends},
diff --git a/debian/rules b/debian/rules
index dee3894..a00c59e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 confflags = \
 	--enable-radeon \
+	--enable-amdgpu \
 	--disable-libkms \
 	$()
 
@@ -18,13 +19,11 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
 	confflags += --enable-udev
 	confflags += --enable-vmwgfx
 	confflags += --enable-nouveau
-	confflags += --enable-amdgpu
 	NOUVEAU = yes
 else
 	confflags += --disable-udev
 	confflags += --disable-vmwgfx
 	confflags += --disable-nouveau
-	confflags += --disable-amdgpu
 	NOUVEAU = no
 	# kfreebsd mangles freebsd's sys/types.h
 	confflags += CFLAGS="$(shell pkg-config --cflags libbsd-overlay)"
@@ -83,9 +82,9 @@ ifeq ($(INTEL), yes)
 endif
 ifeq ($(NOUVEAU), yes)
 	dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg
-	dh_strip -plibdrm-amdgpu1 --dbg-package=libdrm-amdgpu1-dbg
 endif
 	dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
+	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
@@ -101,9 +100,9 @@ ifeq ($(INTEL), yes)
 endif
 ifeq ($(NOUVEAU), yes)
 	dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.38)' -- -c4
-	dh_makeshlibs -plibdrm-amdgpu1 -V'libdrm-amdgpu1 (>= 2.4.63)' -- -c4
 endif
 	dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
+	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.64)' -- -c4


Reply to: