libdrm: Changes to 'debian-unstable'
debian/changelog | 8 +++++
debian/control | 23 --------------
debian/libkms1.install | 1
debian/libkms1.lintian-overrides | 1
debian/libkms1.symbols | 16 ----------
debian/patches/02_kbsd_modeset.diff | 57 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 15 ++-------
8 files changed, 70 insertions(+), 52 deletions(-)
New commits:
commit e765ea2e4b838046a0c4305d36e145c046fba263
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 19 21:25:01 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6656887..637ea0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.46-3) UNRELEASED; urgency=low
+libdrm (2.4.46-3) unstable; urgency=low
* Make drmCheckModesettingSupported work on FreeBSD. Thanks, Christoph
Egger!
* Stop building libkms.
- -- Julien Cristau <jcristau@debian.org> Thu, 19 Sep 2013 21:13:52 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Sep 2013 21:24:52 +0200
libdrm (2.4.46-2) unstable; urgency=low
commit 28fa67827c16338311f2857d56c395a7202b9781
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 19 21:24:16 2013 +0200
Stop building libkms.
diff --git a/debian/changelog b/debian/changelog
index a7f2f7a..6656887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libdrm (2.4.46-3) UNRELEASED; urgency=low
* Make drmCheckModesettingSupported work on FreeBSD. Thanks, Christoph
Egger!
+ * Stop building libkms.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Sep 2013 21:13:52 +0200
diff --git a/debian/control b/debian/control
index f4d0605..4963e82 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Depends:
libdrm-radeon1 (= ${binary:Version}),
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-omap1 (= ${binary:Version}) [any-arm],
- libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
Replaces:
linux-libc-dev (<< 2.6.32-10)
@@ -174,28 +173,6 @@ Description: Userspace interface to radeon-specific kernel DRM services -- debug
.
This package provides the debugging symbols for the libdrm-radeon1 package.
-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.
-
-Package: libkms1-dbg
-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.
- .
- This package provides the debugging symbols for the libkms1 package.
-
Package: libdrm-omap1
Section: libs
Architecture: any-arm
diff --git a/debian/libkms1.install b/debian/libkms1.install
deleted file mode 100644
index 84efd1f..0000000
--- a/debian/libkms1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libkms.so.1*
diff --git a/debian/libkms1.lintian-overrides b/debian/libkms1.lintian-overrides
deleted file mode 100644
index 0617799..0000000
--- a/debian/libkms1.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-symbols-declares-dependency-on-other-package libkms-private
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
deleted file mode 100644
index 2c2828d..0000000
--- a/debian/libkms1.symbols
+++ /dev/null
@@ -1,16 +0,0 @@
-libkms.so.1 libkms1 #MINVER#
-| libkms-private
- dumb_create@Base 0 1
- intel_create@Base 0 1
- kms_bo_create@Base 0
- kms_bo_destroy@Base 0
- kms_bo_get_prop@Base 0
- kms_bo_map@Base 0
- kms_bo_unmap@Base 0
- kms_create@Base 0
- kms_destroy@Base 0
- kms_get_prop@Base 0
- linux_create@Base 0 1
- nouveau_create@Base 0 1
- radeon_create@Base 2.4.24 1
- vmwgfx_create@Base 0 1
diff --git a/debian/rules b/debian/rules
index 02fa657..3041981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,20 +8,19 @@
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
+confflags = \
+ --enable-radeon \
+ --disable-libkms \
+ $()
# Linux vs. the rest:
ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
- confflags += --enable-libkms
- LIBKMS = yes
confflags += --enable-vmwgfx
confflags += --enable-nouveau
NOUVEAU = yes
else
confflags += --disable-udev
- confflags += --disable-libkms
- LIBKMS = no
confflags += --disable-vmwgfx
confflags += --disable-nouveau
NOUVEAU = no
@@ -80,9 +79,6 @@ endif
ifeq ($(OMAP), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
endif
-ifeq ($(LIBKMS), yes)
- dh_strip -p libkms1 --dbg-package=libkms1-dbg
-endif
dh_strip -s --remaining-packages
override_dh_makeshlibs:
@@ -97,9 +93,6 @@ endif
ifeq ($(OMAP), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
endif
-ifeq ($(LIBKMS), yes)
- dh_makeshlibs -plibkms1 -V'libkms1' -- -c4
-endif
%:
dh $@ --with quilt,autoreconf --builddirectory=build/
commit 9188b0a7110dfeb0db1c2a32c664ca85659e4ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 19 21:14:41 2013 +0200
Make drmCheckModesettingSupported work on FreeBSD.
Thanks, Christoph Egger!
diff --git a/debian/changelog b/debian/changelog
index cb88c30..a7f2f7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.4.46-3) UNRELEASED; urgency=low
+
+ * Make drmCheckModesettingSupported work on FreeBSD. Thanks, Christoph
+ Egger!
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Sep 2013 21:13:52 +0200
+
libdrm (2.4.46-2) unstable; urgency=low
* Build libdrm-radeon1 on kfreebsd (closes: #684593).
diff --git a/debian/patches/02_kbsd_modeset.diff b/debian/patches/02_kbsd_modeset.diff
new file mode 100644
index 0000000..2602609
--- /dev/null
+++ b/debian/patches/02_kbsd_modeset.diff
@@ -0,0 +1,57 @@
+From: kostikbel <kib@freebsd.org>
+Date: Thu, 21 Feb 2013 20:02:00 +0000
+Subject: Make drmCheckModesettingSupported work on FreeBSD
+
+Patch from http://people.freebsd.org/~kib/drm/libdrm.2.patch
+
+Index: libdrm-bisect/xf86drmMode.c
+===================================================================
+--- libdrm-bisect.orig/xf86drmMode.c 2013-09-19 13:28:24.000000000 +0200
++++ libdrm-bisect/xf86drmMode.c 2013-09-19 13:32:43.085063015 +0200
+@@ -704,7 +704,7 @@
+ */
+ int drmCheckModesettingSupported(const char *busid)
+ {
+-#ifdef __linux__
++#if defined (__linux__)
+ char pci_dev_dir[1024];
+ int domain, bus, dev, func;
+ DIR *sysdir;
+@@ -754,6 +754,37 @@
+ closedir(sysdir);
+ if (found)
+ return 0;
++#elif defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
++ char kbusid[1024], sbusid[1024];
++ char oid[128];
++ int domain, bus, dev, func;
++ int i, modesetting, ret;
++ size_t len;
++
++ ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, &func);
++ if (ret != 4)
++ return -EINVAL;
++ snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus, dev, func);
++
++ /* How many GPUs do we expect in the machine? */
++ for (i = 0; i < 16; i++) {
++ snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i);
++ len = sizeof(sbusid);
++ ret = sysctlbyname(oid, sbusid, &len, NULL, 0);
++ if (ret == -1) {
++ if (errno == ENOENT)
++ continue;
++ return -EINVAL;
++ }
++ if (strcmp(sbusid, kbusid) != 0)
++ continue;
++ snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i);
++ len = sizeof(modesetting);
++ ret = sysctlbyname(oid, &modesetting, &len, NULL, 0);
++ if (ret == -1 || len != sizeof(modesetting))
++ return -EINVAL;
++ return (modesetting ? 0 : -ENOSYS);
++ }
+ #endif
+ return -ENOSYS;
+
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..56baa63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_kbsd_modeset.diff
Reply to: