libdrm: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 7 ++++---
debian/rules | 12 ++++--------
3 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit a3c1f3f83b56a64d6664175c1450b92b616cf26b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 21 21:05:51 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 150d9b6..cb88c30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libdrm (2.4.46-2) UNRELEASED; urgency=low
+libdrm (2.4.46-2) unstable; urgency=low
* Build libdrm-radeon1 on kfreebsd (closes: #684593).
- -- Julien Cristau <jcristau@debian.org> Wed, 21 Aug 2013 19:34:05 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 21 Aug 2013 21:05:44 +0200
libdrm (2.4.46-1) unstable; urgency=low
commit 4985c2c50f3eda50ffb1664c55dcee9e97b9252c
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 21 19:36:04 2013 +0200
Build libdrm-radeon1 on kfreebsd.
Recent FreeBSD kernels should have radeon kms.
diff --git a/debian/changelog b/debian/changelog
index 004df80..150d9b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.46-2) UNRELEASED; urgency=low
+
+ * Build libdrm-radeon1 on kfreebsd (closes: #684593).
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 21 Aug 2013 19:34:05 +0200
+
libdrm (2.4.46-1) unstable; urgency=low
[ Sven Joachim ]
diff --git a/debian/control b/debian/control
index 6729001..f4d0605 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
libudev-dev [linux-any],
libpciaccess-dev,
valgrind [amd64 armel armhf i386 mips mipsel powerpc s390x],
+ libbsd-dev [kfreebsd-any],
Standards-Version: 3.9.4
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
@@ -25,7 +26,7 @@ Architecture: any
Depends:
libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32],
- libdrm-radeon1 (= ${binary:Version}) [linux-any],
+ libdrm-radeon1 (= ${binary:Version}),
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-omap1 (= ${binary:Version}) [any-arm],
libkms1 (= ${binary:Version}) [linux-any],
@@ -145,7 +146,7 @@ Description: Userspace interface to nouveau-specific kernel DRM -- debugging sym
Package: libdrm-radeon1
Section: libs
-Architecture: linux-any
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -160,7 +161,7 @@ Description: Userspace interface to radeon-specific kernel DRM services -- runti
Package: libdrm-radeon1-dbg
Section: debug
Priority: extra
-Architecture: linux-any
+Architecture: any
Depends:
libdrm-radeon1 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index d57b013..02fa657 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+confflags = --enable-radeon
+
# Linux vs. the rest:
ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
@@ -16,8 +18,6 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-vmwgfx
confflags += --enable-nouveau
NOUVEAU = yes
- confflags += --enable-radeon
- RADEON = yes
else
confflags += --disable-udev
confflags += --disable-libkms
@@ -25,8 +25,8 @@ else
confflags += --disable-vmwgfx
confflags += --disable-nouveau
NOUVEAU = no
- confflags += --disable-radeon
- RADEON = no
+ # kfreebsd mangles freebsd's sys/types.h
+ confflags += CFLAGS="$(shell pkg-config --cflags libbsd-overlay)"
endif
# Intel is only on x86:
@@ -76,9 +76,7 @@ endif
ifeq ($(NOUVEAU), yes)
dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg
endif
-ifeq ($(RADEON), yes)
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
-endif
ifeq ($(OMAP), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
endif
@@ -95,9 +93,7 @@ endif
ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.38)' -- -c4
endif
-ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-endif
ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
endif
Reply to: