libdrm: Changes to 'ubuntu'
debian/control | 6 +++---
debian/rules | 9 ++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit c44dd5f11702cfc07f828d7f4716dc9cb7d257d0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 18 12:40:40 2012 +0200
Nuke libdrm-intel1 on arm
No longer needed since plymouth update
diff --git a/debian/control b/debian/control
index 3c51513..93d8454 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Section: libdevel
Architecture: any
Depends:
libdrm2 (= ${binary:Version}),
- libdrm-intel1 (= ${binary:Version}) [linux-any kfreebsd-any],
+ libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-radeon1 (= ${binary:Version}) [linux-any],
libdrm-nouveau1a (= ${binary:Version}) [linux-any],
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
@@ -76,7 +76,7 @@ Description: Userspace interface to kernel DRM services -- debugging symbols
Package: libdrm-intel1
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -91,7 +91,7 @@ Description: Userspace interface to intel-specific kernel DRM services -- runtim
Package: libdrm-intel1-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
libdrm-intel1 (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 648e64f..24d7986 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,6 @@ ifeq (linux, $(DEB_HOST_ARCH_OS))
NOUVEAU = yes
confflags += --enable-radeon
RADEON = yes
-# Plymouth wants libdrm-intel1, even on architectures where it's guaranteed
-# to be useless. Satisfy it's depraved yearnings.
- INTEL = yes
else
confflags += --disable-udev
confflags += --disable-libkms
@@ -32,6 +29,12 @@ else
RADEON = no
endif
+# Intel is only on x86:
+ifneq (,$(filter amd64 i386,$(DEB_HOST_ARCH_CPU)))
+ifneq (,$(filter linux kfreebsd,$(DEB_HOST_ARCH_OS)))
+ INTEL = yes
+endif
+endif
ifeq ($(INTEL), yes)
confflags += --enable-intel
else
Reply to: