debian/changelog | 9 +++++++++
debian/control | 2 +-
debian/rules | 11 +++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 29ae7ea39888ba543febf23f302358b7493a94e9
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Mar 23 19:11:23 2009 +0100
On Linux, let udev create the device files.
diff --git a/debian/changelog b/debian/changelog
index 2be02ae..8f8984e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ drm-snapshot (2.4.4+git+20090205+8b88036-2) UNRELEASED;
urgency=low
* Let linux-libc-dev provide some drm headers, drop them from libdrm-dev.
Add dependency on linux-libc-dev >= 2.6.28.
* Build with --enable-nouveau-experimental-api.
+ * On Linux, let udev create the device files.
-- Julien Cristau <jcris...@debian.org> Mon, 23 Mar 2009 17:53:50 +0100
diff --git a/debian/rules b/debian/rules
index fe833db..d174aa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ endif
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
get-orig-source:
git clone git://anongit.freedesktop.org/git/mesa/drm drm-snapshot && \
@@ -42,6 +43,11 @@ confflags = --build=$(DEB_BUILD_GNU_TYPE)
ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --host=$(DEB_HOST_GNU_TYPE)
endif
+ifeq (linux, $(DEB_HOST_ARCH_OS))
+ confflags += --enable-udev
+else
+ confflags += --disable-udev
+endif
configure: $(QUILT_STAMPFN)
autoreconf -vfi
commit 23d3644df11c6af4da9c6afbb786b8ef661beb19
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Mar 23 18:49:58 2009 +0100
Build with --enable-nouveau-experimental-api
diff --git a/debian/changelog b/debian/changelog
index 5c92327..2be02ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ drm-snapshot (2.4.4+git+20090205+8b88036-2) UNRELEASED;
urgency=low
* Let linux-libc-dev provide some drm headers, drop them from libdrm-dev.
Add dependency on linux-libc-dev >= 2.6.28.
+ * Build with --enable-nouveau-experimental-api.
-- Julien Cristau <jcris...@debian.org> Mon, 23 Mar 2009 17:53:50 +0100
diff --git a/debian/rules b/debian/rules
index 29d6b13..fe833db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,6 +56,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-static=yes \
+ --enable-nouveau-experimental-api \
CFLAGS="$(CFLAGS)"
build: build-stamp
commit c32452f1fe831fe95a197883ab6f6617cd78afb1
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Feb 20 17:47:50 2009 +0100
Let linux-libc-dev provide some drm headers
Drop them from libdrm-dev.
Add dependency on linux-libc-dev >= 2.6.28.
diff --git a/debian/changelog b/debian/changelog
index d89e28d..5c92327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+drm-snapshot (2.4.4+git+20090205+8b88036-2) UNRELEASED; urgency=low
+
+ * Let linux-libc-dev provide some drm headers, drop them from libdrm-dev.
+ Add dependency on linux-libc-dev >= 2.6.28.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 23 Mar 2009 17:53:50 +0100
+
drm-snapshot (2.4.4+git+20090205+8b88036-1) experimental; urgency=low
* Build new libdrm-nouveau1 and libdrm-nouveau1-dbg packages.
diff --git a/debian/control b/debian/control
index d7eb7d4..b1ee4fe 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/lib/drm-snapshot.git
Package: libdrm-dev
Section: libdevel
Architecture: any
-Depends: libdrm2 (= ${binary:Version}), libdrm-intel1 (= ${binary:Version})
[amd64 i386 kfreebsd-amd64 kfreebsd-i386], libdrm-nouveau1 (=
${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc],
${misc:Depends}
+Depends: linux-libc-dev (>= 2.6.28), libdrm2 (= ${binary:Version}),
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-nouveau1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386
powerpc], ${misc:Depends}
Description: Userspace interface to kernel rendering services (snapshot) --
dev files
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
diff --git a/debian/rules b/debian/rules
index f4cdaf3..29d6b13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,10 @@ install: build
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ # remove files provided by linux-libc-dev
+ for file in drm_sarea.h drm.h i915_drm.h mga_drm.h r128_drm.h
radeon_drm.h savage_drm.h sis_drm.h via_drm.h; do \
+ rm -f debian/tmp/usr/include/drm/$$file; \
+ done
# Create the directories to install the source into
dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
