libdrm: Changes to 'ubuntu'
ChangeLog | 30 +++++++++++++++++++
configure.ac | 6 +++
debian/changelog | 33 +++++++++++++++++++++
debian/compat | 2 -
debian/control | 17 ++++++----
debian/libdrm-dev.links.in | 5 ---
debian/libdrm-intel1.install | 1
debian/libdrm-intel1.install.in | 1
debian/libdrm-intel1.symbols | 1
debian/libdrm-nouveau1a.install | 1
debian/libdrm-nouveau1a.install.in | 1
debian/libdrm-radeon1.install | 1
debian/libdrm-radeon1.install.in | 1
debian/libdrm-radeon1.lintian-overrides | 1
debian/libdrm2.install | 1
debian/libdrm2.install.in | 1
debian/libkms1.install | 1
debian/libkms1.install.in | 1
debian/libkms1.lintian-overrides | 1
debian/rules | 31 +------------------
intel/Makefile.am | 3 +
intel/intel_bufmgr.c | 50 ++++++++++++++++++++++++++++++++
intel/intel_bufmgr.h | 2 +
libkms/dumb.c | 3 +
24 files changed, 145 insertions(+), 50 deletions(-)
New commits:
commit b67d5cb536bc4e6bc5e15c6d2c3fa60e6b1f2b21
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sat Jul 2 01:00:39 2011 +0300
Update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 8ea08b6..2ba633c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.4.26-1ubuntu1) oneiric; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - debian/rules
+ - debian/control:
+ + Build libdrm-intel everywhere rather than just {i386,amd64}
+ for Plymouth
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 02 Jul 2011 01:00:31 +0300
+
libdrm (2.4.26-1) unstable; urgency=low
* New upstream release:
commit 19803bf92b66e116fe50ab443d269dbbfd9681f4
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sat Jul 2 00:42:10 2011 +0300
clean up old multiarch cruft
diff --git a/debian/libdrm-dev.links.in b/debian/libdrm-dev.links.in
deleted file mode 100644
index f3b4f97..0000000
--- a/debian/libdrm-dev.links.in
+++ /dev/null
@@ -1,5 +0,0 @@
-/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so
-/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so
-/lib/${DEB_HOST_MULTIARCH}/libkms.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libkms.so
diff --git a/debian/libdrm-intel1.install.in b/debian/libdrm-intel1.install.in
deleted file mode 100644
index 00a0524..0000000
--- a/debian/libdrm-intel1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-nouveau1a.install.in b/debian/libdrm-nouveau1a.install.in
deleted file mode 100644
index 289a854..0000000
--- a/debian/libdrm-nouveau1a.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm-radeon1.install.in b/debian/libdrm-radeon1.install.in
deleted file mode 100644
index bd5bae4..0000000
--- a/debian/libdrm-radeon1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libdrm2.install.in b/debian/libdrm2.install.in
deleted file mode 100644
index 9c3e62d..0000000
--- a/debian/libdrm2.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libkms1.install.in b/debian/libkms1.install.in
deleted file mode 100644
index 60cb59f..0000000
--- a/debian/libkms1.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libkms.so.1* /lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/rules b/debian/rules
index b6bebbe..e4efdb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,6 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
# Linux vs. the rest:
ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
@@ -55,15 +42,8 @@ endif
### Actual build
###
-override_dh_clean:
- rm -f debian/libdrm-intel1.install debian/libdrm-nouveau1a.install \
- debian/libdrm-radeon1.install debian/libdrm2.install \
- debian/libkms1.install debian/libdrm-dev.links
- dh_clean
-
override_dh_auto_configure:
- dh_auto_configure -- --enable-static=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- $(confflags)
+ dh_auto_configure -- --enable-static=yes $(confflags)
override_dh_auto_test:
dh_auto_test || echo "Test suite failure, but keeping on anyway"
@@ -72,13 +52,6 @@ override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
override_dh_install:
- for file in libdrm-intel1.install libdrm-nouveau1a.install \
- libdrm-radeon1.install libdrm2.install libkms1.install \
- libdrm-dev.links; \
- do \
- sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
- debian/$${file}.in > debian/$$file; \
- done
find debian/tmp -name '*.la' -delete
dh_install --fail-missing
commit 9845da0fc73a1e3f926c4f83c25bc2d91c63eb0e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 24 17:07:07 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f6f8efc..d9bc994 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libdrm (2.4.26-1) UNRELEASED; urgency=low
+libdrm (2.4.26-1) unstable; urgency=low
* New upstream release:
- Fix two important intel bugs.
* Add libpciaccess-dev build-dep.
* Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.
- -- Cyril Brulebois <kibi@debian.org> Fri, 24 Jun 2011 16:59:56 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 24 Jun 2011 17:07:04 +0200
libdrm (2.4.25-3) unstable; urgency=low
commit 6bc3b76da1bf8b461784345bc9084324d2e35337
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 24 17:07:02 2011 +0200
Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.
diff --git a/debian/changelog b/debian/changelog
index cdb70fe..f6f8efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low
* New upstream release:
- Fix two important intel bugs.
* Add libpciaccess-dev build-dep.
+ * Update libdrm-intel1.symbols and shlibs for new aperture-related symbol.
-- Cyril Brulebois <kibi@debian.org> Fri, 24 Jun 2011 16:59:56 +0200
diff --git a/debian/libdrm-intel1.symbols b/debian/libdrm-intel1.symbols
index 3634492..c951b6b 100644
--- a/debian/libdrm-intel1.symbols
+++ b/debian/libdrm-intel1.symbols
@@ -41,6 +41,7 @@ libdrm_intel.so.1 libdrm-intel1 #MINVER#
drm_intel_gem_bo_map_gtt@Base 2.4.3
drm_intel_gem_bo_start_gtt_access@Base 2.4.3
drm_intel_gem_bo_unmap_gtt@Base 2.4.9
+ drm_intel_get_aperture_sizes@Base 2.4.26
drm_intel_get_pipe_from_crtc_id@Base 2.4.11
drm_mmAllocMem@Base 2.4.1
drm_mmDestroy@Base 2.4.1
diff --git a/debian/rules b/debian/rules
index cab7ea3..6ccb6a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ endif
override_dh_makeshlibs:
dh_makeshlibs -plibdrm2 -V'libdrm2 (>= 2.4.25)' -- -c4
ifeq ($(INTEL), yes)
- dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.23-3~)' -- -c4
+ dh_makeshlibs -plibdrm-intel1 -V'libdrm-intel1 (>= 2.4.26)' -- -c4
endif
ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau1a -V'libdrm-nouveau1a (>= 2.4.23)' -- -c4
commit 0cadb56dc138fe2142c1f6332dfa177f63547755
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 24 17:01:43 2011 +0200
Add libpciaccess-dev build-dep.
diff --git a/debian/changelog b/debian/changelog
index c74631b..cdb70fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.26-1) UNRELEASED; urgency=low
* New upstream release:
- Fix two important intel bugs.
+ * Add libpciaccess-dev build-dep.
-- Cyril Brulebois <kibi@debian.org> Fri, 24 Jun 2011 16:59:56 +0200
diff --git a/debian/control b/debian/control
index 7b3673d..71d057b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends:
pkg-config,
libpthread-stubs0-dev,
libudev-dev [linux-any],
+ libpciaccess-dev,
Standards-Version: 3.9.2
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
commit f79e6a4f95b538b2b9e70b6c74b0f00410965879
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 24 17:00:48 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b69176e..968043e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+commit 6dd804c5a92104042b8be0a67d107946394a0b7a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 4 13:01:50 2011 +0100
+
+ configure: version bump for 2.4.26 release
+
+ Push the new Intel API for use by mesa.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 9d77603d8b95aee4f2408e437c55af15ee05b608
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jun 4 12:47:19 2011 +0100
+
+ intel: Add interface to query aperture sizes.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 61be94018ae9c403517d53f69357719224fa6ff3
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat May 14 11:15:06 2011 +0100
+
+ libkms: All current BO_TYPE are 32bpp
+
+ ... so request a 32bpp dumb buffer rather than a 16bpp.
+
+ Fixes modetest and friends.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
commit ba11501bb9f5bd98110dfe1385b4501c0a9a643a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Apr 11 08:25:42 2011 +0100
diff --git a/debian/changelog b/debian/changelog
index 80053d5..c74631b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.26-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Fix two important intel bugs.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 24 Jun 2011 16:59:56 +0200
+
libdrm (2.4.25-3) unstable; urgency=low
* Team upload.
commit b7b99dbe72246771a0c1365bc5b25f76ac36db7f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:06:00 2011 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 39b568d..80053d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-libdrm (2.4.25-3) UNRELEASED; urgency=low
+libdrm (2.4.25-3) unstable; urgency=low
+
+ * Team upload.
[ Steve Langasek ]
* Build for multiarch.
@@ -8,7 +10,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
use that for private symbols).
* Bump Standards-Version to 3.9.2.
- -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 20:05:53 +0200
libdrm (2.4.25-2) unstable; urgency=low
commit 514f38a13b15767ef4f1d4f0487aaea56f5d4436
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:03:29 2011 +0200
Bump Standards-Version to 3.9.2.
diff --git a/debian/changelog b/debian/changelog
index 3e3cd96..39b568d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add lintian overrides for symbols-declares-dependency-on-other-package (we
use that for private symbols).
+ * Bump Standards-Version to 3.9.2.
-- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
diff --git a/debian/control b/debian/control
index 1a21fbc..7b3673d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
pkg-config,
libpthread-stubs0-dev,
libudev-dev [linux-any],
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Section: libs
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libdrm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libdrm.git
commit cb38517b4494dedf1325a8ffbe3bcc0798ae14c4
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 20:01:26 2011 +0200
Add lintian overrides for symbols-declares-dependency-on-other-package
We use that for private symbols.
diff --git a/debian/changelog b/debian/changelog
index 18ef67e..3e3cd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ libdrm (2.4.25-3) UNRELEASED; urgency=low
[ Steve Langasek ]
* Build for multiarch.
+ [ Julien Cristau ]
+ * Add lintian overrides for symbols-declares-dependency-on-other-package (we
+ use that for private symbols).
+
-- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
libdrm (2.4.25-2) unstable; urgency=low
diff --git a/debian/libdrm-radeon1.lintian-overrides b/debian/libdrm-radeon1.lintian-overrides
new file mode 100644
index 0000000..0e452e0
--- /dev/null
+++ b/debian/libdrm-radeon1.lintian-overrides
@@ -0,0 +1 @@
+libdrm-radeon1: symbols-declares-dependency-on-other-package libdrm-radeon-private
diff --git a/debian/libkms1.lintian-overrides b/debian/libkms1.lintian-overrides
new file mode 100644
index 0000000..0617799
--- /dev/null
+++ b/debian/libkms1.lintian-overrides
@@ -0,0 +1 @@
+symbols-declares-dependency-on-other-package libkms-private
commit ce8ce08657202ca8a254f8fc02a3d3f6d9d3dabb
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 9 19:57:13 2011 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 0d1a16c..18ef67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.25-3) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 09 Jun 2011 19:51:16 +0200
+
libdrm (2.4.25-2) unstable; urgency=low
* Upload to unstable.
commit 6dd804c5a92104042b8be0a67d107946394a0b7a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jun 4 13:01:50 2011 +0100
configure: version bump for 2.4.26 release
Push the new Intel API for use by mesa.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index e776ef5..cd3ac23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ([2.63])
AC_INIT([libdrm],
- [2.4.25],
+ [2.4.26],
[https://bugs.freedesktop.org/enter_bug.cgi?product=DRI],
[libdrm])
commit 9d77603d8b95aee4f2408e437c55af15ee05b608
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jun 4 12:47:19 2011 +0100
intel: Add interface to query aperture sizes.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index d9c826d..e776ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,10 @@ PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
AC_SUBST(PTHREADSTUBS_CFLAGS)
AC_SUBST(PTHREADSTUBS_LIBS)
+PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
+AC_SUBST(PCIACCESS_CFLAGS)
+AC_SUBST(PCIACCESS_LIBS)
+
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE([udev],
diff --git a/intel/Makefile.am b/intel/Makefile.am
index 1ae92f8..b6a9014 100644
--- a/intel/Makefile.am
+++ b/intel/Makefile.am
@@ -27,12 +27,13 @@ AM_CFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
$(PTHREADSTUBS_CFLAGS) \
+ $(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
+libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \
intel_bufmgr.c \
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 2df93a5..ab57427 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -36,8 +36,10 @@
#include <errno.h>
#include <drm.h>
#include <i915_drm.h>
+#include <pciaccess.h>
#include "intel_bufmgr.h"
#include "intel_bufmgr_priv.h"
+#include "xf86drm.h"
/** @file intel_bufmgr.c
*
@@ -269,3 +271,51 @@ int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id)
return bufmgr->get_pipe_from_crtc_id(bufmgr, crtc_id);
return -1;
}
+
+static size_t
+drm_intel_probe_agp_aperture_size(int fd)
+{
+ struct pci_device *pci_dev;
+ size_t size = 0;
+ int ret;
+
+ ret = pci_system_init();
+ if (ret)
+ goto err;
+
+ /* XXX handle multiple adaptors? */
+ pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
+ if (pci_dev == NULL)
+ goto err;
+
+ ret = pci_device_probe(pci_dev);
+ if (ret)
+ goto err;
+
+ size = pci_dev->regions[2].size;
+err:
+ pci_system_cleanup ();
+ return size;
+}
+
+int drm_intel_get_aperture_sizes(int fd,
+ size_t *mappable,
+ size_t *total)
+{
+
+ struct drm_i915_gem_get_aperture aperture;
+ int ret;
+
+ ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
+ if (ret)
+ return ret;
+
+ *mappable = 0;
+ /* XXX add a query for the kernel value? */
+ if (*mappable == 0)
+ *mappable = drm_intel_probe_agp_aperture_size(fd);
+ if (*mappable == 0)
+ *mappable = 64 * 1024 * 1024; /* minimum possible value */
+ *total = aperture.aper_size;
+ return 0;
+}
diff --git a/intel/intel_bufmgr.h b/intel/intel_bufmgr.h
index daa18b4..889ef46 100644
--- a/intel/intel_bufmgr.h
+++ b/intel/intel_bufmgr.h
@@ -151,6 +151,8 @@ void drm_intel_gem_bo_start_gtt_access(drm_intel_bo *bo, int write_enable);
int drm_intel_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, int crtc_id);
+int drm_intel_get_aperture_sizes(int fd, size_t *mappable, size_t *total);
+
/* drm_intel_bufmgr_fake.c */
drm_intel_bufmgr *drm_intel_bufmgr_fake_init(int fd,
unsigned long low_offset,
commit 61be94018ae9c403517d53f69357719224fa6ff3
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat May 14 11:15:06 2011 +0100
libkms: All current BO_TYPE are 32bpp
... so request a 32bpp dumb buffer rather than a 16bpp.
Fixes modetest and friends.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/libkms/dumb.c b/libkms/dumb.c
index 3be5f7a..440efb3 100644
--- a/libkms/dumb.c
+++ b/libkms/dumb.c
@@ -95,7 +95,8 @@ dumb_bo_create(struct kms_driver *kms,
memset(&arg, 0, sizeof(arg));
- arg.bpp = 16;
+ /* All BO_TYPE currently are 32bpp formats */
+ arg.bpp = 32;
arg.width = width;
arg.height = height;
commit a3853a0540b739370fbeb6f252df15b3c4ec629a
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:55:26 2011 -0700
the rest of these packages are also multiarch clean; mark them as such
diff --git a/debian/control b/debian/control
index fef5cab..be025b0 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to intel-specific kernel DRM services -- runtime
This library implements the userspace interface to the intel-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -90,6 +92,7 @@ Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386
Depends:
libdrm-intel1 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Userspace interface to intel-specific kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -104,6 +107,8 @@ Architecture: linux-any
Depends: ${shlibs:Depends},
${misc:Depends},
Conflicts: libdrm-nouveau1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to nouveau-specific kernel DRM services -- runtime
This library implements the userspace interface to the nouveau-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -117,6 +122,7 @@ Architecture: linux-any
Depends: libdrm-nouveau1a (= ${binary:Version}),
${misc:Depends},
Conflicts: libdrm-nouveau1-dbg
+Multi-Arch: same
Description: Userspace interface to nouveau-specific kernel DRM -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
@@ -131,6 +137,8 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Userspace interface to radeon-specific kernel DRM services -- runtime
This library implements the userspace interface to the radeon-specific kernel
DRM services. DRM stands for "Direct Rendering Manager", which is the
@@ -144,6 +152,7 @@ Architecture: linux-any
Depends:
libdrm-radeon1 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Userspace interface to radeon-specific kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM services.
DRM stands for "Direct Rendering Manager", which is the kernelspace portion
commit bb14fd7d6ba25d989527cc1fd5a61a76aca417eb
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 20:24:41 2011 -0700
Build for multiarch
Install the libraries in the multiarch paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.
diff --git a/debian/control b/debian/control
index 2ac055d..fef5cab 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 7.2.7),
+ debhelper (>= 8.1.2ubuntu2),
libx11-dev,
dpkg-dev (>= 1.13.19),
quilt (>= 0.40),
@@ -43,6 +43,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Userspace interface to kernel DRM services -- runtime
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
@@ -59,6 +61,7 @@ Architecture: any
Depends:
libdrm2 (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Userspace interface to kernel DRM services -- debugging symbols
This library implements the userspace interface to the kernel DRM
services. DRM stands for "Direct Rendering Manager", which is the
@@ -153,6 +156,8 @@ Package: libkms1
Section: libs
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: Userspace interface to kernel DRM buffer management
This library implements a unified userspace interface to the different buffer
management interfaces of the kernel DRM hardware drivers.
@@ -162,6 +167,7 @@ Section: debug
Priority: extra
Architecture: linux-any
Depends: libkms1 (= ${binary:Version}), ${misc:Depends}
+Multi-Arch: same
Description: Userspace interface to kernel DRM buffer management -- debugging symbols
This library implements a unified userspace interface to the different buffer
management interfaces of the kernel DRM hardware drivers.
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libdrm-intel1.install b/debian/libdrm-intel1.install
index 149ef10..2386169 100644
--- a/debian/libdrm-intel1.install
+++ b/debian/libdrm-intel1.install
@@ -1 +1 @@
-usr/lib/libdrm_intel.so.1*
+usr/lib/*/libdrm_intel.so.1*
diff --git a/debian/libdrm-nouveau1a.install b/debian/libdrm-nouveau1a.install
index b19813f..6c55080 100644
--- a/debian/libdrm-nouveau1a.install
+++ b/debian/libdrm-nouveau1a.install
@@ -1 +1 @@
-usr/lib/libdrm_nouveau.so.1*
+usr/lib/*/libdrm_nouveau.so.1*
diff --git a/debian/libdrm-radeon1.install b/debian/libdrm-radeon1.install
index 24e5a6b..158f559 100644
--- a/debian/libdrm-radeon1.install
+++ b/debian/libdrm-radeon1.install
@@ -1 +1 @@
-usr/lib/libdrm_radeon.so.1*
+usr/lib/*/libdrm_radeon.so.1*
diff --git a/debian/libdrm2.install b/debian/libdrm2.install
index c2f2241..6e2fd9b 100644
--- a/debian/libdrm2.install
+++ b/debian/libdrm2.install
@@ -1 +1 @@
-usr/lib/libdrm.so.2*
+usr/lib/*/libdrm.so.2*
diff --git a/debian/libkms1.install b/debian/libkms1.install
index 2d29800..84efd1f 100644
--- a/debian/libkms1.install
+++ b/debian/libkms1.install
@@ -1 +1 @@
-usr/lib/libkms.so.1*
+usr/lib/*/libkms.so.1*
diff --git a/debian/rules b/debian/rules
index 4d838ba..557304c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ include debian/xsfbs/xsfbs.mk
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)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
@@ -79,6 +80,7 @@ build/config.status: configure
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-static=yes \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
$(confflags) \
CFLAGS="$(CFLAGS)"
Reply to: